viso-sdk-python 1.1.24__tar.gz → 1.1.25__tar.gz

{viso_sdk_python-1.1.24 → viso_sdk_python-1.1.25}/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 <!--next-version-placeholder-->
+## v1.1.25
+### Performance
+- replace stdlib `json` with `orjson` in `parse_viso_data`
+- replace Redis polling with pub/sub blocking in `FrameReader`
+- pipeline SET + PUBLISH into a single round-trip in `redis_wrapper`
+
 ## v1.1.24
 ### Features
 - add `FrameReader` to centralise Redis frame consumption — moves the read→dedup→decode pipeline into a single SDK class; dedup is now checked on the raw dict before base64 decode and JPEG decompress, so duplicate polls at high poll rates are effectively free

{viso_sdk_python-1.1.24 → viso_sdk_python-1.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: viso-sdk-python
-Version: 1.1.24
+Version: 1.1.25
 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
@@ -14,12 +14,10 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Python: >=3.6.0
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS

{viso_sdk_python-1.1.24 → viso_sdk_python-1.1.25}/setup.py

@@ -63,7 +63,7 @@ setup(
         "orjson>=3.9.0"
     ],
     package_data={"viso_sdk": ["assets/*", "assets/*/*"]},
-    python_requires=">=3.6.0",
+    python_requires=">=3.10",
     entry_points={},
     # dependency_links=["https://www.piwheels.org/simple"],
     classifiers=[
@@ -75,11 +75,9 @@ setup(
         "Operating System :: POSIX",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     ext_modules=cythonize("viso_sdk/**/*.py", compiler_directives={"language_level": "3"}) if USE_CYTHON else [],
     # options={"bdist_wheel": {"universal": True}},

{viso_sdk_python-1.1.24 → viso_sdk_python-1.1.25}/tests/unit/test_redis_wrapper.py

@@ -9,82 +9,83 @@ from viso_sdk.redis.redis_wrapper import RedisWrapper
 
 
 @pytest.fixture
-def mock_client():
-    return MagicMock()
+def mock_pipe():
+    pipe = MagicMock()
+    pipe.execute.return_value = [True, 1]
+    return pipe
 
 
 @pytest.fixture
-def wrapper(mock_client):
-    with patch("viso_sdk.redis.redis_wrapper.redis.StrictRedis", return_value=mock_client):
+def wrapper(mock_pipe):
+    client = MagicMock()
+    client.pipeline.return_value.__enter__.return_value = mock_pipe
+    client.pipeline.return_value.__exit__.return_value = False
+    with patch("viso_sdk.redis.redis_wrapper.redis.StrictRedis", return_value=client):
         rw = RedisWrapper(thread=False)
-    return rw, mock_client
+    return rw, client, mock_pipe
 
 
 class TestWriteData:
     def test_write_string(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
+        rw, client, pipe = wrapper
         result = rw.write_data("my_key", "hello")
         assert result is True
-        client.set.assert_called_once_with("my_key", "hello", ex=None)
+        pipe.set.assert_called_once_with("my_key", "hello", ex=None)
 
     def test_write_dict_serialised_as_json(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
+        rw, client, pipe = wrapper
         rw.write_data("my_key", {"a": 1, "b": 2})
-        call_args = client.set.call_args[0]
+        call_args = pipe.set.call_args[0]
         assert json.loads(call_args[1]) == {"a": 1, "b": 2}
 
     def test_write_with_ttl(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
+        rw, client, pipe = wrapper
         rw.write_data("my_key", "val", ttl=60)
-        client.set.assert_called_once_with("my_key", "val", ex=60)
+        pipe.set.assert_called_once_with("my_key", "val", ex=60)
 
     def test_publishes_notification_on_successful_write(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
+        rw, client, pipe = wrapper
         rw.write_data("my_key", "hello")
-        client.publish.assert_called_once_with("my_key_notify", "1")
+        pipe.publish.assert_called_once_with("my_key_notify", "1")
 
-    def test_does_not_publish_when_write_fails(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = False
-        rw.write_data("my_key", "hello")
-        client.publish.assert_not_called()
+    def test_returns_false_when_set_fails(self, wrapper):
+        rw, client, pipe = wrapper
+        pipe.execute.return_value = [False, 0]
+        result = rw.write_data("my_key", "hello")
+        assert result is False
 
     def test_handles_publish_error_gracefully(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
-        client.publish.side_effect = Exception("publish failed")
+        # A publish server-side error appears as an exception in the execute()
+        # result list — it does not abort the pipeline or change the set result.
+        rw, client, pipe = wrapper
+        pipe.execute.return_value = [True, Exception("publish failed")]
         result = rw.write_data("my_key", "hello")
-        # Should still return True even if publish fails
         assert result is True
-        client.publish.assert_called_once_with("my_key_notify", "1")
+        pipe.publish.assert_called_once_with("my_key_notify", "1")
 
 
 class TestReadData:
     def test_returns_raw_bytes(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.get.return_value = b"raw"
         assert rw.read_data("key") == b"raw"
         client.get.assert_called_once_with("key")
 
     def test_returns_none_when_key_missing(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.get.return_value = None
         assert rw.read_data("missing") is None
 
 
 class TestReadVisoData:
     def test_decodes_json_bytes(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.get.return_value = b'{"result": [1, 2]}'
         result = rw.read_viso_data("key")
         assert result == {"result": [1, 2]}
 
     def test_returns_none_on_redis_error(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.get.side_effect = Exception("connection refused")
         result = rw.read_viso_data("key")
         assert result is None
@@ -92,54 +93,50 @@ class TestReadVisoData:
 
 class TestDeleteData:
     def test_delete_returns_true_on_success(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.delete.return_value = 1
         assert rw.delete_data("key") is True
         client.delete.assert_called_once_with("key")
 
     def test_delete_returns_false_when_key_not_found(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.delete.return_value = 0
         assert rw.delete_data("missing") is False
 
 
 class TestWriteVisoData:
     def test_sync_write_when_thread_disabled(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
+        rw, client, pipe = wrapper
         result = rw.write_viso_data({"frame": None}, "key")
         assert result is True
 
     def test_write_none_deletes_key(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.delete.return_value = 1
         rw.write_viso_data(None, "key")
         client.delete.assert_called_once_with("key")
 
     def test_publishes_notification_on_successful_write(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
+        rw, client, pipe = wrapper
         rw.write_viso_data({"frame": None, "result": []}, "viso_key")
-        client.publish.assert_called_once_with("viso_key_notify", "1")
+        pipe.publish.assert_called_once_with("viso_key_notify", "1")
 
-    def test_does_not_publish_when_write_fails(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = False
-        rw.write_viso_data({"frame": None}, "viso_key")
-        client.publish.assert_not_called()
+    def test_returns_false_when_set_fails(self, wrapper):
+        rw, client, pipe = wrapper
+        pipe.execute.return_value = [False, 0]
+        result = rw.write_viso_data({"frame": None}, "viso_key")
+        assert result is False
 
     def test_handles_publish_error_gracefully(self, wrapper):
-        rw, client = wrapper
-        client.set.return_value = True
-        client.publish.side_effect = Exception("publish failed")
+        rw, client, pipe = wrapper
+        pipe.execute.return_value = [True, Exception("publish failed")]
         result = rw.write_viso_data({"frame": None}, "viso_key")
-        # Should still return True even if publish fails
         assert result is True
-        client.publish.assert_called_once_with("viso_key_notify", "1")
+        pipe.publish.assert_called_once_with("viso_key_notify", "1")
 
     def test_no_publish_when_deleting_with_none(self, wrapper):
-        rw, client = wrapper
+        rw, client, pipe = wrapper
         client.delete.return_value = 1
         rw.write_viso_data(None, "key")
-        # Should not publish when deleting
         client.publish.assert_not_called()
+        pipe.publish.assert_not_called()

{viso_sdk_python-1.1.24 → viso_sdk_python-1.1.25}/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_24 __pyx_string_tab[1]
+#define __pyx_kp_u_1_1_25 __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.24"
+ * __version__ = "1.1.25"
 */
   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.24"             # <<<<<<<<<<<<<<
+ * __version__ = "1.1.25"             # <<<<<<<<<<<<<<
 */
-  if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_version, __pyx_mstate_global->__pyx_kp_u_1_1_24) < (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_25) < (0)) __PYX_ERR(0, 17, __pyx_L1_error)
 
   /* "viso_sdk/_version.py":1
  * """             # <<<<<<<<<<<<<<
@@ -2689,23 +2689,23 @@ 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&SY\315\371f>\000\000\007\337\200@\000@\003|\005\350\204A\000\277\357\377\2400\000\315[\r&\246#(\360S\312\000\320z\023\001\0214\332\023\023L\200\000\000\003S\324\332\246\232\206\231\244=L\2324\r4hL\213\374\257+\275\327. \300\370\360\361k\217\252lmpbg\332\357\013\215&@\206\037\202\221\314\234\247\306\232\0024A\001\002\210\014o]\346\006\361\3621u\357\3131\235K\320\300\260\330\207@\327\237\232\032\004J\026\355\232b\3335[\021\302\255\312D\240(9\001\t\021\315F\365b\351\013\006\204E\255\332.V\252\221\334\236\350=\363bd\253ae5\270K\206\020\322\266?\256HJ\0312c>\014\205\241\021\336\245\310\201 `\2049\245\234\334)\304k\217K\007\352\323AG\325\354\"\317\245\270\273\222)\302\204\206o\3131\360";
+const char* const cstring = "BZh91AY&SY\375\235,\225\000\000\007\337\200@\000@\003z\005\350\204A\000\277\357\377\2400\000\315[\r&\246#(\360S\312\000\320z\023\001\0214\332\023\023L\200\000\000\003S\324\332\246\232\206\231\244=L\2324\r4hL\213\374\257+\275\327. \300\370\360\361k\217\252lmpbg\332\357\013\215&@\206\037\202\221\314\234\247\306\232\0024A\001\002\210\014o]\346\006\361\3621u\357\3131\235K\320\300\260\330\207@\327\237\232\032\004J\026\355\232b\3335[\021\302\255\312D\240(9\001\t\021\315F\365b\351\013\006\204E\255\332.V\252\221\334\236\350=\363bd\253ae5\270K\206\020\322\266?\256HJ\0312c>\014\205\241\021\336\245\310\201 `\2049\245\234\334)\304k\217K\007\352\323AG\325\354\"\317\245\270\273\222)\302\204\207\354\351d\250";
     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);
     #if !CYTHON_ASSUME_SAFE_MACROS
     if (likely(bytes)); else { Py_DECREF(data); __PYX_ERR(0, 1, __pyx_L1_error) }
     #endif
-    #elif (CYTHON_COMPRESS_STRINGS) != 0 /* compression: zlib (195 bytes) */
-const char* const cstring = "x\3325\216\275n\3030\014\204_\305/`!q;\006\375A\207,\031:e%\030\211\216\211\310\242#Q)\374\366\245\343x\272\303}8\036\335\336\355]\367\376#\323\234\371:h\323\355\272]{\346\"\016\271Q\302\361\363\352\274d\203\230\276\036\257|\323\357cs\340\324\313\006>\026mK\270\265\323\254\203\244\323\361\367\364\206\2272\241\016\000X-\313\000>r\"\340\004\232\321\323\005\375\315\262\355\0010_3\004\316\001\225\224G2\233p$\000\032\221\243q\3509\322\242\221=\245\362\264\206\322S%\324\025\256\235$\177\362\232\277W\214kXH\003\365X\243\255)\225e\023\224u\355=(\027\026;6\023\346\1777\017m\353";
-    PyObject *data = __Pyx_DecompressString(cstring, 195, 1);
+    #elif (CYTHON_COMPRESS_STRINGS) != 0 /* compression: zlib (196 bytes) */
+const char* const cstring = "x\3325\216\275n\3030\014\204_\305/`!q\321-\350\017:d\311\320)+\301HtLD\026\035\211J\341\267/\035\307\323\035\356\303\361\350\366n\357\272\367\037\231\346\314\327A\233n\327\355\3323\027q\310\215\022\216\237W\347%\033\304\364\365x\345\233~\037\233\003\247^6\360\261h[\302\255\235f\035$\235\216\277\2477\274\224\tu\000\300jY\006\360\221\023\001'\320\214\236.\350o\226m\017\200\371\232!p\016\250\244<\222\331\204#\001\320\210\034\215C\317\221\026\215\354)\225\2475\224\236*\241\256p\355$\371\223\327\374\275b\\\303B\032\250\307\032mM\251,\233\240\254k\357A\271\260\330\261\2310\377\0038(m\354";
+    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);
     #if !CYTHON_ASSUME_SAFE_MACROS
     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.24Copyright 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.25Copyright 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.24 → viso_sdk_python-1.1.25}/viso_sdk/_version.py

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