OTVision 0.6.11__tar.gz → 0.6.13__tar.gz

{otvision-0.6.11 → otvision-0.6.13}/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-0.6.11 → otvision-0.6.13}/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-0.6.11 → otvision-0.6.13}/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-0.6.11 → otvision-0.6.13}/OTVision/version.py

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

{otvision-0.6.11 → otvision-0.6.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.11
+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/
@@ -26,7 +26,7 @@ Requires-Dist: more-itertools==10.7.0
 Requires-Dist: moviepy==1.0.3
 Requires-Dist: numpy==1.26.4; sys_platform == 'win32'
 Requires-Dist: numpy==2.1.1; sys_platform != 'win32'
-Requires-Dist: opencv-python==4.10.0.84
+Requires-Dist: opencv-python-headless==4.10.0.84
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: tqdm==4.67.1

{otvision-0.6.11 → otvision-0.6.13}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
     "moviepy==1.0.3",
     "numpy==2.1.1; sys_platform != 'win32'",
     "numpy==1.26.4; sys_platform == 'win32'",
-    "opencv-python==4.10.0.84",
+    "opencv-python-headless==4.10.0.84",
     "pandas==2.2.3",
     "PyYAML==6.0.2",
     "tqdm==4.67.1",

{otvision-0.6.11 → otvision-0.6.13}/tests/application/track/test_ottrk.py

@@ -348,6 +348,8 @@ def create_expected_track_metadata(
                 config.t_min,
                 config.t_miss_max,
             ),
+            dataformat.TRACKING_RUN_ID: config.tracking_run_id,
+            dataformat.FRAME_GROUP: config.frame_group,
         },
     }
 
@@ -431,14 +433,11 @@ def create_expected_ottrk(
 ) -> dict:
     otdet_metadata = create_otdet_metadata(actual_duration, expected_duration)
     track_metadata = create_expected_track_metadata(actual_duration, expected_duration)
