Merge pull request #1012 from roboflow/feat/type-check-improvement

feat: 📝 static type improvement color constants and PolygonZone
This commit is contained in:
Piotr Skalski 2024-03-18 10:56:10 +01:00 committed by GitHub
commit 77908fe49b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 11 deletions

View File

@ -3,6 +3,7 @@ from typing import Iterable, Optional, Tuple
import cv2
import numpy as np
import numpy.typing as npt
from supervision import Detections
from supervision.detection.utils import clip_boxes, polygon_to_mask
@ -39,7 +40,7 @@ class PolygonZone:
)
def __init__(
self,
polygon: np.ndarray,
polygon: npt.NDArray[np.int64],
frame_resolution_wh: Tuple[int, int],
triggering_anchors: Iterable[Position] = (Position.BOTTOM_CENTER,),
):
@ -54,7 +55,7 @@ class PolygonZone:
polygon=polygon, resolution_wh=(width + 1, height + 1)
)
def trigger(self, detections: Detections) -> np.ndarray:
def trigger(self, detections: Detections) -> npt.NDArray[np.bool_]:
"""
Determines if the detections are within the polygon zone.
@ -78,13 +79,13 @@ class PolygonZone:
]
)
is_in_zone = (
is_in_zone: npt.NDArray[np.bool_] = (
self.mask[all_clipped_anchors[:, :, 1], all_clipped_anchors[:, :, 0]]
.transpose()
.astype(bool)
)
is_in_zone = np.all(is_in_zone, axis=1)
is_in_zone: npt.NDArray[np.bool_] = np.all(is_in_zone, axis=1)
self.current_count = int(np.sum(is_in_zone))
return is_in_zone.astype(bool)

View File

@ -176,31 +176,31 @@ class Color:
return self.b, self.g, self.r
@classproperty
def WHITE(cls):
def WHITE(cls) -> Color:
return Color.from_hex("#FFFFFF")
@classproperty
def BLACK(cls):
def BLACK(cls) -> Color:
return Color.from_hex("#000000")
@classproperty
def RED(cls):
def RED(cls) -> Color:
return Color.from_hex("#FF0000")
@classproperty
def GREEN(cls):
def GREEN(cls) -> Color:
return Color.from_hex("#00FF00")
@classproperty
def BLUE(cls):
def BLUE(cls) -> Color:
return Color.from_hex("#0000FF")
@classproperty
def YELLOW(cls):
def YELLOW(cls) -> Color:
return Color.from_hex("#FFFF00")
@classproperty
def ROBOFLOW(cls):
def ROBOFLOW(cls) -> Color:
return Color.from_hex("#A351FB")
@classmethod