OTVision 0.6.2__tar.gz → 0.6.3__tar.gz

{otvision-0.6.2 → otvision-0.6.3}/.pre-commit-config.yaml

@@ -46,7 +46,7 @@ repos:
         additional_dependencies:
           - av==13.0.0
           - black==24.8.0
-          - coremltools==8.2;
+          - coremltools==8.2; sys_platform == 'darwin'
           - fire==0.7.0
           - hatch-requirements-txt==0.4.1
           - ijson==3.3.0
@@ -55,8 +55,9 @@ repos:
           - more-itertools==10.5.0
           - moviepy==1.0.3
           - mypy==1.15.0
-          - numpy==1.26.4
-          - opencv-python==4.9.0.80
+          - numpy==1.26.4; sys_platform == 'win32'
+          - numpy==2.1.1; sys_platform != 'win32'
+          - opencv-python==4.11.0.86
           - pandas-stubs==2.2.3.250308
           - pandas==2.2.3
           - pre-commit==3.8.0
@@ -72,7 +73,7 @@ repos:
           - types-setuptools
           - types-tqdm
           - types-ujson
-          - ultralytics==8.3.74
+          - ultralytics==8.3.94
           - yamllint==1.35.1
         always_run: true
         pass_filenames: false

{otvision-0.6.2 → otvision-0.6.3}/OTVision/__init__.py

@@ -18,13 +18,3 @@ OTVision init module
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-# TODO: Might need to change this
-from .convert.convert import main as convert
-from .track.track import main as track
-from .transform.transform import main as transform
-
-# from .view.view import main as view
-
-__all__: list = ["track", "convert", "transform"]

{otvision-0.6.2 → otvision-0.6.3}/OTVision/application/detect/current_object_detector.py

@@ -2,8 +2,7 @@ from typing import Generator
 
 from OTVision.abstraction.pipes_and_filter import Filter
 from OTVision.application.get_current_config import GetCurrentConfig
-from OTVision.domain.detection import DetectedFrame
-from OTVision.domain.frame import Frame
+from OTVision.domain.frame import DetectedFrame, Frame
 from OTVision.domain.object_detection import ObjectDetector, ObjectDetectorFactory
 
 

{otvision-0.6.2 → otvision-0.6.3}/OTVision/application/detect/detected_frame_factory.py

@@ -1,5 +1,5 @@
-from OTVision.domain.detection import DetectedFrame, Detection
-from OTVision.domain.frame import Frame, FrameKeys
+from OTVision.domain.detection import Detection
+from OTVision.domain.frame import DetectedFrame, Frame, FrameKeys
 
 
 class DetectedFrameFactory:
@@ -20,7 +20,8 @@ class DetectedFrameFactory:
 
         return DetectedFrame(
             source=frame[FrameKeys.source],
-            frame_number=frame[FrameKeys.frame],
+            no=frame[FrameKeys.frame],
             occurrence=frame[FrameKeys.occurrence],
             detections=detections,
+            image=frame[FrameKeys.data],
         )

{otvision-0.6.2 → otvision-0.6.3}/OTVision/application/detect/detected_frame_producer.py

@@ -2,8 +2,7 @@ from typing import Generator
 
 from OTVision.abstraction.pipes_and_filter import Filter
 from OTVision.domain.detect_producer_consumer import DetectedFrameProducer
-from OTVision.domain.detection import DetectedFrame
-from OTVision.domain.frame import Frame
+from OTVision.domain.frame import DetectedFrame, Frame
 from OTVision.domain.input_source_detect import InputSourceDetect
 
 

{otvision-0.6.2 → otvision-0.6.3}/OTVision/detect/builder.py

@@ -42,7 +42,7 @@ from OTVision.detect.yolo import YoloDetectionConverter, YoloFactory
 from OTVision.domain.cli import DetectCliParser
 from OTVision.domain.current_config import CurrentConfig
 from OTVision.domain.detect_producer_consumer import DetectedFrameProducer
-from OTVision.domain.detection import DetectedFrame
+from OTVision.domain.frame import DetectedFrame
 from OTVision.domain.input_source_detect import InputSourceDetect
 from OTVision.domain.object_detection import ObjectDetectorFactory
 

{otvision-0.6.2 → otvision-0.6.3}/OTVision/detect/detected_frame_buffer.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 
 from OTVision.application.buffer import Buffer
-from OTVision.domain.detection import DetectedFrame
+from OTVision.domain.frame import DetectedFrame
 
 
 @dataclass

{otvision-0.6.2 → otvision-0.6.3}/OTVision/detect/otdet.py

@@ -4,7 +4,8 @@ from pathlib import Path
 from typing import Self
 
 from OTVision import dataformat, version
-from OTVision.domain.detection import DetectedFrame, Detection
+from OTVision.domain.detection import Detection
+from OTVision.domain.frame import DetectedFrame
 
 
 @dataclass
@@ -74,7 +75,7 @@ class OtdetBuilder:
             converted_detections = [
                 self.__convert_detection(detection) for detection in frame.detections
             ]
-            data[str(frame.frame_number)] = {
+            data[str(frame.no)] = {
                 dataformat.DETECTIONS: converted_detections,
                 dataformat.OCCURRENCE: frame.occurrence.timestamp(),
             }

{otvision-0.6.2 → otvision-0.6.3}/OTVision/detect/yolo.py

@@ -33,8 +33,8 @@ from OTVision.abstraction.pipes_and_filter import Filter
 from OTVision.application.detect.detected_frame_factory import DetectedFrameFactory
 from OTVision.application.get_current_config import GetCurrentConfig
 from OTVision.config import DetectConfig
-from OTVision.domain.detection import DetectedFrame, Detection
-from OTVision.domain.frame import Frame, FrameKeys
+from OTVision.domain.detection import Detection
+from OTVision.domain.frame import DetectedFrame, Frame, FrameKeys
 from OTVision.domain.object_detection import ObjectDetector, ObjectDetectorFactory
 from OTVision.helpers.log import LOGGER_NAME
 

{otvision-0.6.2 → otvision-0.6.3}/OTVision/domain/detect_producer_consumer.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Generator
 
-from OTVision.domain.detection import DetectedFrame
+from OTVision.domain.frame import DetectedFrame
 
 
 class DetectedFrameConsumer(ABC):

{otvision-0.6.2/OTVision/track/model → otvision-0.6.3/OTVision/domain}/frame.py

@@ -1,45 +1,70 @@
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import Callable, Generic, Optional, Sequence, TypeVar
+from typing import Callable, Literal, Optional, Sequence, TypedDict
 
-from PIL.Image import Image
+from numpy import ndarray
 
 from OTVision.dataformat import FRAME, OCCURRENCE, TRACK_ID
-from OTVision.track.model.detection import (
+from OTVision.domain.detection import (
     Detection,
     FinishedDetection,
     TrackedDetection,
     TrackId,
 )
 
+
+class FrameKeys:
+    """Keys to access Frame dictionary."""
+
+    data: Literal["data"] = "data"
+    frame: Literal["frame"] = "frame"
+    source: Literal["source"] = "source"
+    occurrence: Literal["occurrence"] = "occurrence"
+
+
+class Frame(TypedDict):
+    """Frame definition.
+
+    Attributes:
+        data (Optional[ndarray]): The frame data as a numpy array, can be None.
+        frame (int): The frame number.
+        source (str): The source identifier of the frame.
+        occurrence (datetime): Timestamp when the frame was captured/created.
+    """
+
+    data: Optional[ndarray]
+    frame: int
+    source: str
+    occurrence: datetime
+
+
 FrameNo = int
-S = TypeVar("S")
 
 
-@dataclass(frozen=True)
-class Frame(Generic[S]):
+@dataclass(frozen=True, kw_only=True)
+class DetectedFrame:
     """Frame metadata, optional image and respective detections.
 
     Attributes:
         no (FrameNo): Frame number.
         occurrence (datetime): Time stamp, at which frame was recorded.
-        source (S): Generic source from where frame was obtained, e.g. video file path.
+        source (str): Source from where frame was obtained, e.g. video file path.
         detections (Sequence[Detection]): A sequence of Detections occurring in frame.
-        image (Optional[Image]): Optional image data of frame.
+        image (Optional[ndarray]): Optional image data of frame.
     """
 
     no: FrameNo
     occurrence: datetime
-    source: S
+    source: str
     detections: Sequence[Detection]
-    image: Optional[Image]
+    image: Optional[ndarray] = None
 
 
 IsLastFrame = Callable[[FrameNo, TrackId], bool]
 
 
-@dataclass(frozen=True)
-class TrackedFrame(Frame[S]):
+@dataclass(frozen=True, kw_only=True)
+class TrackedFrame(DetectedFrame):
     """Frame metadata with tracked detections.
     Also provides additional aggregated information about:
     observed, finished and unfinished tracks.
@@ -126,8 +151,8 @@ class TrackedFrame(Frame[S]):
         )
 
 
-@dataclass(frozen=True)
-class FinishedFrame(TrackedFrame[S]):
+@dataclass(frozen=True, kw_only=True)
+class FinishedFrame(TrackedFrame):
     """TrackedFrame with FinishedDetections.
 
     Args:

{otvision-0.6.2 → otvision-0.6.3}/OTVision/domain/object_detection.py

@@ -2,8 +2,7 @@ from abc import ABC, abstractmethod
 from typing import Generator
 
 from OTVision.config import DetectConfig
-from OTVision.domain.detection import DetectedFrame
-from OTVision.domain.frame import Frame
+from OTVision.domain.frame import DetectedFrame, Frame
 
 
 class ObjectDetectorMetadata(ABC):

{otvision-0.6.2 → otvision-0.6.3}/OTVision/track/model/filebased/frame_chunk.py

@@ -6,15 +6,15 @@ from typing import Sequence
 from tqdm import tqdm
 
 from OTVision.dataformat import FRAME, INPUT_FILE_PATH, TRACK_ID
-from OTVision.track.model.filebased.frame_group import FrameGroup, get_output_file
-from OTVision.track.model.frame import (
+from OTVision.domain.detection import TrackId
+from OTVision.domain.frame import (
+    DetectedFrame,
     FinishedFrame,
-    Frame,
     FrameNo,
     IsLastFrame,
     TrackedFrame,
-    TrackId,
 )
+from OTVision.track.model.filebased.frame_group import FrameGroup, get_output_file
 
 
 @dataclass(frozen=True)
@@ -25,13 +25,13 @@ class FrameChunk:
     Attributes:
         file (Path): common file path source of Frames.
         metadata (dict): otdet metadata.
-        frames (Sequence[Frame[Path]]): a sequence of untracked Frames.
+        frames (Sequence[DetectedFrame]): a sequence of untracked Frames.
         frame_group_id (int): id of FrameGroup this FrameCHunk is part of.
     """
 
     file: Path
     metadata: dict
-    frames: Sequence[Frame[Path]]
+    frames: Sequence[DetectedFrame]
     frame_group_id: int
 
     def check_output_file_exists(self, with_suffix: str) -> bool:
@@ -49,7 +49,7 @@ class TrackedChunk(FrameChunk):
     Attributes:
         is_last_chunk (bool): whether this chunk is the last of
             subsequently (related/connected) chunks.
-        frames (Sequence[TrackedFrame[Path]]): overrides frames
+        frames (Sequence[TrackedFrame]): overrides frames
             with more specific frame type.
         finished_tracks (set[TrackId]): aggregates finished tracks
             of given TrackedFrames.
@@ -62,7 +62,7 @@ class TrackedChunk(FrameChunk):
     """
 
     is_last_chunk: bool
-    frames: Sequence[TrackedFrame[Path]] = field(init=False)
+    frames: Sequence[TrackedFrame] = field(init=False)
 
     finished_tracks: set[TrackId] = field(init=False)
     observed_tracks: set[TrackId] = field(init=False)
@@ -75,7 +75,7 @@ class TrackedChunk(FrameChunk):
         file: Path,
         metadata: dict,
         is_last_chunk: bool,
-        frames: Sequence[TrackedFrame[Path]],
+        frames: Sequence[TrackedFrame],
         frame_group_id: int,
     ) -> None:
 
@@ -165,11 +165,11 @@ class FinishedChunk(TrackedChunk):
     """A chunk of FinishedFrames.
 
     Attributes:
-        frames (Sequence[FinishedFrame[Path]]): overrides frames
+        frames (Sequence[FinishedFrame]): overrides frames
             with more specific frame type.
     """
 
-    frames: Sequence[FinishedFrame[Path]]
+    frames: Sequence[FinishedFrame]
 
     def to_detection_dicts(self) -> list[dict]:
         chunk_metadata = {INPUT_FILE_PATH: self.file.as_posix()}

{otvision-0.6.2 → otvision-0.6.3}/OTVision/track/model/tracking_interfaces.py

@@ -1,46 +1,40 @@
 from abc import ABC, abstractmethod
 from typing import Generic, Iterator, TypeVar
 
-from OTVision.track.model.frame import (
+from OTVision.domain.detection import TrackId
+from OTVision.domain.frame import (
+    DetectedFrame,
     FinishedFrame,
-    Frame,
     FrameNo,
     IsLastFrame,
     TrackedFrame,
-    TrackId,
 )
 
-S = TypeVar("S")  # Source type (e.g., Path, URL, str, etc.)
-# -> would look nicer in python 3.12
-
 ID_GENERATOR = Iterator[TrackId]
 
 
-class Tracker(ABC, Generic[S]):
+class Tracker(ABC):
     """Tracker interface for processing a stream of Frames
     to add tracking information, creating a lazy stream (generator)
     of TrackedFrames.
 
     Implementing class can specify template method:
     track_frame for processing a single frame.
-
-    Args:
-        Generic (S): generic type of Frame source (e.g. file path, or stream url)
     """
 
     def track(
-        self, frames: Iterator[Frame[S]], id_generator: ID_GENERATOR
-    ) -> Iterator[TrackedFrame[S]]:
+        self, frames: Iterator[DetectedFrame], id_generator: ID_GENERATOR
+    ) -> Iterator[TrackedFrame]:
         """Process the given stream of Frames,
         yielding TrackedFrames one by one as a lazy stream of TrackedFrames.
 
         Args:
-            frames (Iterator[Frame[S]]): (lazy) stream of Frames
+            frames (Iterator[DetectedFrame]): (lazy) stream of Frames
                 with untracked Detections.
             id_generator (ID_GENERATOR): provider of new (unique) track ids.
 
         Yields:
-            Iterator[TrackedFrame[S]]: (lazy) stream of TrackedFrames with
+            Iterator[TrackedFrame]: (lazy) stream of TrackedFrames with
                 TrackedDetections
         """
         for frame in frames:
@@ -49,19 +43,19 @@ class Tracker(ABC, Generic[S]):
     @abstractmethod
     def track_frame(
         self,
-        frame: Frame[S],
+        frame: DetectedFrame,
         id_generator: ID_GENERATOR,
-    ) -> TrackedFrame[S]:
+    ) -> TrackedFrame:
         """Process single Frame with untracked Detections,
         by adding tracking information,
         creating a TrackedFrame with TrackedDetections.
 
         Args:
-            frame (Frame[S]): the Frame (with source S) to be tracked.
+            frame (DetectedFrame): the Frame to be tracked.
             id_generator (ID_GENERATOR): provider of new (unique) track ids.
 
         Returns:
-            TrackedFrame[S]: TrackedFrame with TrackedDetections
+            TrackedFrame: TrackedFrame with TrackedDetections
         """
         pass
 
@@ -268,42 +262,42 @@ class UnfinishedTracksBuffer(ABC, Generic[C, F]):
         return finished_containers
 
 
-class UnfinishedFramesBuffer(UnfinishedTracksBuffer[TrackedFrame[S], FinishedFrame[S]]):
+class UnfinishedFramesBuffer(UnfinishedTracksBuffer[TrackedFrame, FinishedFrame]):
     """UnfinishedTracksBuffer implementation for Frames as Detection container."""
 
-    def __init__(self, tracker: Tracker[S], keep_discarded: bool = False):
+    def __init__(self, tracker: Tracker, keep_discarded: bool = False):
         super().__init__(keep_discarded)
         self._tracker = tracker
 
     def track(
-        self, frames: Iterator[Frame[S]], id_generator: ID_GENERATOR
-    ) -> Iterator[FinishedFrame[S]]:
+        self, frames: Iterator[DetectedFrame], id_generator: ID_GENERATOR
+    ) -> Iterator[FinishedFrame]:
         tracked_frame_stream = self._tracker.track(frames, id_generator)
         return self.track_and_finish(tracked_frame_stream)
 
-    def _get_last_track_frames(self, container: TrackedFrame[S]) -> dict[TrackId, int]:
+    def _get_last_track_frames(self, container: TrackedFrame) -> dict[TrackId, int]:
         return {o: container.no for o in container.observed_tracks}
 
-    def _get_unfinished_tracks(self, container: TrackedFrame[S]) -> set[TrackId]:
+    def _get_unfinished_tracks(self, container: TrackedFrame) -> set[TrackId]:
         return container.unfinished_tracks
 
-    def _get_observed_tracks(self, container: TrackedFrame[S]) -> set[TrackId]:
+    def _get_observed_tracks(self, container: TrackedFrame) -> set[TrackId]:
         return container.observed_tracks
 
-    def _get_newly_finished_tracks(self, container: TrackedFrame[S]) -> set[TrackId]:
+    def _get_newly_finished_tracks(self, container: TrackedFrame) -> set[TrackId]:
         return container.finished_tracks
 
-    def _get_newly_discarded_tracks(self, container: TrackedFrame[S]) -> set[TrackId]:
+    def _get_newly_discarded_tracks(self, container: TrackedFrame) -> set[TrackId]:
         return container.discarded_tracks
 
-    def _get_last_frame_of_container(self, container: TrackedFrame[S]) -> FrameNo:
+    def _get_last_frame_of_container(self, container: TrackedFrame) -> FrameNo:
         return container.no
 
     def _finish(
         self,
-        container: TrackedFrame[S],
+        container: TrackedFrame,
         is_last: IsLastFrame,
         discarded_tracks: set[TrackId],
         keep_discarded: bool,
-    ) -> FinishedFrame[S]:
+    ) -> FinishedFrame:
         return container.finish(is_last, discarded_tracks, keep_discarded)

{otvision-0.6.2 → otvision-0.6.3}/OTVision/track/parser/chunk_parser_plugins.py

@@ -16,15 +16,15 @@ from OTVision.dataformat import (
     X,
     Y,
 )
+from OTVision.domain.detection import Detection
+from OTVision.domain.frame import DetectedFrame
 from OTVision.helpers.date import (
     parse_date_string_to_utc_datime,
     parse_timestamp_string_to_utc_datetime,
 )
 from OTVision.helpers.files import denormalize_bbox, read_json
-from OTVision.track.model.detection import Detection
 from OTVision.track.model.filebased.frame_chunk import ChunkParser, FrameChunk
 from OTVision.track.model.filebased.frame_group import FrameGroup
-from OTVision.track.model.frame import Frame
 
 
 class JsonChunkParser(ChunkParser):
@@ -47,7 +47,7 @@ class JsonChunkParser(ChunkParser):
 
     def convert(
         self, file: Path, frame_offset: int, input: dict[int, dict[str, Any]]
-    ) -> list[Frame[Path]]:
+    ) -> list[DetectedFrame]:
         detection_parser = DetectionParser()
         frames = []
 
@@ -58,10 +58,10 @@ class JsonChunkParser(ChunkParser):
             occurrence: datetime = parse_datetime(value[OCCURRENCE])
             data_detections = value[DETECTIONS]
             detections = detection_parser.convert(data_detections)
