OTVision 0.6.6__tar.gz → 0.6.7__tar.gz

{otvision-0.6.6 → otvision-0.6.7}/.github/workflows/release-testpypi.yml

@@ -26,14 +26,37 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+
+      - name: Fetch all tags
+        run: git fetch --tags --unshallow
+
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.12"
+
+      - name: Get latest tag and create new version
+        id: get_version
+        run: |
+          # Get the latest tag in format v*.*.* (ignoring tags like "nightly")
+          LATEST_TAG="$(git tag -l "v*.*.*" | sort -V | tail -n 1 || echo 'v0.0.0')"
+          # Extract version without 'v' prefix
+          VERSION="${LATEST_TAG#v}"
+          # Split version into parts
+          IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
+          # Increment patch version
+          PATCH="$((PATCH + 1))"
+          # Create new version with incremented patch
+          INCREMENTED_VERSION="$MAJOR.$MINOR.$PATCH"
+          DATE_TIME="$(date +'%Y%m%d%H%M%S')"
+          NEW_VERSION="${INCREMENTED_VERSION}a${DATE_TIME}"
+          echo "Final version: $NEW_VERSION"
+          echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Update Python Package Version
         uses: platomo/update-version-py-action@v1.0.1
         with:
-          version: nightly
+          version: ${{ steps.get_version.outputs.new_version }}
           file-path: "OTVision"
       - name: Install pypa/build
         shell: bash

{otvision-0.6.6 → otvision-0.6.7}/.pre-commit-config.yaml

@@ -63,14 +63,13 @@ repos:
           - pre-commit==3.8.0
           - pytest-cov==5.0.0
           - pytest==8.3.3
-          - torch==2.3.1
           - torchvision==0.18.1
           - twine==6.1.0
           - types-PyYAML
           - types-flake8
           - types-geopandas
           - types-jsonschema
-          - types-setuptools
+          - types-torch
           - types-tqdm
           - types-ujson
           - ultralytics==8.3.94

{otvision-0.6.6 → otvision-0.6.7}/OTVision/detect/rtsp_input_source.py

@@ -27,6 +27,7 @@ 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:
@@ -82,6 +83,7 @@ class RtspInputSource(InputSourceDetect):
         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
@@ -93,6 +95,8 @@ class RtspInputSource(InputSourceDetect):
         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:
@@ -157,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
 

{otvision-0.6.6 → otvision-0.6.7}/OTVision/version.py

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

{otvision-0.6.6 → otvision-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.6
+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.6 → otvision-0.6.7}/requirements.txt

@@ -9,7 +9,6 @@ numpy==1.26.4; sys_platform == 'win32' # ultralytics requires numpy <= 2.1.1; to
 opencv-python==4.10.0.84 # only upgrade when https://github.com/opencv/opencv/issues/27091 is resolved
 pandas==2.2.3
 PyYAML==6.0.2
-setuptools==74.0.0
 # Follow instructions at https://pytorch.org to install torch with CUDA
 torch==2.3.1 #  NOTE: Omit if using torch with CUDA and install manually
 torchvision==0.18.1 # NOTE: Omit if using torch with CUDA and install manually

{otvision-0.6.6 → otvision-0.6.7}/tests/detect/test_rtsp_input_source.py

@@ -80,8 +80,8 @@ class TestRtspInputSource:
     def test_produce(
         self, mock_video_capture: Mock, mock_convert_frame_to_rgb: Mock
     ) -> None:
-        given = create_given(mock_video_capture, mock_convert_frame_to_rgb)
-        target = create_target_with(given)
+        given = setup_with(create_given(mock_video_capture, mock_convert_frame_to_rgb))
+        target = create_target(given)
         generator = target.produce()
         actual = list()
         actual.append(next(generator))
@@ -140,6 +140,58 @@ class TestRtspInputSource:
         ]
         assert given.subject.notify.call_args_list == create_expected_flush_events()
 
+    @patch("OTVision.detect.rtsp_input_source.convert_frame_to_rgb")
+    @patch("OTVision.detect.rtsp_input_source.VideoCapture")
+    def test_reconnecting_on_consecutive_read_fails(
+        self, mock_video_capture: Mock, mock_convert_frame_to_rgb: Mock
+    ) -> None:
+        first_vc_instance = Mock()
+        second_vc_instance = Mock()
+        third_vc_instance = Mock()
+
+        given = create_given(mock_video_capture, mock_convert_frame_to_rgb)
+
+        # This triggers the reconnecting
+        first_vc_instance.read.side_effect = [
+            (True, FIRST_FRAME_DATA),
+            (False, None),
+            (False, None),
+        ]
+
+        # This simulates the first re-connect try that fails
+        second_vc_instance.isOpened.return_value = False
+
+        # This simulates the second re-connect try that succeeds
+        third_vc_instance.read.side_effect = [(True, SECOND_FRAME_DATA)]
+        third_vc_instance.isOpened.return_value = True
+
+        given.video_capture.side_effect = [
+            first_vc_instance,
+            second_vc_instance,
+            third_vc_instance,
+        ]
+
+        target = create_target(given)
+        target._read_fail_threshold = 2
+
+        actual = list()
+        actual.append(target._read_next_frame())  # First read successful
+        actual.append(target._read_next_frame())  # Second read fails
+        actual.append(target._read_next_frame())  # Third read fails
+        actual.append(target._read_next_frame())  # Fourth read successful
+
+        assert actual == [FIRST_FRAME_DATA, None, None, SECOND_FRAME_DATA]
+        first_vc_instance.release.assert_called_once()
+        assert first_vc_instance.read.call_count == 3
+        second_vc_instance.isOpened.assert_called_once()
+        second_vc_instance.read.assert_not_called()
+        assert second_vc_instance.read.call_count == 0
+
+        third_vc_instance.release.assert_not_called()
+        assert third_vc_instance.read.call_count == 1
+
+        assert target._consecutive_read_fails == 0
+
 
 def create_given(video_capture: Mock, convert_frame_to_rgb: Mock) -> Given:
     return Given(
@@ -155,9 +207,16 @@ def create_given(video_capture: Mock, convert_frame_to_rgb: Mock) -> Given:
     )
 
 
-def create_target_with(
-    given: Given, video_capture_is_opened: bool = True
-) -> RtspInputSource:
+def create_target(given: Given) -> RtspInputSource:
+    return RtspInputSource(
+        subject=given.subject,
+        datetime_provider=given.datetime_provider,
+        frame_counter=given.frame_counter,
+        get_current_config=given.get_current_config,
+    )
+
+
+def setup_with(given: Given, video_capture_is_opened: bool = True) -> Given:
     frames = [
         (True, FIRST_FRAME_DATA),
         (False, SECOND_FRAME_DATA),
@@ -197,12 +256,7 @@ def create_target_with(
     given.config.convert.output_fps = OUTPUT_FPS
     given.get_current_config.get.return_value = given.config
 
-    return RtspInputSource(
-        subject=given.subject,
-        datetime_provider=given.datetime_provider,
-        frame_counter=given.frame_counter,
-        get_current_config=given.get_current_config,
-    )
+    return given
 
 
 def create_expected_flush_events() -> list[Any]: