OTVision 0.6.5__py3-none-any.whl → 0.6.7__py3-none-any.whl

OTVision/application/detect/detected_frame_factory.py

@@ -20,6 +20,7 @@ class DetectedFrameFactory:
 
         return DetectedFrame(
             source=frame[FrameKeys.source],
+            output=frame[FrameKeys.output],
             no=frame[FrameKeys.frame],
             occurrence=frame[FrameKeys.occurrence],
             detections=detections,

OTVision/detect/otdet_file_writer.py

@@ -62,7 +62,7 @@ class OtdetFileWriter:
         detect_config = config.detect
 
         actual_frames = len(event.frames)
-        if (expected_duration := detect_config.expected_duration) is not None:
+        if expected_duration := detect_config.expected_duration:
             actual_fps = actual_frames / expected_duration.total_seconds()
         else:
             actual_fps = actual_frames / source_metadata.duration.total_seconds()

OTVision/detect/rtsp_input_source.py

@@ -27,10 +27,12 @@ from OTVision.domain.time import DatetimeProvider
 
 RTSP_URL = "rtsp://127.0.0.1:8554/test"
 RETRY_SECONDS = 1
+DEFAULT_READ_FAIL_THRESHOLD = 5
 
 
 class Counter:
     def __init__(self, start_value: int = 0) -> None:
+        self._start_value = start_value
         self.__counter = start_value
 
     def increment(self) -> None:
@@ -39,6 +41,9 @@ class Counter:
     def get(self) -> int:
         return self.__counter
 
+    def reset(self) -> None:
+        self.__counter = self._start_value
+
 
 class RtspInputSource(InputSourceDetect):
 
@@ -68,12 +73,17 @@ class RtspInputSource(InputSourceDetect):
     def flush_buffer_size(self) -> int:
         return self.stream_config.flush_buffer_size
 
+    @property
+    def fps(self) -> float:
+        return self.config.convert.output_fps
+
     def __init__(
         self,
         subject: Subject[FlushEvent],
         datetime_provider: DatetimeProvider,
         frame_counter: Counter,
         get_current_config: GetCurrentConfig,
+        read_fail_threshold: int = DEFAULT_READ_FAIL_THRESHOLD,
     ) -> None:
         super().__init__(subject)
         self._datetime_provider = datetime_provider
@@ -82,6 +92,11 @@ class RtspInputSource(InputSourceDetect):
         self._get_current_config = get_current_config
         self._current_stream: str | None = None
         self._current_video_capture: VideoCapture | None = None
+        self._stream_start_time: datetime = self._datetime_provider.provide()
+        self._current_video_start_time = self._stream_start_time
+        self._outdated = True
+        self._read_fail_threshold = read_fail_threshold
+        self._consecutive_read_fails = 0
 
     @property
     def _video_capture(self) -> VideoCapture:
@@ -106,20 +121,30 @@ class RtspInputSource(InputSourceDetect):
         return self._current_video_capture
 
     def produce(self) -> Generator[Frame, None, None]:
-        start_time = self._datetime_provider.provide()
+        self._stream_start_time = self._datetime_provider.provide()
+        self._current_video_start_time = self._stream_start_time
         while not self.should_stop():
             if (frame := self._read_next_frame()) is not None:
                 self._frame_counter.increment()
+                occurrence = self._datetime_provider.provide()
+
+                if self._outdated:
+                    self._current_video_start_time = occurrence
+                    self._outdated = False
 
                 yield Frame(
                     data=convert_frame_to_rgb(frame),  # YOLO expects RGB
                     frame=self.current_frame_number,
                     source=self.rtsp_url,
-                    occurrence=self._datetime_provider.provide(),
+                    output=self.create_output(),
+                    occurrence=occurrence,
                 )
                 if self.flush_condition_met():
-                    self._notify(start_time)
-        self._notify(start_time)
+                    self._notify()
+                    self._outdated = True
+                    self._frame_counter.reset()
+
+        self._notify()
 
     def _init_video_capture(self, source: str) -> VideoCapture:
         cap = VideoCapture(source)
@@ -136,10 +161,22 @@ class RtspInputSource(InputSourceDetect):
     def _read_next_frame(self) -> ndarray | None:
         successful, frame = self._video_capture.read()
         if successful:
+            self._consecutive_read_fails = 0
             return frame
+        self._consecutive_read_fails += 1
+
+        if self._consecutive_read_fails >= self._read_fail_threshold:
+            self._try_reconnecting_stream()
+
         logger().debug("Failed to grab frame")
         return None
 
+    def _try_reconnecting_stream(self) -> None:
+        self._video_capture.release()
+        self._current_video_capture = None
+        if not self.should_stop() and self._current_stream is not None:
+            self._current_video_capture = self._init_video_capture(self._current_stream)
+
     def should_stop(self) -> bool:
         return self._stop_capture
 
@@ -152,24 +189,16 @@ class RtspInputSource(InputSourceDetect):
     def flush_condition_met(self) -> bool:
         return self.current_frame_number % self.flush_buffer_size == 0
 
-    def _notify(self, start_time: datetime) -> None:
+    def _notify(self) -> None:
         frame_width = int(self._video_capture.get(CAP_PROP_FRAME_WIDTH))
         frame_height = int(self._video_capture.get(CAP_PROP_FRAME_HEIGHT))
-        fps = self.config.convert.output_fps
-        _start_time = calculate_start_time(
-            start_time, self.current_frame_number, fps, self.flush_buffer_size
-        )
         frames = (
             self.flush_buffer_size
             if self.current_frame_number % self.flush_buffer_size == 0
             else self.current_frame_number % self.flush_buffer_size
         )
-        duration = timedelta(seconds=round(frames / fps))
-        output_filename = (
-            f"{self.stream_config.name}_FR{round(fps)}"
-            f"_{_start_time.strftime(DATETIME_FORMAT)}.mp4"
-        )
-        output = str(self.stream_config.save_dir / output_filename)
+        duration = timedelta(seconds=round(frames / self.fps))
+        output = self.create_output()
         self._subject.notify(
             FlushEvent.create(
                 source=self.rtsp_url,
@@ -177,22 +206,17 @@ class RtspInputSource(InputSourceDetect):
                 duration=duration,
                 source_width=frame_width,
                 source_height=frame_height,
-                source_fps=fps,
-                start_time=_start_time,
+                source_fps=self.fps,
+                start_time=self._current_video_start_time,
             )
         )
 
-
-def calculate_start_time(
-    start: datetime, current_frame_number: int, fps: float, flush_buffer_size: int
-) -> datetime:
-    offset_in_frames = (
-        current_frame_number // flush_buffer_size - 1
-    ) * flush_buffer_size
-    if offset_in_frames == 0:
-        return start
-    offset_in_seconds = offset_in_frames / fps
-    return start + timedelta(seconds=offset_in_seconds)
+    def create_output(self) -> str:
+        output_filename = (
+            f"{self.stream_config.name}_FR{round(self.fps)}"
+            f"_{self._current_video_start_time.strftime(DATETIME_FORMAT)}.mp4"
+        )
+        return str(self.stream_config.save_dir / output_filename)
 
 
 def convert_frame_to_rgb(frame: ndarray) -> ndarray:

OTVision/detect/timestamper.py

@@ -61,6 +61,7 @@ class VideoTimestamper(Timestamper):
             data=frame[FrameKeys.data],
             frame=frame[FrameKeys.frame],
             source=frame[FrameKeys.source],
+            output=frame[FrameKeys.output],
             occurrence=occurrence,
         )
 

