matrice 1.0.99244__py3-none-any.whl → 1.0.99245__py3-none-any.whl

matrice/deploy/aggregator/ingestor.py

@@ -46,8 +46,10 @@ class ResultsIngestor:
         self._is_streaming = False
         self._lock = threading.RLock()
 
-        # Counter for tie-breaking in PriorityQueue (to avoid dict comparison)
-        self._counters: Dict[Tuple[str, str], itertools.count] = {}
+        # Counter for ordering within (deployment_id, stream_key, stream_group_key)
+        self._counters: Dict[Tuple[str, str, str], itertools.count] = {}
+        # Global per-deployment sequence for PriorityQueue tie-breaking across streams
+        self._queue_seq_counters: Dict[str, itertools.count] = {}
         
         # Track last seen input_order for reset detection
         self._last_input_order: Dict[Tuple[str, str], int] = {}
@@ -74,6 +76,8 @@ class ResultsIngestor:
         for deployment_id in self.deployment_ids:
             self.results_queues[deployment_id] = PriorityQueue()
             self.stats["queue_sizes"][deployment_id] = 0
+            # Initialize per-deployment sequence counter
+            self._queue_seq_counters[deployment_id] = itertools.count()
     
 
     def start_streaming(self) -> bool:
@@ -160,10 +164,10 @@ class ResultsIngestor:
 
     def _get_priority_counter(self, deployment_id: str, stream_key: str, stream_group_key: str) -> int:
         """
-        Get priority tuple for queue ordering with reset detection.
+        Get a monotonically increasing counter per (deployment_id, stream_key, stream_group_key) for ordering.
         
         Returns:
-            Tuple[session_id, temporal_counter, input_order]: Priority tuple for queue ordering
+            int: Priority counter for ordering within the same stream
         """
         key = (deployment_id, stream_key, stream_group_key)
         
@@ -173,6 +177,16 @@ class ResultsIngestor:
         
         return next(self._counters[key])
 
+    def _get_queue_sequence(self, deployment_id: str) -> int:
+        """
+        Get a global per-deployment sequence number for tie-breaking across different streams
+        placed in the same PriorityQueue. This prevents Python from trying to compare dicts
+        when primary priorities are equal.
+        """
+        if deployment_id not in self._queue_seq_counters:
+            self._queue_seq_counters[deployment_id] = itertools.count()
+        return next(self._queue_seq_counters[deployment_id])
+
     def _stream_results_to_queue(
         self, deployment_id: str, results_queue: PriorityQueue
     ):
@@ -210,6 +224,7 @@ class ResultsIngestor:
                         continue
                     
                     order = self._get_priority_counter(deployment_id, stream_key, stream_group_key)
+                    seq = self._get_queue_sequence(deployment_id)
                     # Create enhanced result object with the structured response
                     enhanced_result = {
                         "deployment_id": deployment_id,
@@ -221,7 +236,8 @@ class ResultsIngestor:
                     }
 
                     try:
-                        results_queue.put((order, enhanced_result), block=False)
+                        # Include a sequence tie-breaker to avoid comparing dicts when priorities are equal
+                        results_queue.put((order, seq, enhanced_result), block=False)
 
                         with self._lock:
                             self.stats["results_consumed"] += 1
@@ -287,7 +303,13 @@ class ResultsIngestor:
                     deployment_id
                 ].qsize()
 
-            return priority_result[1]  # Return the actual result (2nd element, after priority tuple)
+            # Handle both 2-tuple (legacy) and 3-tuple (with seq) queue items
+            if isinstance(priority_result, tuple):
+                if len(priority_result) >= 3:
+                    return priority_result[2]
+                elif len(priority_result) == 2:
+                    return priority_result[1]
+            return priority_result
         except Empty:
             return None
         except Exception as exc:

matrice/deploy/aggregator/synchronizer.py

@@ -76,7 +76,16 @@ class ResultsSynchronizer:
                 while True:  # Collect all available results from this queue
                     try:
                         priority_result = queue.get(block=False)
-                        result = priority_result[1]  # Get actual result (2nd element, after priority tuple)
+                        # PriorityQueue items come in as (order, seq, result) or (order, result)
+                        if isinstance(priority_result, tuple):
+                            if len(priority_result) >= 3:
+                                result = priority_result[2]
+                            elif len(priority_result) == 2:
+                                result = priority_result[1]
+                            else:
+                                result = priority_result
+                        else:
+                            result = priority_result
 
                         stream_key = result.get("stream_key")
                         stream_group_key = result.get("stream_group_key")

matrice/deploy/server/stream_worker.py

@@ -52,13 +52,15 @@ class StreamWorker:
         if consumer_group_suffix:
             consumer_group_id += f"-{consumer_group_suffix}"
 
+        custom_request_service_id = self.inference_pipeline_id if (self.inference_pipeline_id and self.inference_pipeline_id != "000000000000000000000000") else deployment_id 
+        
         self.kafka_deployment = MatriceKafkaDeployment(
             session,
             deployment_id,
             "server",
             consumer_group_id,
             f"{deployment_instance_id}-{worker_id}",
-            custom_request_service_id=self.inference_pipeline_id or deployment_id
+            custom_request_service_id=custom_request_service_id
         )
 
         # Worker state

