OTVision 0.6.12__py3-none-any.whl → 0.6.13__py3-none-any.whl

OTVision/application/track/ottrk.py

@@ -76,8 +76,9 @@ class OttrkBuilder:
             t_min=self.config.t_min,
             t_miss_max=self.config.t_miss_max,
         )
-        result[dataformat.TRACKING_RUN_ID] = self.config.tracking_run_id
-        result[dataformat.FRAME_GROUP] = self.config.frame_group
+        tracking_metadata = result[dataformat.TRACKING]
+        tracking_metadata[dataformat.TRACKING_RUN_ID] = self.config.tracking_run_id
+        tracking_metadata[dataformat.FRAME_GROUP] = self.config.frame_group
         return result
 
     def _build_data(self) -> list[dict]:

OTVision/detect/builder.py

@@ -68,6 +68,8 @@ class DetectBuilder(ABC):
 
     @cached_property
     def configure_logger(self) -> ConfigureLogger:
+        if self._configure_logger is not None:
+            return self._configure_logger
         return ConfigureLogger()
 
     @cached_property
@@ -94,6 +96,8 @@ class DetectBuilder(ABC):
 
     @cached_property
     def current_config(self) -> CurrentConfig:
+        if self.__current_config is not None:
+            return self.__current_config
         return CurrentConfig(Config())
 
     @cached_property
@@ -173,8 +177,15 @@ class DetectBuilder(ABC):
     def detect_config(self) -> DetectConfig:
         return self.current_config.get().detect
 
-    def __init__(self, argv: list[str] | None = None) -> None:
+    def __init__(
+        self,
+        argv: list[str] | None = None,
+        current_config: CurrentConfig | None = None,
+        configure_logger: ConfigureLogger | None = None,
+    ) -> None:
         self.argv = argv
+        self.__current_config = current_config
+        self._configure_logger = configure_logger
 
     @property
     @abstractmethod

OTVision/track/stream_ottrk_file_writer.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+from typing import Any
 
 from OTVision.application.buffer import Buffer
 from OTVision.application.config import Config, TrackConfig
@@ -66,7 +67,7 @@ class StreamOttrkFileWriter(Buffer[TrackedFrame, OtdetFileWrittenEvent]):
         )
         self._builder.set_config(builder_config)
         last_frame = tracked_frames[-1]
-        self._builder.add_tracked_frames(self._get_buffered_elements())
+        self._builder.add_tracked_frames(tracked_frames)
         self._ottrk_unfinished_tracks = last_frame.unfinished_tracks
         self.reset()
 
@@ -103,9 +104,18 @@ class StreamOttrkFileWriter(Buffer[TrackedFrame, OtdetFileWrittenEvent]):
             )
             logger().warning(f"Unfinished tracks: {self._ottrk_unfinished_tracks}")
             if self.build_condition_fulfilled:
-                ottrk_data = self._builder.build()
-                self.write(ottrk_data)
-                self._in_writing_state = False
+                self._create_ottrk()
+
+    def _create_ottrk(self) -> None:
+        ottrk_data = self._builder.build()
+        self.write(ottrk_data)
+        self.full_reset()
+
+    def full_reset(self) -> None:
+        self._in_writing_state = False
+        self._builder.reset()
+        self._ottrk_unfinished_tracks = set()
+        self._current_output_file = None
 
     def write(self, ottrk: dict) -> None:
         write_json(
@@ -114,3 +124,6 @@ class StreamOttrkFileWriter(Buffer[TrackedFrame, OtdetFileWrittenEvent]):
             filetype=self.config.filetypes.track,
             overwrite=True,
         )
+
+    def force_flush(self, _: Any) -> None:
+        self._create_ottrk()

OTVision/version.py

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

{otvision-0.6.12.dist-info → otvision-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.12
+Version: 0.6.13
 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.12.dist-info → otvision-0.6.13.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=plkk-RqvsoYUO7Fil9ftBpALgkBi4uzxwKNZ6i97lao,176
+OTVision/version.py,sha256=t4XRU5FuVuapP20T04ET8T9jvyZRnq6E2-O-wkyzqt4,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
@@ -29,7 +29,7 @@ OTVision/application/event/new_otvision_config.py,sha256=Xt2YcuPfn57VUYW1nYrH1-o
 OTVision/application/event/new_video_start.py,sha256=Ydkao4v3fagJUvXASkvxgmplRb7PYY88cmj-bSxmzfk,148
 OTVision/application/track/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/application/track/get_track_cli_args.py,sha256=uebHGDB6xzttak_Z4Nos08Ay69QKT2JypfHwn1dLpIM,553
-OTVision/application/track/ottrk.py,sha256=h7fkgBagCcQI9M7rI7Q4fF34pvRugAmJLnIcbdMoTyo,6711
+OTVision/application/track/ottrk.py,sha256=OfFLZbChOB5WJIdZdyINMpBQYdOvf10q_8bVooo5Sjk,6789
 OTVision/application/track/tracking_run_id.py,sha256=9_RgQSHR-IMgAM4LawtJWxNcVyw_E6qkZdVes3JVV0g,961
 OTVision/application/track/update_current_track_config.py,sha256=pCFNuGl6rqpsUUGm2i1kjLSuuITVXv2R79Xf81n45as,1667
 OTVision/application/track/update_track_config_with_cli_args.py,sha256=5MDr2ih4xHzZ0kI6TSQ2C4mcWsPXW2PB80kA22-M_5I,2273
@@ -38,7 +38,7 @@ OTVision/application/video/generate_video.py,sha256=4zazQoRdwefF_R-sUcnbP-23NTWg
 OTVision/convert/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/convert/convert.py,sha256=UUfzpbtMlxlJgKE6XeT5nyNqK26-K02bQDhq3o7KrXE,11050
 OTVision/detect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-OTVision/detect/builder.py,sha256=Q6xeeP1ulxRKGvVevr-pPcFhixZHcQ9CpRvjkRWDGxg,7641
+OTVision/detect/builder.py,sha256=uHiAfPjQLtedkSdBe7J3mxjcefr3OIItUNq-TKCeWX8,8047
 OTVision/detect/cli.py,sha256=3yf0G_B9cVm2CAz7AFzG10Cctv4ogMOxRHWEg8SZHss,7562
 OTVision/detect/detect.py,sha256=YaVS-DJXdEmh-OzwE31UPNl2uk7mcFyO_CKKTgMeiuM,1328
 OTVision/detect/detected_frame_buffer.py,sha256=zZZZBcpNcKApPMX4xoLeq7xszDCvxA3eOF_umrwo0N4,1931
@@ -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=SyIVo2NVhrVWPbneK4Wi1cZcG6BwlzeBObYRl7_1G-A,4526
+OTVision/track/stream_ottrk_file_writer.py,sha256=TvJVumOTYUa10tC9_0-wUon1FKC0uJoh2wctRPX1aXg,4836
 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.12.dist-info/METADATA,sha256=f1uOdcqbVEmAjNVGg0LFgoAds-J-cyooi4_NX-q6nAU,6944
-otvision-0.6.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-otvision-0.6.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-otvision-0.6.12.dist-info/RECORD,,
+otvision-0.6.13.dist-info/METADATA,sha256=FgCDRqpz_yjT_vcvXX4Fg7ABwOlW1KxN9P2znJH5O_M,6944
+otvision-0.6.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+otvision-0.6.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+otvision-0.6.13.dist-info/RECORD,,