viso-sdk-python 1.1.17__tar.gz → 1.1.18__tar.gz

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 <!--next-version-placeholder-->
+## v1.1.18
+### Fix
+missing nms script
 
 ## v1.1.17
 

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viso-sdk-python
-Version: 1.1.17
+Version: 1.1.18
 Summary: VisoSDK: A Python SDK for use in Viso containers
 Home-page: https://gitlab.com/TopKamera/03_edge/Base/viso-sdk-python-public.git
 Author: support@viso.ai

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/tests/unit/test_model_fetch.py

@@ -2,7 +2,6 @@
 """Tests for viso_sdk.model.fetch"""
 import io
 import tarfile
-import tempfile
 from unittest.mock import patch
 
 import pytest

viso_sdk_python-1.1.18/tests/unit/test_nms.py

@@ -0,0 +1,231 @@
+"""Unit tests for NMS (Non-Maximum Suppression) utilities."""
+from viso_sdk.detection.nms import non_max_suppression_cv, non_max_suppression_cv_per_class
+
+
+class TestNonMaxSuppressionCV:
+    """Tests for standard NMS."""
+
+    def test_empty_input_returns_empty(self):
+        """Test that empty boxes list returns empty result."""
+        result = non_max_suppression_cv([], [], score_threshold=0.5, iou_threshold=0.5)
+        assert result == []
+
+    def test_single_box_is_kept(self):
+        """Test that a single box is always kept."""
+        boxes = [[10, 10, 50, 50]]
+        scores = [0.9]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.5)
+        assert result == [0]
+
+    def test_non_overlapping_boxes_all_kept(self):
+        """Test that non-overlapping boxes are all kept."""
+        boxes = [
+            [10, 10, 30, 30],    # Box 0
+            [100, 100, 30, 30],  # Box 1 - far away
+            [200, 200, 30, 30],  # Box 2 - far away
+        ]
+        scores = [0.9, 0.85, 0.8]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.5)
+        assert len(result) == 3
+        assert set(result) == {0, 1, 2}
+
+    def test_overlapping_boxes_highest_score_kept(self):
+        """Test that overlapping boxes keep only the highest score."""
+        boxes = [
+            [10, 10, 50, 50],   # Box 0 - score 0.9
+            [15, 15, 50, 50],   # Box 1 - score 0.8 (overlaps with 0)
+        ]
+        scores = [0.9, 0.8]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.3)
+        assert result == [0]  # Box 0 kept, box 1 suppressed
+
+    def test_score_threshold_filters_low_scores(self):
+        """Test that boxes below score_threshold are filtered out."""
+        boxes = [
+            [10, 10, 50, 50],   # High score
+            [100, 100, 30, 30],  # Low score
+        ]
+        scores = [0.9, 0.3]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.5)
+        assert result == [0]
+
+    def test_high_iou_threshold_keeps_more_boxes(self):
+        """Test that higher IoU threshold allows more overlapping boxes."""
+        boxes = [
+            [10, 10, 50, 50],
+            [20, 20, 50, 50],  # Moderate overlap
+        ]
+        scores = [0.9, 0.85]
+        
+        # With low IoU threshold, should suppress
+        result_low = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.1)
+        assert len(result_low) == 1
+        
+        # With high IoU threshold, should keep both
+        result_high = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.9)
+        assert len(result_high) == 2
+
+    def test_three_overlapping_boxes_keeps_best(self):
+        """Test NMS with three overlapping boxes."""
+        boxes = [
+            [10, 10, 50, 50],   # score 0.95
+            [12, 12, 50, 50],   # score 0.9 (high overlap with 0)
+            [14, 14, 50, 50],   # score 0.85 (high overlap with 0 and 1)
+        ]
+        scores = [0.95, 0.9, 0.85]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.3)
+        assert result == [0]  # Only highest score kept
+
+    def test_float_boxes_and_scores(self):
+        """Test that float boxes and scores are handled correctly."""
+        boxes = [[10.5, 10.5, 50.3, 50.7]]
+        scores = [0.934]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.5)
+        assert result == [0]
+
+    def test_mixed_overlapping_and_non_overlapping(self):
+        """Test mix of overlapping and non-overlapping boxes."""
+        boxes = [
+            [10, 10, 50, 50],    # Group 1 - score 0.9
+            [15, 15, 50, 50],    # Group 1 - score 0.8 (overlaps with 0)
+            [200, 200, 30, 30],  # Group 2 - score 0.95 (isolated)
+        ]
+        scores = [0.9, 0.8, 0.95]
+        result = non_max_suppression_cv(boxes, scores, score_threshold=0.5, iou_threshold=0.3)
+        assert len(result) == 2
+        assert 2 in result  # Isolated box kept
+        assert 0 in result  # Highest score from group 1 kept
+        assert 1 not in result  # Suppressed by box 0
+
+
+class TestNonMaxSuppressionCVPerClass:
+    """Tests for per-class NMS."""
+
+    def test_empty_input_returns_empty(self):
+        """Test that empty inputs return empty result."""
+        result = non_max_suppression_cv_per_class(
+            [], [], [], score_threshold=0.5, iou_threshold=0.5
+        )
+        assert result == []
+
+    def test_single_box_is_kept(self):
+        """Test that a single box is always kept."""
+        boxes = [[10, 10, 50, 50]]
+        scores = [0.9]
+        class_ids = [1]
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.5
+        )
+        assert result == [0]
+
+    def test_different_classes_overlap_both_kept(self):
+        """Test that overlapping boxes of different classes are both kept."""
+        boxes = [
+            [10, 10, 50, 50],   # Class 1
+            [15, 15, 50, 50],   # Class 2 (overlaps with class 1)
+        ]
+        scores = [0.9, 0.85]
+        class_ids = [1, 2]
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.3
+        )
+        assert len(result) == 2
+        assert set(result) == {0, 1}
+
+    def test_same_class_overlap_highest_kept(self):
+        """Test that overlapping boxes of same class keep highest score."""
+        boxes = [
+            [10, 10, 50, 50],   # Class 1 - score 0.9
+            [15, 15, 50, 50],   # Class 1 - score 0.8 (overlaps)
+        ]
+        scores = [0.9, 0.8]
+        class_ids = [1, 1]
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.3
+        )
+        assert result == [0]
+
+    def test_multiple_classes_with_overlap(self):
+        """Test complex scenario with multiple classes and overlaps."""
+        boxes = [
+            [10, 10, 50, 50],   # Class 1 - score 0.9
+            [15, 15, 50, 50],   # Class 1 - score 0.8 (overlaps with 0)
+            [12, 12, 48, 48],   # Class 2 - score 0.85 (overlaps with 0 and 1)
+            [200, 200, 30, 30], # Class 1 - score 0.95 (isolated)
+        ]
+        scores = [0.9, 0.8, 0.85, 0.95]
+        class_ids = [1, 1, 2, 1]
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.3
+        )
+        
+        assert len(result) == 3
+        assert 0 in result  # Class 1, highest in overlapping group
+        assert 2 in result  # Class 2, only box
+        assert 3 in result  # Class 1, isolated
+        assert 1 not in result  # Class 1, suppressed by box 0
+
+    def test_string_class_ids(self):
+        """Test that string class IDs work correctly."""
+        boxes = [
+            [10, 10, 50, 50],   # Class 'person'
+            [15, 15, 50, 50],   # Class 'car' (overlaps)
+        ]
+        scores = [0.9, 0.85]
+        class_ids = ['person', 'car']
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.3
+        )
+        assert len(result) == 2
+        assert set(result) == {0, 1}
+
+    def test_three_classes_no_suppression(self):
+        """Test that different classes at same location are all kept."""
+        boxes = [
+            [10, 10, 50, 50],   # Class 1
+            [10, 10, 50, 50],   # Class 2 (exact same location)
+            [10, 10, 50, 50],   # Class 3 (exact same location)
+        ]
+        scores = [0.9, 0.85, 0.8]
+        class_ids = [1, 2, 3]
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.3
+        )
+        assert len(result) == 3
+        assert set(result) == {0, 1, 2}
+
+    def test_score_threshold_filters_per_class(self):
+        """Test that score threshold is applied per class."""
+        boxes = [
+            [10, 10, 50, 50],    # Class 1 - high score
+            [100, 100, 30, 30],  # Class 1 - low score
+            [200, 200, 30, 30],  # Class 2 - low score
+        ]
+        scores = [0.9, 0.3, 0.4]
+        class_ids = [1, 1, 2]
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.5
+        )
+        assert result == [0]  # Only box 0 passes score threshold
+
+    def test_per_class_nms_order_independence(self):
+        """Test that result is independent of input order."""
+        boxes = [
+            [10, 10, 50, 50],   # Class 1 - score 0.8
+            [15, 15, 50, 50],   # Class 2 - score 0.9
+            [12, 12, 48, 48],   # Class 1 - score 0.95 (overlaps with box 0)
+        ]
+        scores = [0.8, 0.9, 0.95]
+        class_ids = [1, 2, 1]
+        
+        result = non_max_suppression_cv_per_class(
+            boxes, scores, class_ids, score_threshold=0.5, iou_threshold=0.3
+        )
+        
+        # Box 2 (class 1, score 0.95) should be kept
+        # Box 0 (class 1, score 0.8) should be suppressed
+        # Box 1 (class 2, score 0.9) should be kept
+        assert len(result) == 2
+        assert 1 in result  # Class 2
+        assert 2 in result  # Class 1 with higher score
+        assert 0 not in result  # Class 1 with lower score suppressed

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/tests/unit/test_stream_cleanup.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 """Tests for viso_sdk.redis.stream_cleanup"""
-from unittest.mock import MagicMock, patch
-
-import pytest
+from unittest.mock import MagicMock
 
 from viso_sdk.redis.stream_cleanup import StreamCleanupManager, clear_stream_redis_keys
 

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/tests/unit/test_trace_malloc.py

