pyzm 2.3.3__tar.gz → 2.3.4__tar.gz

{pyzm-2.3.3/pyzm.egg-info → pyzm-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzm
-Version: 2.3.3
+Version: 2.3.4
 Summary: ZoneMinder API, Logger and other base utilities for python programmers
 Home-page: https://github.com/pliablepixels/pyzm
 Author: Pliable Pixels
@@ -65,11 +65,11 @@ Requires-Dist: st-clickable-images>=0.0.3; extra == "full"
 
 What
 =====
-pyzmv2 is a rewrite of pyzm.
+pyzmNg is a rewrite of pyzm.
 
 It's a pythonic wrapper that integrates with ZM and also operates as a standalone ML library. Key features:
 - ZM API
-- ZM Event Server
+- ZM EventServerNg
 - ZM Logger
 - ZM Memory
 - Machine Learning Modules (with our without ZM)

{pyzm-2.3.3 → pyzm-2.3.4}/README.md

@@ -2,11 +2,11 @@
 
 What
 =====
-pyzmv2 is a rewrite of pyzm.
+pyzmNg is a rewrite of pyzm.
 
 It's a pythonic wrapper that integrates with ZM and also operates as a standalone ML library. Key features:
 - ZM API
-- ZM Event Server
+- ZM EventServerNg
 - ZM Logger
 - ZM Memory
 - Machine Learning Modules (with our without ZM)

{pyzm-2.3.3 → pyzm-2.3.4}/pyzm/__init__.py

@@ -3,7 +3,7 @@
 v2: Typed configuration, clean APIs, proper result objects.
 """
 
-__version__ = "2.3.3"
+__version__ = "2.3.4"
 VERSION = __version__
 
 from pyzm.client import ZMClient

{pyzm-2.3.3 → pyzm-2.3.4}/pyzm/ml/detector.py

@@ -291,14 +291,31 @@ class Detector:
         detections: list,
         zones: list["Zone"] | None,
         image_shape: tuple[int, int],
+        original_shape: tuple[int, int] | None = None,
     ) -> tuple[list, list]:
         """Apply client-side filters: pattern, size, zones, past detections.
 
+        Parameters
+        ----------
+        original_shape:
+            ``(height, width)`` of the image before resizing.  When provided
+            and different from *image_shape*, zone polygons are rescaled from
+            original coordinates to match the (resized) detection space.
+
         Returns (kept_detections, error_boxes).
         """
         h, w = image_shape
         zone_dicts = [z.as_dict() for z in zones] if zones else []
 
+        # Rescale zone polygons when the image was resized
+        if original_shape and zone_dicts and (original_shape[0] != h or original_shape[1] != w):
+            orig_h, orig_w = original_shape
+            xfactor = w / orig_w
+            yfactor = h / orig_h
+            for zd in zone_dicts:
+                pts = zd.get("value") or zd.get("points", [])
+                zd["value"] = [(int(x * xfactor), int(y * yfactor)) for x, y in pts]
+
         detections = filter_by_pattern(detections, self._config.pattern)
         detections = filter_by_size(detections, self._config.max_detection_size, (h, w))
         detections, error_boxes = filter_by_zone(detections, zone_dicts, (h, w))
@@ -332,6 +349,7 @@ class Detector:
         self,
         image: "np.ndarray",
         zones: list["Zone"] | None = None,
+        original_shape: tuple[int, int] | None = None,
     ) -> DetectionResult:
         """Send an image to the remote gateway for detection, then filter locally."""
         import cv2
@@ -355,7 +373,9 @@ class Detector:
 
         # Apply client-side filters
         h, w = image.shape[:2]
-        filtered, error_boxes = self._apply_filters(result.detections, zones, (h, w))
+        filtered, error_boxes = self._apply_filters(
+            result.detections, zones, (h, w), original_shape=original_shape,
+        )
 
         return DetectionResult(
             detections=filtered,
@@ -845,7 +865,7 @@ class Detector:
 
         for frame_id, image in frames:
             try:
-                result = self._remote_detect(image, zones)
+                result = self._remote_detect(image, zones, original_shape=original_shape)
                 result.frame_id = frame_id
                 if original_shape:
                     result.image_dimensions["original"] = original_shape

{pyzm-2.3.3 → pyzm-2.3.4/pyzm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzm
-Version: 2.3.3
+Version: 2.3.4
 Summary: ZoneMinder API, Logger and other base utilities for python programmers
 Home-page: https://github.com/pliablepixels/pyzm
 Author: Pliable Pixels
@@ -65,11 +65,11 @@ Requires-Dist: st-clickable-images>=0.0.3; extra == "full"
 
 What
 =====
-pyzmv2 is a rewrite of pyzm.
+pyzmNg is a rewrite of pyzm.
 
 It's a pythonic wrapper that integrates with ZM and also operates as a standalone ML library. Key features:
 - ZM API
-- ZM Event Server
+- ZM EventServerNg
 - ZM Logger
 - ZM Memory
 - Machine Learning Modules (with our without ZM)

{pyzm-2.3.3 → pyzm-2.3.4}/tests/test_ml/test_detector.py

@@ -1557,6 +1557,64 @@ class TestApplyFilters:
         filtered, errors = det._apply_filters(dets, zones=None, image_shape=(480, 640))
         assert len(filtered) == 2
 
+    def test_zone_rescaled_with_original_shape(self):
+        """Zone polygons should be rescaled when original_shape differs from image_shape."""
+        from pyzm.ml.detector import Detector
+        from pyzm.models.zm import Zone
+        det = Detector.__new__(Detector)
+        det._config = DetectorConfig(pattern=".*")
+        det._pipeline = None
+        # Zone covers a small region in 800x480 (original) coordinates
+        # After 0.5x resize to 400x240, detection bbox at (10,10)-(90,90) in resized space
+        # Zone must be rescaled to (50,100)-(200,200) in resized space to contain bbox
+        zones = [Zone(name="z", points=[(0, 0), (200, 0), (200, 200), (0, 200)])]
+        dets = [
+            Detection(label="person", confidence=0.9, bbox=BBox(10, 10, 90, 90), model_name="test"),
+        ]
+        # With original_shape: zones get rescaled from 800x480 to 400x240
+        filtered, errors = det._apply_filters(
+            dets, zones=zones, image_shape=(240, 400), original_shape=(480, 800),
+        )
+        assert len(filtered) == 1
+        assert filtered[0].label == "person"
+
+    def test_zone_not_rescaled_without_original_shape(self):
+        """Without original_shape, zone polygons pass through unchanged."""
+        from pyzm.ml.detector import Detector
+        from pyzm.models.zm import Zone
+        det = Detector.__new__(Detector)
+        det._config = DetectorConfig(pattern=".*")
+        det._pipeline = None
+        zones = [Zone(name="z", points=[(0, 0), (50, 0), (50, 50), (0, 50)])]
+        dets = [
+            Detection(label="person", confidence=0.9, bbox=BBox(10, 10, 40, 40), model_name="test"),
+        ]
+        filtered, errors = det._apply_filters(dets, zones=zones, image_shape=(480, 640))
+        assert len(filtered) == 1
+
+    def test_zone_mismatch_without_rescaling(self):
+        """Without original_shape, large original-coord zones won't match small-image detections."""
+        from pyzm.ml.detector import Detector
+        from pyzm.models.zm import Zone
+        det = Detector.__new__(Detector)
+        det._config = DetectorConfig(pattern=".*")
+        det._pipeline = None
+        # Zone is in original coords (600-800 range), but image is only 400 wide
+        # Detection at (10,10)-(90,90) in resized space won't intersect
+        zones = [Zone(name="z", points=[(600, 300), (800, 300), (800, 480), (600, 480)])]
+        dets = [
+            Detection(label="person", confidence=0.9, bbox=BBox(10, 10, 90, 90), model_name="test"),
+        ]
+        # Without original_shape: zone coords stay in 800x480 space, won't intersect detection
+        filtered, errors = det._apply_filters(dets, zones=zones, image_shape=(240, 400))
+        assert len(filtered) == 0
+
+        # With original_shape: zone rescaled to (300,150)-(400,240), still won't intersect (10,10)-(90,90)
+        filtered2, _ = det._apply_filters(
+            dets, zones=zones, image_shape=(240, 400), original_shape=(480, 800),
+        )
+        assert len(filtered2) == 0
+
 
 class TestRemoteDetectFiltering:
     """Verify that _remote_detect applies client-side filters."""