Merge remote-tracking branch 'origin/time-in-zone-3' into time-in-zone-3

roboflow · Mar 25, 2024 · 52c3a16 · 52c3a16
2 parents 577007d + 3434c06
commit 52c3a16
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 21 deletions.
diff --git a/examples/time_in_zone/inference_file_example.py b/examples/time_in_zone/inference_file_example.py
@@ -4,10 +4,10 @@
 import cv2
 import numpy as np
 from inference import get_model
+from utils.general import find_in_list, load_zones_config
+from utils.timers import FPSBasedTimer
 
 import supervision as sv
-from utils.general import load_zones_config, find_in_list
-from utils.timers import FPSBasedTimer
 
 COLORS = sv.ColorPalette.from_hex(["#E6194B", "#3CB44B", "#FFE119", "#3C76D1"])
 COLOR_ANNOTATOR = sv.ColorAnnotator(color=COLORS)

diff --git a/examples/time_in_zone/inference_pipeline_stream_example.py b/examples/time_in_zone/inference_pipeline_stream_example.py
@@ -5,10 +5,10 @@
 import numpy as np
 from inference import InferencePipeline
 from inference.core.interfaces.camera.entities import VideoFrame
+from utils.general import find_in_list, load_zones_config
+from utils.timers import ClockBasedTimer
 
 import supervision as sv
-from utils.general import load_zones_config, find_in_list
-from utils.timers import ClockBasedTimer
 
 COLORS = sv.ColorPalette.from_hex(["#E6194B", "#3CB44B", "#FFE119", "#3C76D1"])
 COLOR_ANNOTATOR = sv.ColorAnnotator(color=COLORS)
@@ -90,15 +90,14 @@ def main(
     iou: float,
     classes: List[int],
 ) -> None:
-
     sink = CustomSink(zone_configuration_path=zone_configuration_path, classes=classes)
 
     pipeline = InferencePipeline.init(
         model_id=model_id,
         video_reference=rtsp_url,
         on_prediction=sink.on_prediction,
         confidence=confidence,
-        iou_threshold=iou
+        iou_threshold=iou,
     )
 
     pipeline.start()
@@ -126,10 +125,7 @@ def main(
         help="Complete RTSP URL for the video stream.",
     )
     parser.add_argument(
-        "--model_id",
-        type=str,
-        default="yolov8s-640",
-        help="Roboflow model ID."
+        "--model_id", type=str, default="yolov8s-640", help="Roboflow model ID."
     )
     parser.add_argument(
         "--confidence_threshold",
@@ -159,4 +155,4 @@ def main(
         confidence=args.confidence_threshold,
         iou=args.iou_threshold,
         classes=args.classes,
-    )
+    )
diff --git a/examples/time_in_zone/inference_stream_example.py b/examples/time_in_zone/inference_stream_example.py
@@ -4,10 +4,10 @@
 import cv2
 import numpy as np
 from inference import get_model
+from utils.general import find_in_list, get_stream_frames_generator, load_zones_config
+from utils.timers import ClockBasedTimer
 
 import supervision as sv
-from utils.general import load_zones_config, find_in_list, get_stream_frames_generator
-from utils.timers import ClockBasedTimer
 
 COLORS = sv.ColorPalette.from_hex(["#E6194B", "#3CB44B", "#FFE119", "#3C76D1"])
 COLOR_ANNOTATOR = sv.ColorAnnotator(color=COLORS)

diff --git a/examples/time_in_zone/ultralytics_file_example.py b/examples/time_in_zone/ultralytics_file_example.py
@@ -4,10 +4,10 @@
 import cv2
 import numpy as np
 from ultralytics import YOLO
+from utils.general import find_in_list, load_zones_config
+from utils.timers import FPSBasedTimer
 
 import supervision as sv
-from utils.general import load_zones_config, find_in_list
-from utils.timers import FPSBasedTimer
 
 COLORS = sv.ColorPalette.from_hex(["#E6194B", "#3CB44B", "#FFE119", "#3C76D1"])
 COLOR_ANNOTATOR = sv.ColorAnnotator(color=COLORS)

diff --git a/examples/time_in_zone/ultralytics_pipeline_stream_example.py b/examples/time_in_zone/ultralytics_pipeline_stream_example.py
@@ -6,10 +6,10 @@
 from inference import InferencePipeline
 from inference.core.interfaces.camera.entities import VideoFrame
 from ultralytics import YOLO
+from utils.general import find_in_list, load_zones_config
+from utils.timers import ClockBasedTimer
 
 import supervision as sv
-from utils.general import load_zones_config, find_in_list
-from utils.timers import ClockBasedTimer
 
 COLORS = sv.ColorPalette.from_hex(["#E6194B", "#3CB44B", "#FFE119", "#3C76D1"])
 COLOR_ANNOTATOR = sv.ColorAnnotator(color=COLORS)
@@ -91,7 +91,6 @@ def main(
     iou: float,
     classes: List[int],
 ) -> None:
-
     model = YOLO(weights)
 
     def inference_callback(frame: VideoFrame) -> sv.Detections:
@@ -171,4 +170,4 @@ def inference_callback(frame: VideoFrame) -> sv.Detections:
         confidence=args.confidence_threshold,
         iou=args.iou_threshold,
         classes=args.classes,
-    )
+    )
diff --git a/examples/time_in_zone/ultralytics_stream_example.py b/examples/time_in_zone/ultralytics_stream_example.py
@@ -4,10 +4,10 @@
 import cv2
 import numpy as np
 from ultralytics import YOLO
+from utils.general import find_in_list, get_stream_frames_generator, load_zones_config
+from utils.timers import ClockBasedTimer
 
 import supervision as sv
-from utils.general import load_zones_config, find_in_list, get_stream_frames_generator
-from utils.timers import ClockBasedTimer
 
 COLORS = sv.ColorPalette.from_hex(["#E6194B", "#3CB44B", "#FFE119", "#3C76D1"])
 COLOR_ANNOTATOR = sv.ColorAnnotator(color=COLORS)

diff --git a/examples/time_in_zone/utils/timers.py b/examples/time_in_zone/utils/timers.py
@@ -2,6 +2,7 @@
 from typing import Dict
 
 import numpy as np
+
 import supervision as sv
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@
		from typing import Dict

		import numpy as np

		import supervision as sv


Expand Down