@@ -1,5 +1,4 @@
 """Unit tests for TraceMallocManager."""
-import pytest
 from viso_sdk.debug import TraceMallocManager
 
 

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/tests/unit/test_viso_data.py

@@ -2,8 +2,6 @@
 """Tests for viso_sdk.redis.viso_data"""
 import time
 
-import pytest
-
 from viso_sdk.redis.viso_data import Meta, MetaFrameFormat, MetaModule, MetaSource, VisoData
 
 NODE = {"id": "node-1", "type": "object-detection", "name": "OD Node"}

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/viso_sdk/_version.c

@@ -1994,7 +1994,7 @@ static __pyx_mstatetype * const __pyx_mstate_global = &__pyx_mstate_global_stati
 #endif
 /* #### Code section: constant_name_defines ### */
 #define __pyx_kp_u_ __pyx_string_tab[0]
-#define __pyx_kp_u_1_1_17 __pyx_string_tab[1]
+#define __pyx_kp_u_1_1_18 __pyx_string_tab[1]
 #define __pyx_kp_u_Copyright_2020 __pyx_string_tab[2]
 #define __pyx_kp_u_Viso_ai_team __pyx_string_tab[3]
 #define __pyx_kp_u__2 __pyx_string_tab[4]
@@ -2605,16 +2605,16 @@ __Pyx_RefNannySetupContext("PyInit__version", 0);
  * __license__ = "LGPL3"
  * __title__ = "viso-sdk-python"             # <<<<<<<<<<<<<<
  * 
