From 713d16d445a237f0e73b743f36e7fc7b25eecb18 Mon Sep 17 00:00:00 2001 From: "Aaron D. Lee" Date: Fri, 3 Apr 2026 13:32:17 -0400 Subject: [PATCH] Fix lint issues in pet detection integration - Import PetsConfig directly instead of forward ref string - Fix import sorting in worker.py, queries.py, constants.py - Remove unused imports in profiles.py, trainer.py, processor.py Co-Authored-By: Claude Opus 4.6 (1M context) --- .python-version | 1 + vigilar/alerts/profiles.py | 3 +-- vigilar/camera/worker.py | 7 +++---- vigilar/constants.py | 1 - vigilar/detection/trainer.py | 2 +- vigilar/events/processor.py | 3 +-- vigilar/storage/queries.py | 1 - 7 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 .python-version diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..92536a9 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.12.0 diff --git a/vigilar/alerts/profiles.py b/vigilar/alerts/profiles.py index 8307f2d..6d87491 100644 --- a/vigilar/alerts/profiles.py +++ b/vigilar/alerts/profiles.py @@ -1,9 +1,8 @@ """Smart alert profile matching engine.""" import logging -from datetime import datetime -from vigilar.config import AlertProfileConfig, AlertProfileRule +from vigilar.config import AlertProfileConfig from vigilar.constants import HouseholdState log = logging.getLogger(__name__) diff --git a/vigilar/camera/worker.py b/vigilar/camera/worker.py index 227d91e..0b27d97 100644 --- a/vigilar/camera/worker.py +++ b/vigilar/camera/worker.py @@ -13,18 +13,17 @@ import signal import time import cv2 -import numpy as np from vigilar.bus import MessageBus from vigilar.camera.hls import HLSStreamer, RemoteHLSStreamer from vigilar.camera.motion import MotionDetector from vigilar.camera.recorder import AdaptiveRecorder from vigilar.camera.ring_buffer import RingBuffer -from vigilar.config import CameraConfig, MQTTConfig, RemoteConfig +from vigilar.config import CameraConfig, MQTTConfig, PetsConfig, RemoteConfig from vigilar.constants import Topics -from vigilar.detection.yolo import YOLODetector from vigilar.detection.pet_id import PetIDClassifier from vigilar.detection.wildlife import classify_wildlife_threat +from vigilar.detection.yolo import YOLODetector log = logging.getLogger(__name__) @@ -49,7 +48,7 @@ def run_camera_worker( recordings_dir: str, hls_dir: str, remote_cfg: RemoteConfig | None = None, - pets_cfg: "PetsConfig | None" = None, + pets_cfg: PetsConfig | None = None, ) -> None: """Main entry point for a camera worker process.""" camera_id = camera_cfg.id diff --git a/vigilar/constants.py b/vigilar/constants.py index e17cd6d..b328992 100644 --- a/vigilar/constants.py +++ b/vigilar/constants.py @@ -2,7 +2,6 @@ from enum import StrEnum - # --- Arm States --- class ArmState(StrEnum): diff --git a/vigilar/detection/trainer.py b/vigilar/detection/trainer.py index 5a68fcc..51f32a0 100644 --- a/vigilar/detection/trainer.py +++ b/vigilar/detection/trainer.py @@ -2,7 +2,7 @@ import logging import shutil -from dataclasses import dataclass, field +from dataclasses import dataclass from pathlib import Path log = logging.getLogger(__name__) diff --git a/vigilar/events/processor.py b/vigilar/events/processor.py index 91b33ec..47c0209 100644 --- a/vigilar/events/processor.py +++ b/vigilar/events/processor.py @@ -1,6 +1,5 @@ """Event processor — subscribes to MQTT, logs events, evaluates rules.""" -import json import logging import signal import time @@ -10,7 +9,7 @@ from sqlalchemy.engine import Engine from vigilar.bus import MessageBus from vigilar.config import VigilarConfig -from vigilar.constants import ArmState, EventType, Severity, Topics +from vigilar.constants import EventType, Severity, Topics from vigilar.events.rules import RuleEngine from vigilar.events.state import ArmStateFSM from vigilar.storage.db import get_db_path, init_db diff --git a/vigilar/storage/queries.py b/vigilar/storage/queries.py index 001f8a4..91b295b 100644 --- a/vigilar/storage/queries.py +++ b/vigilar/storage/queries.py @@ -21,7 +21,6 @@ from vigilar.storage.schema import ( wildlife_sightings, ) - # --- Events --- def insert_event(