matrice 1.0.99243__tar.gz → 1.0.99245__tar.gz

{matrice-1.0.99243/src/matrice.egg-info → matrice-1.0.99245}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice
-Version: 1.0.99243
+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.99243 → matrice-1.0.99245}/setup.py

@@ -14,7 +14,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 setup(
     name="matrice",
 
-    version = "1.0.99243",
+    version = "1.0.99245",
     
     description="SDK for connecting to matrice.ai services",
     long_description=long_description,

{matrice-1.0.99243 → matrice-1.0.99245}/src/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-1.0.99243 → matrice-1.0.99245}/src/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-1.0.99243 → matrice-1.0.99245}/src/matrice/deploy/client/auto_streaming/auto_streaming.py

@@ -360,7 +360,7 @@ class AutoStreaming:
 
         return self.streaming_gateways
 
-    def start(self) -> bool:
+    def start(self, send_to_api: bool = False) -> bool:
         """
         Start auto streaming for all configured streaming gateways.
 
@@ -388,7 +388,7 @@ class AutoStreaming:
                     # Create and start streaming thread
                     thread = threading.Thread(
                         target=self._streaming_worker,
-                        args=(gateway_id, gateway),
+                        args=(gateway_id, gateway, send_to_api),
                         name=f"AutoStream-{gateway_id}",
                         daemon=True,
                     )
@@ -421,7 +421,7 @@ class AutoStreaming:
             )
             return True
 
-    def _streaming_worker(self, gateway_id: str, gateway: StreamingGateway):
+    def _streaming_worker(self, gateway_id: str, gateway: StreamingGateway, send_to_api: bool = False):
         """
         Worker thread for streaming a specific gateway.
 
@@ -431,7 +431,7 @@ class AutoStreaming:
         """
         try:
             # Start streaming
-            success = gateway.start_streaming()
+            success = gateway.start_streaming(send_to_api=send_to_api)
 
             if success:
                 AutoStreamingUtils.update_stream_status(

{matrice-1.0.99243 → matrice-1.0.99245}/src/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.99243 → matrice-1.0.99245/src/matrice.egg-info}/PKG-INFO

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