-    config = create_ottrk_builder_config(actual_duration, expected_duration)
 
     # Add the missing fields that OttrkBuilder adds
     combined_metadata = {
         **otdet_metadata,
         **track_metadata,
-        dataformat.TRACKING_RUN_ID: config.tracking_run_id,
-        dataformat.FRAME_GROUP: config.frame_group,
     }
 
     return {

{otvision-0.6.11 → otvision-0.6.13}/uv.lock

@@ -1015,8 +1015,8 @@ name = "opencv-python"
 version = "4.10.0.84"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "numpy", version = "1.26.4", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
-    { name = "numpy", version = "2.1.1", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform == 'darwin' or sys_platform == 'linux' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
+    { name = "numpy", version = "1.26.4", source = { registry = "https://pypi.org/simple" }, marker = "(sys_platform == 'win32' and extra == 'extra-8-otvision-inference-cpu') or (sys_platform == 'win32' and extra == 'extra-8-otvision-inference-cuda') or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
+    { name = "numpy", version = "2.1.1", source = { registry = "https://pypi.org/simple" }, marker = "(sys_platform == 'darwin' and extra == 'extra-8-otvision-inference-cpu') or (sys_platform == 'darwin' and extra == 'extra-8-otvision-inference-cuda') or (sys_platform == 'linux' and extra == 'extra-8-otvision-inference-cpu') or (sys_platform == 'linux' and extra == 'extra-8-otvision-inference-cuda') or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/4a/e7/b70a2d9ab205110d715906fc8ec83fbb00404aeb3a37a0654fdb68eb0c8c/opencv-python-4.10.0.84.tar.gz", hash = "sha256:72d234e4582e9658ffea8e9cae5b63d488ad06994ef12d81dc303b17472f3526", size = 95103981, upload-time = "2024-06-17T18:29:56.757Z" }
 wheels = [
@@ -1028,6 +1028,24 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ec/6c/fab8113424af5049f85717e8e527ca3773299a3c6b02506e66436e19874f/opencv_python-4.10.0.84-cp37-abi3-win_amd64.whl", hash = "sha256:32dbbd94c26f611dc5cc6979e6b7aa1f55a64d6b463cc1dcd3c95505a63e48fe", size = 38842521, upload-time = "2024-06-17T18:28:21.813Z" },
 ]
 
+[[package]]
+name = "opencv-python-headless"
+version = "4.10.0.84"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "numpy", version = "1.26.4", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
+    { name = "numpy", version = "2.1.1", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform == 'darwin' or sys_platform == 'linux' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/2f/7e/d20f68a5f1487adf19d74378d349932a386b1ece3be9be9915e5986db468/opencv-python-headless-4.10.0.84.tar.gz", hash = "sha256:f2017c6101d7c2ef8d7bc3b414c37ff7f54d64413a1847d89970b6b7069b4e1a", size = 95117755, upload-time = "2024-06-17T18:32:15.606Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1c/9b/583c8d9259f6fc19413f83fd18dd8e6cbc8eefb0b4dc6da52dd151fe3272/opencv_python_headless-4.10.0.84-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:a4f4bcb07d8f8a7704d9c8564c224c8b064c63f430e95b61ac0bffaa374d330e", size = 54835657, upload-time = "2024-06-18T04:58:12.904Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/7b/b4c67f5dad7a9a61c47f7a39e4050e8a4628bd64b3c3daaeb755d759f928/opencv_python_headless-4.10.0.84-cp37-abi3-macosx_12_0_x86_64.whl", hash = "sha256:5ae454ebac0eb0a0b932e3406370aaf4212e6a3fdb5038cc86c7aea15a6851da", size = 56475470, upload-time = "2024-06-17T19:34:39.604Z" },
+    { url = "https://files.pythonhosted.org/packages/91/61/f838ce2046f3ec3591ea59ea3549085e399525d3b4558c4ed60b55ed88c0/opencv_python_headless-4.10.0.84-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:46071015ff9ab40fccd8a163da0ee14ce9846349f06c6c8c0f2870856ffa45db", size = 29329705, upload-time = "2024-06-17T20:00:49.406Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/09/248f86a404567303cdf120e4a301f389b68e3b18e5c0cc428de327da609c/opencv_python_headless-4.10.0.84-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:377d08a7e48a1405b5e84afcbe4798464ce7ee17081c1c23619c8b398ff18295", size = 49858781, upload-time = "2024-06-17T18:31:49.495Z" },
+    { url = "https://files.pythonhosted.org/packages/30/c0/66f88d58500e990a9a0a5c06f98862edf1d0a3a430781218a8c193948438/opencv_python_headless-4.10.0.84-cp37-abi3-win32.whl", hash = "sha256:9092404b65458ed87ce932f613ffbb1106ed2c843577501e5768912360fc50ec", size = 28675298, upload-time = "2024-06-17T18:28:56.897Z" },
+    { url = "https://files.pythonhosted.org/packages/26/d0/22f68eb23eea053a31655960f133c0be9726c6a881547e6e9e7e2a946c4f/opencv_python_headless-4.10.0.84-cp37-abi3-win_amd64.whl", hash = "sha256:afcf28bd1209dd58810d33defb622b325d3cbe49dcd7a43a902982c33e5fad05", size = 38754031, upload-time = "2024-06-17T18:29:04.871Z" },
+]
+
 [[package]]
 name = "otvision"
 source = { editable = "." }
@@ -1042,7 +1060,7 @@ dependencies = [
     { name = "moviepy", marker = "sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
     { name = "numpy", version = "1.26.4", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
     { name = "numpy", version = "2.1.1", source = { registry = "https://pypi.org/simple" }, marker = "sys_platform == 'darwin' or sys_platform == 'linux' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
-    { name = "opencv-python", marker = "sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
+    { name = "opencv-python-headless", marker = "sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
     { name = "pandas", marker = "sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
     { name = "pyyaml", marker = "sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
     { name = "tqdm", marker = "sys_platform == 'darwin' or sys_platform == 'linux' or sys_platform == 'win32' or (extra == 'extra-8-otvision-inference-cpu' and extra == 'extra-8-otvision-inference-cuda')" },
@@ -1097,7 +1115,7 @@ requires-dist = [
     { name = "moviepy", specifier = "==1.0.3" },
     { name = "numpy", marker = "sys_platform != 'win32'", specifier = "==2.1.1" },
     { name = "numpy", marker = "sys_platform == 'win32'", specifier = "==1.26.4" },
-    { name = "opencv-python", specifier = "==4.10.0.84" },
+    { name = "opencv-python-headless", specifier = "==4.10.0.84" },
     { name = "pandas", specifier = "==2.2.3" },
     { name = "pyyaml", specifier = "==6.0.2" },
     { name = "tensorrt", marker = "sys_platform != 'darwin' and extra == 'inference-cuda'", specifier = "==10.12.0.36", index = "https://pypi.nvidia.com/", conflict = { package = "otvision", extra = "inference-cuda" } },