OTVision 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

OTVision/dataformat.py

@@ -38,6 +38,9 @@ INTERPOLATED_DETECTION: str = "interpolated-detection"
 MODEL: str = "model"
 CHUNKSIZE: str = "chunksize"
 NORMALIZED_BBOX: str = "normalized_bbox"
+DETECT_START = "detect_start"
+DETECT_END = "detect_end"
+
 # Detektor model config
 NAME: str = "name"
 WEIGHTS: str = "weights"

OTVision/detect/cli.py

@@ -67,7 +67,7 @@ class ArgparseDetectCliParser(DetectCliParser):
             help="Use half precision for detection.",
         )
         self._parser.add_argument(
-            "--expected_duration",
+            "--expected-duration",
             type=int,
             help="Expected duration of a single video in seconds.",
             required=False,
@@ -79,14 +79,14 @@ class ArgparseDetectCliParser(DetectCliParser):
             help="Overwrite existing output files",
         )
         self._parser.add_argument(
-            "--log_level_console",
+            "--log-level-console",
             type=str,
             choices=VALID_LOG_LEVELS,
             help="Log level for logging to the console",
             required=False,
         )
         self._parser.add_argument(
-            "--log_level_file",
+            "--log-level-file",
             type=str,
             choices=VALID_LOG_LEVELS,
             help="Log level for logging to a log file",
@@ -100,20 +100,20 @@ class ArgparseDetectCliParser(DetectCliParser):
             required=False,
         )
         self._parser.add_argument(
-            "--logfile_overwrite",
+            "--logfile-overwrite",
             action="store_true",
             help="Overwrite log file if it already exists.",
             required=False,
         )
         self._parser.add_argument(
-            "--detect_start",
+            "--detect-start",
             default=None,
             type=int,
             help="Specify start of detection in seconds.",
             required=False,
         )
         self._parser.add_argument(
-            "--detect_end",
+            "--detect-end",
             default=None,
             type=int,
             help="Specify end of detection in seconds.",

OTVision/detect/detect.py

@@ -43,6 +43,7 @@ from OTVision.helpers.video import get_duration, get_fps, get_video_dimensions
 from OTVision.track.preprocess import OCCURRENCE
 
 log = logging.getLogger(LOGGER_NAME)
+DATETIME_FORMAT = "%Y-%m-%d_%H-%M-%S"
 
 
 class OTVisionDetect:
@@ -92,6 +93,15 @@ class OTVisionDetect:
                 detect_suffix=self.config.filetypes.detect,
             )
 
+            try:
+                parse_start_time_from(video_file)
+            except InproperFormattedFilename:
+                log.warning(
+                    f"Video file name of '{video_file}' must include date "
+                    f"and time in format: {DATETIME_FORMAT}"
+                )
+                continue
+
             if not self.config.detect.overwrite and detections_file.is_file():
                 log.warning(
                     f"{detections_file} already exists. To overwrite, set overwrite "
@@ -138,6 +148,8 @@ class OTVisionDetect:
                     half_precision=model.half_precision,
                     chunksize=1,
                     classifications=model.classifications,
+                    detect_start=self.config.detect.detect_start,
+                    detect_end=self.config.detect.detect_end,
                 )
             ).build(detections)
 
@@ -218,7 +230,7 @@ class Timestamper:
         Returns:
             dict: input dictionary with additional occurrence per frame
         """
-        start_time = self._get_start_time_from(video_file)
+        start_time = parse_start_time_from(video_file)
         actual_duration = get_duration(video_file)
         if expected_duration:
             time_per_frame = self._get_time_per_frame(detections, expected_duration)
@@ -227,32 +239,6 @@ class Timestamper:
         self._update_metadata(detections, start_time, actual_duration)
         return self._stamp(detections, start_time, time_per_frame)
 
-    @staticmethod
-    def _get_start_time_from(video_file: Path) -> datetime:
-        """Parse the given filename and retrieve the start date of the video.
-
-        Args:
-            video_file (Path): path to video file
-
-        Raises:
-            InproperFormattedFilename: if the filename is not formatted as expected, an
-            exception will be raised
-
-        Returns:
-            datetime: start date of the video
-        """
-        match = re.search(
-            FILE_NAME_PATTERN,
-            video_file.name,
-        )
-        if match:
-            start_date: str = match.group(START_DATE)
-            return parse_date_string_to_utc_datime(
-                start_date, "%Y-%m-%d_%H-%M-%S"
-            ).replace(tzinfo=timezone.utc)
-
-        raise InproperFormattedFilename(f"Could not parse {video_file.name}.")
-
     @staticmethod
     def _get_time_per_frame(detections: dict, duration: timedelta) -> timedelta:
         """Calculates the duration for each frame. This is done using the total
@@ -294,3 +280,29 @@ class Timestamper:
             occurrence = start_date + (int(key) - 1) * time_per_frame
             value[OCCURRENCE] = occurrence.timestamp()
         return detections
+
+
+def parse_start_time_from(video_file: Path) -> datetime:
+    """Parse the given filename and retrieve the start date of the video.
+
+    Args:
+        video_file (Path): path to video file
+
+    Raises:
+        InproperFormattedFilename: if the filename is not formatted as expected, an
+        exception will be raised
+
+    Returns:
+        datetime: start date of the video
+    """
+    match = re.search(
+        FILE_NAME_PATTERN,
+        video_file.name,
+    )
+    if match:
+        start_date: str = match.group(START_DATE)
+        return parse_date_string_to_utc_datime(start_date, "%Y-%m-%d_%H-%M-%S").replace(
+            tzinfo=timezone.utc
+        )
+
+    raise InproperFormattedFilename(f"Could not parse {video_file.name}.")

OTVision/detect/otdet.py

@@ -24,6 +24,8 @@ class OtdetBuilderConfig:
     half_precision: bool
     chunksize: int
     classifications: dict[int, str]
+    detect_start: int | None
+    detect_end: int | None
 
 
 class OtdetBuilderError(Exception):
@@ -100,4 +102,6 @@ class OtdetBuilder:
             },
             dataformat.CHUNKSIZE: self.config.chunksize,
             dataformat.NORMALIZED_BBOX: self.config.normalized,
+            dataformat.DETECT_START: self.config.detect_start,
+            dataformat.DETECT_END: self.config.detect_end,
         }

OTVision/helpers/log.py

@@ -24,6 +24,7 @@ import logging
 import sys
 from datetime import datetime
 from pathlib import Path
+from typing import Callable
 
 LOGGER_NAME = "OTVision Logger"
 
@@ -57,7 +58,12 @@ class _OTVisionLogger:
     with LOGGER_NAME from the same module where this class is defined.
     """
 
-    def __init__(self, name: str = LOGGER_NAME) -> None:
+    def __init__(
+        self,
+        name: str = LOGGER_NAME,
+        datetime_provider: Callable[[], datetime] = datetime.now,
+    ) -> None:
+        self._provide_datetime = datetime_provider
         self.logger = logging.getLogger(name=name)
         self.logger.setLevel("DEBUG")
         self._set_formatter()
@@ -92,12 +98,20 @@ class _OTVisionLogger:
             log_file and level are not intended to be optional, they have to be provided
             in every case. The default values provided are a safety net.
         """
-        if log_file.exists() and not overwrite:
+        if log_file.is_file() and not overwrite:
             raise LogFileAlreadyExists(
                 f"Log file '{log_file}' already exists. "
                 "Please specify option to overwrite the log file when using the CLI."
             )
-        log_file.parent.mkdir(parents=True, exist_ok=True)
+        log_dir = log_file.parent
+        if log_file.is_dir() or not log_file.suffix:
+            log_dir = log_file / "logs"
+            log_file = (
+                log_dir
+                / f"{self._provide_datetime().strftime(r'%Y-%m-%d_%H-%M-%S')}.{LOG_EXT}"
+            )
+
+        log_dir.mkdir(parents=True, exist_ok=True)
         log_file.touch()
         file_handler = logging.FileHandler(log_file, mode="w")
         self._add_handler(file_handler, level)

OTVision/version.py

@@ -1,8 +1,8 @@
-__version__ = "v0.5.3"
+__version__ = "v0.5.4"
 
 
 def otdet_version() -> str:
-    return "1.3"
+    return "1.4"
 
 
 def ottrack_version() -> str:

{otvision-0.5.3.dist-info → otvision-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OTVision
-Version: 0.5.3
+Version: 0.5.4
 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.5.3.dist-info → otvision-0.5.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 OTVision/__init__.py,sha256=b2goS-TYrN9y8WHmjG22z1oVwCrjV0WtGJE32NJfvJM,1042
 OTVision/config.py,sha256=qCCg2MT_exTiTqEXq3pdqjhlfzQCg4yKKcGJSr7Wkp0,21951
-OTVision/dataformat.py,sha256=atssfeVcwXBjysXbVsgMbmtdMiChWzu8AwW4hK4GZw4,1884
-OTVision/version.py,sha256=rRi91utnulgYKaZW-qxdRDD7ufdJJ0G1IesKOtXP-NE,175
+OTVision/dataformat.py,sha256=BHF7qHzyNb80hI1EKfwcdJ9bgG_X4bp_hCXzdg7_MSA,1941
+OTVision/version.py,sha256=LVnJBM50iwzU0Egq0hA4TxRmvsDdnlvBxZ3_tqZaxFs,175
 OTVision/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/application/configure_logger.py,sha256=RmRgYkvSXWqpFX3N2n0h2LDna3uL8AY-yfVZU66t5q4,611
 OTVision/application/get_config.py,sha256=fRJZUWJvlTed6qriw82-B-05CAqfBma6NQ23WrKqYdE,771
@@ -12,9 +12,9 @@ OTVision/convert/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 OTVision/convert/convert.py,sha256=vRIFcrAUf9MUWAuvF_q7JQ9aN89B1ouBOCtXrCLuDp8,11013
 OTVision/detect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/detect/builder.py,sha256=opd3RQ8ycm9Z75Z4OUiDXfP02bHvDslJcsfeKmLDwkw,1615
-OTVision/detect/cli.py,sha256=HpvdaXl_IJZe0CxZ9KmGzYDLL-zFABmfSV8aG3Rtamo,5454
-OTVision/detect/detect.py,sha256=O8xo0yH9yCmQKkvVqxkoJxQ9FcRPyf3s6IesgdEXcdo,10968
-OTVision/detect/otdet.py,sha256=rIiZR1J0_xdTVc6fwu8n2CrsIwpuD4TQiI6o99RTjog,3456
+OTVision/detect/cli.py,sha256=1t8TC9_R7PLeIA0hyE04rvJeFj1hAbPIEH6vqJF6cg8,5454
+OTVision/detect/detect.py,sha256=Hbr95vnUfsjQpUmbM8lCCjKdcTWMM1pZ-P0Kb2oRicU,11357
+OTVision/detect/otdet.py,sha256=BwRfbeDWGHwYAAgweDx2MY6IYwuHlZHfE-E059AVnOc,3634
 OTVision/detect/yolo.py,sha256=cxRUxIchy_KYxkYUHEYyBCM4PB7d6E_nUDk0fja6XJY,9181
 OTVision/detect/plugin_av/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 OTVision/detect/plugin_av/rotate_frame.py,sha256=4wJqTYI2HRlfa4p2Ffap33vLmKIzE_EwFvQraEkQ4R8,1055
@@ -24,7 +24,7 @@ OTVision/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 OTVision/helpers/date.py,sha256=XK0fmXMombQ2CJ2_RXjk-bc-R8qqXRK2rDmCMBi0_G0,854
 OTVision/helpers/files.py,sha256=JxO0ijcybBgIijIuA-9fnNhy-No0FAZCaE4RKMW0ie0,18116
 OTVision/helpers/formats.py,sha256=YLo_QLA2nhVREyv5N-xNW20c4nIL7DIF40E1lrsAyLE,4365
-OTVision/helpers/log.py,sha256=s5EYBboiNrkIKQE7WkPxnC0NJFL_shH7L5p7AI9IGJE,4544
+OTVision/helpers/log.py,sha256=fOSMTXQRQ3_3zzYL8pDlx85IXPwyDsI2WGpK-V_R47Q,4985
 OTVision/helpers/machine.py,sha256=8Bz_Eg7PS0IL4riOVeJcEIi5D9E8Ju8-JomTkW975p8,2166
 OTVision/helpers/video.py,sha256=ZXG1rhD9OVk95mnfYVPbBwLKrRturgSRCsaOsGJVT2U,1324
 OTVision/track/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -44,7 +44,7 @@ OTVision/view/view_helpers.py,sha256=a5yV_6ZxO5bxsSymOmxdHqzOEv0VFq4wFBopVRGuVRo
 OTVision/view/view_track.py,sha256=ioHenonuTJQn8yDzlIDV8Jc1yzWA0GHbC9CotYGtxHQ,5389
 OTVision/view/view_transform.py,sha256=HvRd8g8geKRy0OoiZUDn_oC3SJC5nuXhZf3uZelfGKg,5473
 OTVision/view/helpers/OTC.ico,sha256=G9kwlDtgBXmXO3yxW6Z-xVFV2q4nUGuz9E1VPHSu_I8,21662
-otvision-0.5.3.dist-info/METADATA,sha256=y9bE7wsK_cHxpU9EmFkdbuPdkaxB4PbbHgGvZTTE5AA,2244
-otvision-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-otvision-0.5.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-otvision-0.5.3.dist-info/RECORD,,
+otvision-0.5.4.dist-info/METADATA,sha256=H_IZXzGbZm3MtW-Jy47zE5DxwhgZ4R1_zIUH4S_GhK0,2244
+otvision-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+otvision-0.5.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+otvision-0.5.4.dist-info/RECORD,,