OTVision/detect/video_input_source.py

@@ -116,6 +116,7 @@ class VideoSource(InputSourceDetect):
                                     FrameKeys.data: rotated_image,
                                     FrameKeys.frame: frame_number,
                                     FrameKeys.source: str(video_file),
+                                    FrameKeys.output: str(video_file),
                                 }
                             )
                         else:
@@ -124,6 +125,7 @@ class VideoSource(InputSourceDetect):
                                     FrameKeys.data: None,
                                     FrameKeys.frame: frame_number,
                                     FrameKeys.source: str(video_file),
+                                    FrameKeys.output: str(video_file),
                                 }
                             )
                         counter += 1
@@ -206,8 +208,9 @@ class VideoSource(InputSourceDetect):
     def __add_occurrence(self, timestamper: Timestamper, frame: dict) -> Frame:
         updated = timestamper.stamp(frame)
         return Frame(
-            data=updated["data"],
-            frame=updated["frame"],
-            source=updated["source"],
-            occurrence=updated["occurrence"],
+            data=updated[FrameKeys.data],
+            frame=updated[FrameKeys.frame],
+            source=updated[FrameKeys.source],
+            output=updated[FrameKeys.output],
+            occurrence=updated[FrameKeys.occurrence],
         )

OTVision/domain/frame.py

