OTVision 0.6.15__py3-none-any.whl → 0.6.17__py3-none-any.whl

OTVision/detect/otdet_file_writer.py

@@ -1,5 +1,6 @@
 import logging
 from dataclasses import dataclass
+from pathlib import Path
 
 from OTVision.abstraction.observer import Observer, Subject
 from OTVision.application.detect.current_object_detector_metadata import (
@@ -21,6 +22,7 @@ class OtdetFileWrittenEvent:
 
     otdet_builder_config: OtdetBuilderConfig
     number_of_frames: int
+    save_location: Path
 
 
 class OtdetFileWriter:
@@ -116,12 +118,20 @@ class OtdetFileWriter:
 
         finished_msg = "Finished detection"
         log.info(finished_msg)
-        self.__notify(num_frames=actual_frames, builder_config=builder_config)
+        self.__notify(
+            num_frames=actual_frames,
+            builder_config=builder_config,
+            save_location=detections_file,
+        )
 
-    def __notify(self, num_frames: int, builder_config: OtdetBuilderConfig) -> None:
+    def __notify(
+        self, num_frames: int, builder_config: OtdetBuilderConfig, save_location: Path
+    ) -> None:
         self._subject.notify(
             OtdetFileWrittenEvent(
-                number_of_frames=num_frames, otdet_builder_config=builder_config
+                number_of_frames=num_frames,
+                otdet_builder_config=builder_config,
+                save_location=save_location,
             )
         )
 

OTVision/detect/video_input_source.py

@@ -1,7 +1,7 @@
 import logging
 from datetime import datetime
 from pathlib import Path
-from typing import Iterator
+from typing import Iterable, Iterator
 
 import av
 from av.container.input import InputContainer
@@ -84,11 +84,9 @@ class VideoSource(InputSourceDetect):
             Frame: Processed video frames ready for detection.
         """
 
-        video_files = self.__collect_files_to_detect()
+        video_files = self._collect_files_to_detect()
 
-        start_msg = f"Start detection of {len(video_files)} video files"
-        log.info(start_msg)
-        print(start_msg)
+        log.info("Start detection of video files")
 
         for video_file in tqdm(video_files, desc="Detected video files", unit=" files"):
             detections_file = self._save_path_provider.provide(
@@ -138,9 +136,14 @@ class VideoSource(InputSourceDetect):
                             )
                         counter += 1
                 self.notify_flush_event_observers(video_file, video_fps)
+                self._on_video_finished(video_file)
             except Exception as e:
                 log.error(f"Error processing {video_file}", exc_info=e)
 
+    def _on_video_finished(self, video_file: Path) -> None:
+        """Hook for handling video processing completion."""
+        pass
+
     def _extract_side_data(self, container: InputContainer) -> dict:
         try:
             return container.streams.video[0].side_data
@@ -151,7 +154,7 @@ class VideoSource(InputSourceDetect):
             )
             return {}
 
-    def __collect_files_to_detect(self) -> list[Path]:
+    def _collect_files_to_detect(self) -> Iterable[Path]:
         filetypes = self._current_config.filetypes.video_filetypes.to_list()
         video_files = get_files(
             paths=self._current_config.detect.paths, filetypes=filetypes

OTVision/track/stream_ottrk_file_writer.py

@@ -1,6 +1,8 @@
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
 
+from OTVision.abstraction.observer import Observer, Subject
 from OTVision.application.buffer import Buffer
 from OTVision.application.config import Config, TrackConfig
 from OTVision.application.configure_logger import logger
@@ -17,6 +19,11 @@ from OTVision.helpers.files import write_json
 STREAMING_FRAME_GROUP_ID = 0
 
 
+@dataclass(frozen=True)
+class OttrkFileWrittenEvent:
+    save_location: Path
+
+
 class StreamOttrkFileWriter(Buffer[TrackedFrame, OtdetFileWrittenEvent]):
     @property
     def config(self) -> Config:
@@ -38,12 +45,14 @@ class StreamOttrkFileWriter(Buffer[TrackedFrame, OtdetFileWrittenEvent]):
 
     def __init__(
         self,
+        subject: Subject[OttrkFileWrittenEvent],
         builder: OttrkBuilder,
         get_current_config: GetCurrentConfig,
         get_current_tracking_run_id: GetCurrentTrackingRunId,
         save_path_provider: OtvisionSavePathProvider,
     ) -> None:
         Buffer.__init__(self)
+        self._subject = subject
         self._builder = builder
         self._get_current_config = get_current_config
         self._current_tracking_run_id = get_current_tracking_run_id
@@ -118,12 +127,20 @@ class StreamOttrkFileWriter(Buffer[TrackedFrame, OtdetFileWrittenEvent]):
         self._current_output_file = None
 
     def write(self, ottrk: dict) -> None:
+        current_output_file = self.current_output_file
         write_json(
             dict_to_write=ottrk,
-            file=self.current_output_file,
+            file=current_output_file,
             filetype=self.config.filetypes.track,
             overwrite=True,
         )
+        self._notify_ottrk_file_written(save_location=current_output_file)
 
     def force_flush(self, _: Any) -> None:
         self._create_ottrk()
+
+    def register_observers(self, observer: Observer[OttrkFileWrittenEvent]) -> None:
+        self._subject.register(observer)
+
+    def _notify_ottrk_file_written(self, save_location: Path) -> None:
+        self._subject.notify(OttrkFileWrittenEvent(save_location=save_location))

OTVision/version.py

@@ -1,4 +1,4 @@
-__version__ = "v0.6.15"
+__version__ = "v0.6.17"
 
 
 def otdet_version() -> str:

{otvision-0.6.15.dist-info → otvision-0.6.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.15
+Version: 0.6.17
 Summary: OTVision is a core module of the OpenTrafficCam framework to perform object detection and tracking.
 Project-URL: Homepage, https://opentrafficcam.org/
 Project-URL: Documentation, https://opentrafficcam.org/overview/

{otvision-0.6.15.dist-info → otvision-0.6.17.dist-info}/RECORD

@@ -1,7 +1,7 @@
 OTVision/__init__.py,sha256=CLnfgTlVHM4_nzDacvy06Z_Crc3hU6usd0mUyEvBf24,781
 OTVision/config.py,sha256=D4NIio27JG9hZk7yHI6kNKiMxKeKa_MGfrKNDdEH370,5389
 OTVision/dataformat.py,sha256=BHF7qHzyNb80hI1EKfwcdJ9bgG_X4bp_hCXzdg7_MSA,1941
-OTVision/version.py,sha256=8tgEbcFFDS8lJGj0yPkcvnVArQ1MzgFTHMi_REfjPGw,176
+OTVision/version.py,sha256=Ay8_qdo-wXxrm9e-GbKoT9-hDKLEXS2tzcLHFDgMULk,176
 OTVision/abstraction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/abstraction/defaults.py,sha256=ftETDe25gmr563RPSbG6flcEiNiHnRb0iXK1Zj_zdNg,442
 OTVision/abstraction/observer.py,sha256=ZFGxUUjI3wUpf5ogXg2yDe-QjCcXre6SxH5zOogOx2U,1350
@@ -46,12 +46,12 @@ OTVision/detect/detected_frame_producer.py,sha256=thMg5nZNiArUpQI7ctGTQy8A2jxsZs
 OTVision/detect/detected_frame_producer_factory.py,sha256=HiFAHWTvilwyibDrzMv9skwu901d9QW3zvjc3q4Pp80,1576
 OTVision/detect/file_based_detect_builder.py,sha256=G72GFhF2BCXO3fwfC9pXkbJPhRFfU6RphLRQs3ugCUQ,2315
 OTVision/detect/otdet.py,sha256=cIwCBVFYWma7oJynoaT0eyIAZw-M2iH1xkvjy6-TwEM,8475
-OTVision/detect/otdet_file_writer.py,sha256=mGygzanR2WwIBBouUQYRVtYwtVAlLJZJtmshVwWTgdY,5164
+OTVision/detect/otdet_file_writer.py,sha256=0FezBon_R-ve0oYMWMCDytNHIMuOEQqFOWVU7Dr9iTo,5388
 OTVision/detect/pyav_frame_count_provider.py,sha256=w7p9iM3F2fljV8SD7q491gQhIHANbVczqtalcUiKj-E,453
 OTVision/detect/rtsp_based_detect_builder.py,sha256=P47nKU2C1PJQmokgacv04DzJ-7eG6CUbqqg3bdQhXTQ,2662
 OTVision/detect/rtsp_input_source.py,sha256=nF7AyRcbZlvYwPghvi3QbRPCHU9KTtcgtWiUdAAR4Jg,10806
 OTVision/detect/timestamper.py,sha256=VvDTzHu9fTI7qQL9x775Gc27r47R8D5Pb040ffwO04k,5288
-OTVision/detect/video_input_source.py,sha256=tyvaku4EIwCjCAQyA3lXKFtzVMF325CbrDdn24mfZl0,10124
+OTVision/detect/video_input_source.py,sha256=yosHCK5e737AmBk-AgF3sL9rs45w0AIwup0-hU3mf1A,10248
 OTVision/detect/yolo.py,sha256=JDnnPO-YO30tu61sw80K9qJS6_aYqdR2dQHAhtJ3tl0,10551
 OTVision/detect/plugin_av/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/detect/plugin_av/rotate_frame.py,sha256=4wJqTYI2HRlfa4p2Ffap33vLmKIzE_EwFvQraEkQ4R8,1055
@@ -82,7 +82,7 @@ OTVision/track/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/track/builder.py,sha256=iDq9-QxU8c3CQQd5HDPzT2qkXWIyFl0fk658KQ7Soh0,4905
 OTVision/track/cli.py,sha256=Lzmij9vMuaArB8MerDcGlaefwKMgRWNWov1YLGWA6SI,4294
 OTVision/track/id_generator.py,sha256=2Lkegjhz8T2FXiK1HaiS_FbNZrJjIWzHi407-IoKAHg,241
-OTVision/track/stream_ottrk_file_writer.py,sha256=TvJVumOTYUa10tC9_0-wUon1FKC0uJoh2wctRPX1aXg,4836
+OTVision/track/stream_ottrk_file_writer.py,sha256=4t8O5-DS2LXdgQHM5yn4s2ypdr0ACAsmzg4U6QZW1hU,5495
 OTVision/track/track.py,sha256=iMOaukcHnPhRiU1eEccaeGEKLzBQoilaUPRVmkmt0rk,2357
 OTVision/track/exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/track/exporter/filebased_exporter.py,sha256=sdaWY4CxjawyeEKG329T92Bodf1E8wjnXuXocv0Ppgo,986
@@ -110,7 +110,7 @@ OTVision/view/view_helpers.py,sha256=a5yV_6ZxO5bxsSymOmxdHqzOEv0VFq4wFBopVRGuVRo
 OTVision/view/view_track.py,sha256=vmfMqpbUfnzg_EsWiL-IIKNOApVF09dzSojHpUfYY6M,5393
 OTVision/view/view_transform.py,sha256=HvRd8g8geKRy0OoiZUDn_oC3SJC5nuXhZf3uZelfGKg,5473
 OTVision/view/helpers/OTC.ico,sha256=G9kwlDtgBXmXO3yxW6Z-xVFV2q4nUGuz9E1VPHSu_I8,21662
-otvision-0.6.15.dist-info/METADATA,sha256=cgqMMjvpJQPpg_TwDPAq3-dJrnh0W3jg8Q9tOrs1Qpw,6944
-otvision-0.6.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-otvision-0.6.15.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-otvision-0.6.15.dist-info/RECORD,,
+otvision-0.6.17.dist-info/METADATA,sha256=jHEqrFDQ7_q4medQTUzqTnm_6p_CvI3KvlK8rgi2WKQ,6944
+otvision-0.6.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+otvision-0.6.17.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+otvision-0.6.17.dist-info/RECORD,,