- * __version__ = "1.1.17"
+ * __version__ = "1.1.18"
 */
   if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_title, __pyx_mstate_global->__pyx_kp_u_viso_sdk_python) < (0)) __PYX_ERR(0, 15, __pyx_L1_error)
 
   /* "viso_sdk/_version.py":17
  * __title__ = "viso-sdk-python"
  * 
- * __version__ = "1.1.17"             # <<<<<<<<<<<<<<
+ * __version__ = "1.1.18"             # <<<<<<<<<<<<<<
 */
-  if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_version, __pyx_mstate_global->__pyx_kp_u_1_1_17) < (0)) __PYX_ERR(0, 17, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_version, __pyx_mstate_global->__pyx_kp_u_1_1_18) < (0)) __PYX_ERR(0, 17, __pyx_L1_error)
 
   /* "viso_sdk/_version.py":1
  * """             # <<<<<<<<<<<<<<
@@ -2689,7 +2689,7 @@ static int __Pyx_InitConstants(__pyx_mstatetype *__pyx_mstate) {
   {
     const struct { const unsigned int length: 5; } index[] = {{1},{6},{15},{12},{1},{18},{26},{15},{5},{7},{10},{18},{13},{8},{8},{7},{9},{8},{11},{8},{10},{8},{3},{2},{4},{12},{10},{8},{9},{11},{4}};
     #if (CYTHON_COMPRESS_STRINGS) == 2 /* compression: bz2 (242 bytes) */
-const char* const cstring = "BZh91AY&SYI\035\357\304\000\000\007\337\200@\000@\003x\205\350\204A\000\277\357\377\2400\000\315[\014\246\251\261\032\217\005<\240\r\007\244\323@DM6\223LM2\000\000\001\240\324\3656\251\246\241\232\020\304\310\3204\321\241B}\317\023\177kg\260 \035\340 Z\376\rG[']N7\363d\253B\010\313\310Z\267(\347m\323\314\021\232\010\010\024@c\311w\270\016\003\344b\354\037\236\203J\027\241\211a\270\276(\315:U\024$b\337\332]'j\372\314\025\256\316\316e`Tm\0023)E\244\027\351\362\025\rH\213YH\275X\250Gz{\240\367\332\304\326\244\302\251\344\341_\034a\254\230\376\276!0f\271\314\347\255\367\004GrU*\004\201\212\020\326\026\203r\226\221\215=K\030Y%%\037\225\001,<\037\342\356H\247\n\022\t#\275\370\200";
+const char* const cstring = "BZh91AY&SY_\303Rz\000\000\007\337\200@\000@\003xE\350\204A\000\277\357\377\2400\000\315[\014\246\251\261\032\217\005<\240\r\007\244\323@DM6\223LM2\000\000\001\240\324\3656\251\246\241\232\020\304\310\3204\321\241B}\317\023\177kg\260 \035\340 Z\376\rG[']N7\363d\253B\010\313\310Z\267(\347m\323\314\021\232\010\010\024@c\311w\270\016\003\344b\354\037\236\203J\027\241\211a\270\276(\315:U\024$b\337\332]'j\372\314\025\256\316\316e`Tm\0023)E\244\027\351\362\025\rH\213YH\275X\250Gz{\240\367\332\304\326\244\302\251\344\341_\034a\254\230\376\276!0f\271\314\347\255\367\004GrU*\004\201\212\020\326\026\203r\226\221\215=K\030Y%%\037\225\001,<\037\342\356H\247\n\022\013\370jO@";
     PyObject *data = __Pyx_DecompressString(cstring, 242, 2);
     if (unlikely(!data)) __PYX_ERR(0, 1, __pyx_L1_error)
     const char* const bytes = __Pyx_PyBytes_AsString(data);