@@ -20,6 +20,7 @@ class FrameKeys:
     frame: Literal["frame"] = "frame"
     source: Literal["source"] = "source"
     occurrence: Literal["occurrence"] = "occurrence"
+    output: Literal["output"] = "output"
 
 
 class Frame(TypedDict):
@@ -35,6 +36,7 @@ class Frame(TypedDict):
     data: Optional[ndarray]
     frame: int
     source: str
+    output: str
     occurrence: datetime
 
 
@@ -49,6 +51,7 @@ class DetectedFrame:
         no (FrameNo): Frame number.
         occurrence (datetime): Time stamp, at which frame was recorded.
         source (str): Source from where frame was obtained, e.g. video file path.
+        output (str): Output file name, e.g. video file name.
         detections (Sequence[Detection]): A sequence of Detections occurring in frame.
         image (Optional[ndarray]): Optional image data of frame.
     """
@@ -56,6 +59,7 @@ class DetectedFrame:
     no: FrameNo
     occurrence: datetime
     source: str
+    output: str
     detections: Sequence[Detection]
     image: Optional[ndarray] = None
 
@@ -64,6 +68,7 @@ class DetectedFrame:
             no=self.no,
             occurrence=self.occurrence,
             source=self.source,
+            output=self.output,
             detections=self.detections,
             image=None,
         )
@@ -153,6 +158,7 @@ class TrackedFrame(DetectedFrame):
             no=self.no,
             occurrence=self.occurrence,
             source=self.source,
+            output=self.output,
             finished_tracks=self.finished_tracks,
             detections=detections,
             image=self.image,

OTVision/track/parser/chunk_parser_plugins.py

@@ -62,6 +62,7 @@ class JsonChunkParser(ChunkParser):
                 no=int(key) + frame_offset,
                 occurrence=occurrence,
                 source=str(file),
+                output=str(file),
                 detections=detections,
                 image=None,
             )

OTVision/track/tracker/tracker_plugin_iou.py

@@ -222,6 +222,7 @@ class IouTracker(Tracker):
             no=frame.no,
             occurrence=frame.occurrence,
             source=frame.source,
+            output=frame.output,
             detections=tracked_detections,
             image=frame.image,
             finished_tracks=set(finished_track_ids),

OTVision/version.py

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

{otvision-0.6.5.dist-info → otvision-0.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.5
+Version: 0.6.7
 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/
@@ -27,7 +27,6 @@ Requires-Dist: numpy==2.1.1; sys_platform != 'win32'
 Requires-Dist: opencv-python==4.10.0.84
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pyyaml==6.0.2
-Requires-Dist: setuptools==74.0.0
 Requires-Dist: torch==2.3.1
 Requires-Dist: torchvision==0.18.1
 Requires-Dist: tqdm==4.67.1

{otvision-0.6.5.dist-info → otvision-0.6.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 OTVision/__init__.py,sha256=CLnfgTlVHM4_nzDacvy06Z_Crc3hU6usd0mUyEvBf24,781
 OTVision/config.py,sha256=0ecnI0N2rS2q0Ld6gBpK4iU2iyuUw683XWjj4g-L1m4,5336
 OTVision/dataformat.py,sha256=BHF7qHzyNb80hI1EKfwcdJ9bgG_X4bp_hCXzdg7_MSA,1941
-OTVision/version.py,sha256=pPG0EpzyxpxNsBhpPGGgivl4nunilLlKyXa5gBTSYYo,175
+OTVision/version.py,sha256=FMJEQ4Oc-KD5z3-00dYgMptQRxDN5LgvDe6DvUmDwwI,175
 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
@@ -18,7 +18,7 @@ OTVision/application/update_current_config.py,sha256=iW1rpCClTHn8tnmVSpLVxdEB0nh
 OTVision/application/detect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/application/detect/current_object_detector.py,sha256=J4U5k1s902agN90FYR4M_gO8MYYa_5XkYGREjStWCxQ,1343
 OTVision/application/detect/current_object_detector_metadata.py,sha256=xai0UBEzxr-rxXCc8mTmNDECds7mdsw2sem5HZxvQ4Q,1017
-OTVision/application/detect/detected_frame_factory.py,sha256=Rl6ElFYulgWPK_XZQSXZcT6caF8hvfzMKsOFefYO_pY,963
+OTVision/application/detect/detected_frame_factory.py,sha256=sW_l0xaPz44_lPEmCPKz4Xg1Mv4ZGKN9CyBCG_iN8dQ,1007
 OTVision/application/detect/detected_frame_producer.py,sha256=LD4AnQG04YGE68TpxmaRuWRZeCZfhp8oixk6SHTru7c,906
 OTVision/application/detect/detection_file_save_path_provider.py,sha256=nUyzgR7imrH8PkUl_72kdUDiolPXq1_RQqbpFwLI5Cs,2165
 OTVision/application/detect/factory.py,sha256=UCnLtgpWdNqwwjW0v2yzKF9Gacx6gewjTyy43wXs2Jg,938
@@ -38,12 +38,12 @@ OTVision/detect/detect.py,sha256=YaVS-DJXdEmh-OzwE31UPNl2uk7mcFyO_CKKTgMeiuM,132
 OTVision/detect/detected_frame_buffer.py,sha256=TrLbImpvCm1B09Z3c000e2uDO5WguyVwoMmFAqH8Zvk,1505
 OTVision/detect/file_based_detect_builder.py,sha256=C6BqVuknbJzX-B4N4nSwJgEpt9Nf79Oen8H6so9AflU,754
 OTVision/detect/otdet.py,sha256=-8rZGY9NVRAwIHeVcNCjm665SmnW5UVIO_PSKdHegDA,6274
-OTVision/detect/otdet_file_writer.py,sha256=l4NRWwMywiho4KOhrzxpJqAklyzE6nOtxpkt1kyy3Ss,4318
+OTVision/detect/otdet_file_writer.py,sha256=idgPKwhgEd18HT7HshaT304JPlSw0kT4Isn2gWJRaSk,4304
 OTVision/detect/pyav_frame_count_provider.py,sha256=w7p9iM3F2fljV8SD7q491gQhIHANbVczqtalcUiKj-E,453
 OTVision/detect/rtsp_based_detect_builder.py,sha256=5-jg4ivJhiWi3PVIILVThorDNKg-i4Z-rFqZ2n01RDY,1322
-OTVision/detect/rtsp_input_source.py,sha256=U0yY-t56wxyh1j-7R48Dbrb4bTGYnCwIAiuHZjM2EGw,6568
-OTVision/detect/timestamper.py,sha256=lexX7zahtoyg0tnyu5lkiqHvauewqBCLe0DPXBR10YY,5244
-OTVision/detect/video_input_source.py,sha256=vaf1RfoeXnOqrk76xvcrX_UsAseNKeKXkg73Aurj3NI,8555
+OTVision/detect/rtsp_input_source.py,sha256=11R6ogEJ8tNBi7qYdV3RzlP_Bp1jojSnQe_tpDBvZBs,7552
+OTVision/detect/timestamper.py,sha256=VvDTzHu9fTI7qQL9x775Gc27r47R8D5Pb040ffwO04k,5288
+OTVision/detect/video_input_source.py,sha256=GLzG4LeZNYcOE1tHyebL51HxBHzJOVaDfJKsLiAtu4A,8775
 OTVision/detect/yolo.py,sha256=Ksj8X7DZmONalaMB_iz-AtXwhEk4Fu7nZNzrXpqfhQw,10451
 OTVision/detect/plugin_av/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/detect/plugin_av/rotate_frame.py,sha256=4wJqTYI2HRlfa4p2Ffap33vLmKIzE_EwFvQraEkQ4R8,1055
@@ -52,7 +52,7 @@ OTVision/domain/cli.py,sha256=VNZZ_zc1x6RzndQlOFp5HSeWTg_VAiF1G3IhYymdrzA,1781
 OTVision/domain/current_config.py,sha256=Q38NCktoGNU1Z_miXNoJXLH8-NDbVszwVOMGR1aAwWM,286
 OTVision/domain/detect_producer_consumer.py,sha256=gD7NwscQZLmCxMDZpZkGql0oMrpGHDBBNvdTXs58Vvw,855
 OTVision/domain/detection.py,sha256=SZLP-87XE3NcTkeYz7GTqp4oPMiqI1P5gILp1_yHtxY,3761
-OTVision/domain/frame.py,sha256=qHduCRbBTgzGLIuu7MlLWvhzphPlD3V0nrjlEApmr00,6211
+OTVision/domain/frame.py,sha256=Hv1v9cegfhVGgl2MB4uKYbvngfkOLrvES_w4gD0HtMo,6410
 OTVision/domain/input_source_detect.py,sha256=9DzkTg5dh7_KmxE9oxdmxrcTYhvZY8hHLZwhrh7Gz2o,1245
 OTVision/domain/object_detection.py,sha256=kyrTbP9sZBKtGo54vCNfluDMM8wpWZST9Oqf8m8Q1y4,1394
 OTVision/domain/serialization.py,sha256=S7gb648z_W8U3Fb6TSk7hVU4qHlGwOZ7D6FeYSLXQwM,257
@@ -81,11 +81,11 @@ OTVision/track/model/filebased/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 OTVision/track/model/filebased/frame_chunk.py,sha256=rXhQCHXWGJbePy5ZW3JZCdltGz5mZxFdcrW0mgez-2k,6771
 OTVision/track/model/filebased/frame_group.py,sha256=f-hXS1Vc5U_qf2cgNbYVeSTZ3dg5NUJhasOEHuuX1HE,2977
 OTVision/track/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-OTVision/track/parser/chunk_parser_plugins.py,sha256=ojBv_mCOXABmygxz5mhXzeysur3ECmT4a4VlGkeT11k,3108
+OTVision/track/parser/chunk_parser_plugins.py,sha256=X86W_TBQN20ldZIEuv63FSvWBacG0wEaD0YkC9jcJVg,3142
 OTVision/track/parser/frame_group_parser_plugins.py,sha256=TWnGhM-N7ldN8LHZ1YYecEjn4xo2o91PyOGgr4Jzh9M,5479
 OTVision/track/tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/track/tracker/filebased_tracking.py,sha256=H3WYbsSca-67898diBoixpLjBqQDnOSiqnbvvySE6fc,6576
-OTVision/track/tracker/tracker_plugin_iou.py,sha256=PQOB3fXlNKSTEGK7HFfaUfTRgXSY1ZhlVmjk1VWugFU,7484
+OTVision/track/tracker/tracker_plugin_iou.py,sha256=AecE4CXRf4qUdN3_AvSFcsW4so-zDUGAVXqzfjSb-i0,7517
 OTVision/transform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/transform/get_homography.py,sha256=29waW61uzCCB7tlBAS2zck9sliAxZqnjjOa4jOOHHIc,5970
 OTVision/transform/reference_points_picker.py,sha256=LOmwzCaqbJnXVhaTSaZtkCzTMDamYjbTpY8I99pN0rg,16578
@@ -98,7 +98,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.5.dist-info/METADATA,sha256=-YE_U1NlesErB101C72im0uWFlf_7ItDmD0YIg5cVvY,6262
-otvision-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-otvision-0.6.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-otvision-0.6.5.dist-info/RECORD,,
+otvision-0.6.7.dist-info/METADATA,sha256=kt20s58WTB5nfTZK6ow-iXvXmiBlOQmRk0Dks_PalDE,6228
+otvision-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+otvision-0.6.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+otvision-0.6.7.dist-info/RECORD,,