{matrice-1.0.99244.dist-info → matrice-1.0.99245.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice
-Version: 1.0.99244
+Version: 1.0.99245
 Summary: SDK for connecting to matrice.ai services
 Home-page: https://github.com/matrice-ai/python-sdk
 Author: Matrice.ai

{matrice-1.0.99244.dist-info → matrice-1.0.99245.dist-info}/RECORD

@@ -94,10 +94,10 @@ matrice/data_processing/data_formats/yolo_detection.py,sha256=qUeZA7_8Of_QWGZlHh
 matrice/deploy/__init__.py,sha256=1IEknWS1AxZL4aGzCyASusGH_vMEPk1L6u8RnnZjI9w,1256
 matrice/deploy/aggregator/__init__.py,sha256=HFz-ufUMeSpSyRINcrx6NdmrcuVZtPfyIXxYu5UNLTc,508
 matrice/deploy/aggregator/aggregator.py,sha256=ob-I9ZaGmhXqdzbIHZL8DDtYCaT944ipmlhFzIz6peQ,11450
-matrice/deploy/aggregator/ingestor.py,sha256=Xb6F5qn693qtF6ku80T6N-KJ76wAqPAtJLsIQgWHbmw,15898
+matrice/deploy/aggregator/ingestor.py,sha256=-ySEg1UD2ahPXw7Ifr_4QC5xRGb6co8jGD6PgtvCK3w,17141
 matrice/deploy/aggregator/pipeline.py,sha256=xOKDqb4Qre5Ek3Fr-03C-jxpZNXdQ2_Dk5EaOn4ssYE,33948
 matrice/deploy/aggregator/publisher.py,sha256=SRPnyindD_R_QNK5MJ_WZAeAaGtj79CZ1VNoltsQtXM,15587
-matrice/deploy/aggregator/synchronizer.py,sha256=8KJwJ9JZ74ok1b7IfMwSYLqgWiyAeMa_z2-NX7LuLqQ,19992
+matrice/deploy/aggregator/synchronizer.py,sha256=nSoFxlt4Ol6zbg4yCHufcNsif_Spq3jjKTvB5WY73Gk,20455
 matrice/deploy/client/__init__.py,sha256=d7yxlWNHYKOoAM9T_AlrSQw1_9cfLEop4zBE0QqrTVw,1330
 matrice/deploy/client/client.py,sha256=5itmvupufK48lPNb2__ZbZ9q3Q5ycfCDTW6ClDC7cM4,28531
 matrice/deploy/client/client_stream_utils.py,sha256=IcJf8Xn8VMrvxplKqSP5qNIwvu8--YSYaN4BCelk-iQ,40006
@@ -112,7 +112,7 @@ matrice/deploy/client/streaming_gateway/streaming_gateway_utils.py,sha256=_hPwoC
 matrice/deploy/client/streaming_gateway/streaming_results_handler.py,sha256=KTT-AADM0vw1QW1-mkYwLtZOAfC6KT68k3y6ot5dbOU,15700
 matrice/deploy/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 matrice/deploy/server/server.py,sha256=duki4KUU1tvW3Y7wkrlMRVvt7bAP2QqSIsrSogLxC4o,36799
-matrice/deploy/server/stream_worker.py,sha256=l6fMkEjXPvv9-93iotvtuDccl3JKG4EGM3nWTvgGVUQ,20314
+matrice/deploy/server/stream_worker.py,sha256=KDNlYep4Bg1xhHwDrwY9kfxsJfFtATydiYbzVDt58vs,20481
 matrice/deploy/server/inference/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 matrice/deploy/server/inference/batch_manager.py,sha256=7fCHJfSeBqfYgKGZH9_sgUDAllymkGkFm0Oin_-SAYI,8322
 matrice/deploy/server/inference/cache_manager.py,sha256=ebQ1Y3vGNW3--TCPnWijDK3ix5HuZ_zH7wjs8iHKkbU,1610
@@ -242,8 +242,8 @@ matrice/deployment/camera_manager.py,sha256=e1Lc81RJP5wUWRdTgHO6tMWF9BkBdHOSVyx3
 matrice/deployment/deployment.py,sha256=HFt151eWq6iqIAMsQvurpV2WNxW6Cx_gIUVfnVy5SWE,48093
 matrice/deployment/inference_pipeline.py,sha256=6b4Mm3-qt-Zy0BeiJfFQdImOn3FzdNCY-7ET7Rp8PMk,37911
 matrice/deployment/streaming_gateway_manager.py,sha256=ifYGl3g25wyU39HwhPQyI2OgF3M6oIqKMWt8RXtMxY8,21401
-matrice-1.0.99244.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99244.dist-info/METADATA,sha256=s8O6k7WpOGpfOdZrS6SMNjwF_0-glIo5j4KBhg2_QNA,14624
-matrice-1.0.99244.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99244.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99244.dist-info/RECORD,,
+matrice-1.0.99245.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99245.dist-info/METADATA,sha256=jebd73yO3PKQ4Am11nGzT9ieq9z63r2W3iNya74DHLA,14624
+matrice-1.0.99245.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99245.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99245.dist-info/RECORD,,