@@ -2697,7 +2697,7 @@ const char* const cstring = "BZh91AY&SYI\035\357\304\000\000\007\337\200@\000@\0
     if (likely(bytes)); else { Py_DECREF(data); __PYX_ERR(0, 1, __pyx_L1_error) }
     #endif
     #elif (CYTHON_COMPRESS_STRINGS) != 0 /* compression: zlib (196 bytes) */
-const char* const cstring = "x\3325\216\275n\3030\014\204_\305/`#M\207.A\177\320!K\206N]\tF\242c\"2\351JT\002\277}\3518\006\207;\334\007\362\330\275t>o\337:\315\231/\2035\373\335~\327\376r\321\016\2711\302\361\343\322\005\315\016Q>o\317|\323\257cs`\351u\003\357\213\266%^\333i\266A\345t\3749\275\342\271Lh\003\000V\3172@H,\004,`\031\003\2351\\=\333\036\000\3675C\344\034\321\310x$\267\202#\001\320\210\234\234C\317\211\026M\034H\312\303:\222\207j\254+\\wD\357\372\254\377\253\230\326\260\220E\352\261&o3*K'\030\333\272w\243\\X\375\330L\230\377\0019@m\355";
+const char* const cstring = "x\3325\216\275n\3030\014\204_\305/`#M\227\016A\177\320!K\206N]\tF\242c\"2\351JT\002\277}\3518\006\207;\334\007\362\330\275t>o\337:\315\231/\2035\373\335~\327\376r\321\016\2711\302\361\343\322\005\315\016Q>o\317|\323\257cs`\351u\003\357\213\266%^\333i\266A\345t\3749\275\342\271Lh\003\000V\3172@H,\004,`\031\003\2351\\=\333\036\000\3675C\344\034\321\310x$\267\202#\001\320\210\234\234C\317\211\026M\034H\312\303:\222\207j\254+\\wD\357\372\254\377\253\230\326\260\220E\352\261&o3*K'\030\333\272w\243\\X\375\330L\230\377\001:Ym\356";
     PyObject *data = __Pyx_DecompressString(cstring, 196, 1);
     if (unlikely(!data)) __PYX_ERR(0, 1, __pyx_L1_error)
     const char* const bytes = __Pyx_PyBytes_AsString(data);
@@ -2705,7 +2705,7 @@ const char* const cstring = "x\3325\216\275n\3030\014\204_\305/`#M\207.A\177\320
     if (likely(bytes)); else { Py_DECREF(data); __PYX_ERR(0, 1, __pyx_L1_error) }
     #endif
     #else /* compression: none (287 bytes) */
-const char* const bytes = ".1.1.17Copyright 2020-Viso.ai team?g.corrigan@viso.ai viso.ai AG <info@viso.ai>viso-sdk-pythonLGPL3abspath__author__cline_in_traceback__copyright___cur_dirdatetimedirname__email____file____license____main____module____name__nowospath__qualname__setdefault__test____title____version__year";
+const char* const bytes = ".1.1.18Copyright 2020-Viso.ai team?g.corrigan@viso.ai viso.ai AG <info@viso.ai>viso-sdk-pythonLGPL3abspath__author__cline_in_traceback__copyright___cur_dirdatetimedirname__email____file____license____main____module____name__nowospath__qualname__setdefault__test____title____version__year";
     PyObject *data = NULL;
     CYTHON_UNUSED_VAR(__Pyx_DecompressString);
     #endif

{viso_sdk_python-1.1.17 → viso_sdk_python-1.1.18}/viso_sdk/_version.py

@@ -14,4 +14,4 @@ __email__ = "g.corrigan@viso.ai"
 __license__ = "LGPL3"
 __title__ = "viso-sdk-python"
 
-__version__ = "1.1.17"
+__version__ = "1.1.18"