-            parsed_frame = Frame(
-                int(key) + frame_offset,
+            parsed_frame = DetectedFrame(
+                no=int(key) + frame_offset,
                 occurrence=occurrence,
-                source=file,
+                source=str(file),
                 detections=detections,
                 image=None,
             )

{otvision-0.6.2 → otvision-0.6.3}/OTVision/track/track.py

@@ -111,7 +111,7 @@ def main(
         log.warning(f"No files of type '{filetypes}' found to track!")
         return
 
-    iou_tracker: IouTracker[Path] = IouTracker(
+    iou_tracker: IouTracker = IouTracker(
         parameters=IouParameters(sigma_l, sigma_h, sigma_iou, t_min, t_miss_max)
     )
 

{otvision-0.6.2 → otvision-0.6.3}/OTVision/track/tracker/filebased_tracking.py

@@ -6,6 +6,8 @@ from more_itertools import peekable
 from tqdm import tqdm
 
 from OTVision.config import CONFIG, DEFAULT_FILETYPE, OVERWRITE, TRACK
+from OTVision.domain.detection import TrackId
+from OTVision.domain.frame import DetectedFrame, FrameNo, IsLastFrame, TrackedFrame
 from OTVision.helpers.log import LOGGER_NAME
 from OTVision.track.model.filebased.frame_chunk import (
     ChunkParser,
@@ -14,13 +16,6 @@ from OTVision.track.model.filebased.frame_chunk import (
     TrackedChunk,
 )
 from OTVision.track.model.filebased.frame_group import FrameGroup, FrameGroupParser
-from OTVision.track.model.frame import (
-    Frame,
-    FrameNo,
-    IsLastFrame,
-    TrackedFrame,
-    TrackId,
-)
 from OTVision.track.model.tracking_interfaces import (
     ID_GENERATOR,
     Tracker,
@@ -30,18 +25,18 @@ from OTVision.track.model.tracking_interfaces import (
 log = logging.getLogger(LOGGER_NAME)
 
 
-class ChunkBasedTracker(Tracker[Path]):
+class ChunkBasedTracker(Tracker):
 
-    def __init__(self, tracker: Tracker[Path], chunkParser: ChunkParser) -> None:
+    def __init__(self, tracker: Tracker, chunkParser: ChunkParser) -> None:
         super().__init__()
         self._chunk_parser = chunkParser
         self._tracker = tracker
 
     def track_frame(
         self,
-        frames: Frame[Path],
+        frames: DetectedFrame,
         id_generator: ID_GENERATOR,
-    ) -> TrackedFrame[Path]:
+    ) -> TrackedFrame:
         return self._tracker.track_frame(frames, id_generator)
 
     def track_chunk(
@@ -82,7 +77,7 @@ class GroupedFilesTracker(ChunkBasedTracker):
 
     def __init__(
         self,
-        tracker: Tracker[Path],
+        tracker: Tracker,
         chunk_parser: ChunkParser,
         frame_group_parser: FrameGroupParser,
         id_generator_factory: ID_GENERATOR_FACTORY,

{otvision-0.6.2 → otvision-0.6.3}/OTVision/track/tracker/tracker_plugin_iou.py

@@ -1,14 +1,8 @@
 from dataclasses import dataclass
 
-from OTVision.track.model.detection import Detection, TrackedDetection
-from OTVision.track.model.frame import Frame, TrackedFrame
-from OTVision.track.model.tracking_interfaces import (
-    ID_GENERATOR,
-    FrameNo,
-    S,
-    Tracker,
-    TrackId,
-)
+from OTVision.domain.detection import Detection, TrackedDetection, TrackId
+from OTVision.domain.frame import DetectedFrame, FrameNo, TrackedFrame
+from OTVision.track.model.tracking_interfaces import ID_GENERATOR, Tracker
 
 
 @dataclass(frozen=True)
@@ -72,7 +66,9 @@ class ActiveIouTrack:
     last_frame: FrameNo
     track_age: int
 
-    def __init__(self, id: TrackId, frame: "Frame", detection: "Detection") -> None:
+    def __init__(
+        self, id: TrackId, frame: "DetectedFrame", detection: "Detection"
+    ) -> None:
         self.id = id
         self.frame_no = [frame.no]
         self.bboxes = [BoundingBox.from_xywh(detection)]
@@ -85,7 +81,7 @@ class ActiveIouTrack:
         self.last_frame = frame.no
         self.track_age = 0
 
-    def add_detection(self, frame: Frame, detection: Detection) -> None:
+    def add_detection(self, frame: DetectedFrame, detection: Detection) -> None:
         self.frame_no.append(frame.no)
         self.bboxes.append(BoundingBox.from_xywh(detection))
         self.center.append(Coordinate.center_of(detection))
@@ -141,7 +137,7 @@ def iou(
     return size_intersection / size_union
 
 
-class IouTracker(Tracker[S]):
+class IouTracker(Tracker):
 
     def __init__(self, parameters: IouParameters):
         super().__init__()
@@ -169,8 +165,8 @@ class IouTracker(Tracker[S]):
         return self.parameters.t_miss_max
 
     def track_frame(
-        self, frame: Frame[S], id_generator: ID_GENERATOR
-    ) -> TrackedFrame[S]:
+        self, frame: DetectedFrame, id_generator: ID_GENERATOR
+    ) -> TrackedFrame:
 
         detections = [d for d in frame.detections if d.conf >= self.sigma_l]
         tracked_detections: list[TrackedDetection] = []

{otvision-0.6.2 → otvision-0.6.3}/OTVision/version.py

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

{otvision-0.6.2 → otvision-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.6.2
+Version: 0.6.3
 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/
@@ -22,8 +22,9 @@ Requires-Dist: geopandas==1.0.1
 Requires-Dist: ijson==3.3.0
 Requires-Dist: more-itertools==10.5.0
 Requires-Dist: moviepy==1.0.3
-Requires-Dist: numpy==1.26.4
-Requires-Dist: opencv-python==4.9.0.80
+Requires-Dist: numpy==1.26.4; sys_platform == 'win32'
+Requires-Dist: numpy==2.1.1; sys_platform != 'win32'
+Requires-Dist: opencv-python==4.11.0.86
 Requires-Dist: pandas==2.2.3
 Requires-Dist: pyyaml==6.0.2
 Requires-Dist: setuptools==74.0.0
@@ -31,7 +32,7 @@ Requires-Dist: torch==2.3.1
 Requires-Dist: torchvision==0.18.1
 Requires-Dist: tqdm==4.67.1
 Requires-Dist: ujson==5.10.0
-Requires-Dist: ultralytics==8.3.74
+Requires-Dist: ultralytics==8.3.94
 Description-Content-Type: text/markdown
 
 # OTVision