matrice 1.0.99241__py3-none-any.whl → 1.0.99242__py3-none-any.whl

matrice/deploy/aggregator/aggregator.py

@@ -257,7 +257,7 @@ class ResultsAggregator:
 
         # Check if output queue is getting full
         queue_size = self.aggregated_results_queue.qsize()
-        if queue_size > 0:
+        if queue_size > 1000:
             health["status"] = "degraded"
             health["reason"] = f"Output queue too large ({queue_size} items)"
             logging.warning(f"Aggregator degraded: output queue has {queue_size} items (threshold: 100)")

matrice/deploy/aggregator/ingestor.py

@@ -2,7 +2,7 @@ import logging
 import time
 import threading
 from typing import Dict, Optional, List, Tuple
-from queue import Empty, PriorityQueue
+from queue import Empty, PriorityQueue, Full
 from matrice.session import Session
 from matrice.deploy.utils.kafka_utils import MatriceKafkaDeployment
 import itertools
@@ -198,7 +198,7 @@ class ResultsIngestor:
                     input_streams = result_value.get("input_streams", [])
                     input_stream = input_streams[0]["input_stream"] if input_streams else {}
                     # input_order = input_stream.get("input_order")
-                    camera_info = input_stream.get("camera_info")
+                    camera_info = input_stream.get("camera_info") or {}
                     stream_key = camera_info.get("camera_name")
                     stream_group_key = camera_info.get("camera_group") or "default_group"
 
@@ -229,15 +229,24 @@ class ResultsIngestor:
                                 deployment_id
                             ] = results_queue.qsize()
 
-                    except Exception as exc:
+                    except Full:
                         # Queue is full, log warning and continue
                         logging.warning(
-                            f"Result queue full for deployment {deployment_id}, dropping result: {exc}"
+                            f"Result queue full for deployment {deployment_id}, dropping result"
                         )
                         with self._lock:
                             self.stats["errors"] += 1
                             self.stats["last_error"] = "Queue full"
                             self.stats["last_error_time"] = time.time()
+                    except Exception as exc:
+                        # Other enqueue errors
+                        logging.error(
+                            f"Failed to enqueue result for deployment {deployment_id}: {exc}"
+                        )
+                        with self._lock:
+                            self.stats["errors"] += 1
+                            self.stats["last_error"] = str(exc)
+                            self.stats["last_error_time"] = time.time()
 
             except Exception as exc:
                 if not self._stop_streaming.is_set():

matrice/deploy/aggregator/synchronizer.py

@@ -36,12 +36,12 @@ class ResultsSynchronizer:
         self._synchronization_thread = None
 
         # Synchronization state
-        # Structure: {(stream_key, session_id, input_order): {deployment_id: result, ...}}
-        self._pending_results: Dict[Tuple[str, int, int], Dict[str, Dict]] = defaultdict(
+        # Structure: {(stream_group_key, stream_key, input_order): {deployment_id: result, ...}}
+        self._pending_results: Dict[Tuple[str, str, int], Dict[str, Dict]] = defaultdict(
             dict
         )
         # Track when each key combination was first seen
-        self._result_timestamps: Dict[Tuple[str, int, int], float] = {}
+        self._result_timestamps: Dict[Tuple[str, str, int], float] = {}
 
         # Statistics
         self.stats = {
@@ -113,7 +113,7 @@ class ResultsSynchronizer:
 
     def _create_synchronized_result(
         self,
-        key: Tuple[str, int, int],
+        key: Tuple[str, str, int],
         deployment_results: Dict[str, Dict],
         is_complete: bool,
         is_timeout: bool,
@@ -204,11 +204,17 @@ class ResultsSynchronizer:
                     # Update statistics
                     if is_complete:
                         self.stats["complete_syncs"] += 1
-                        logging.debug(f"Complete sync for stream {key[0]}, session {key[1]}, order {key[2]} with {len(deployment_results)} deployments")
+                        stream_group_key, stream_key, input_order = key
+                        logging.debug(
+                            f"Complete sync for group {stream_group_key}, stream {stream_key}, "
+                            f"order {input_order} with {len(deployment_results)} deployments"
+                        )
                     else:
                         self.stats["partial_syncs"] += 1
+                        stream_group_key, stream_key, input_order = key
                         logging.warning(
-                            f"Partial sync for stream {key[0]}, session {key[1]}, order {key[2]}: {len(deployment_results)}/{len(self.deployment_ids)} deployments "
+                            f"Partial sync for group {stream_group_key}, stream {stream_key}, "
+                            f"order {input_order}: {len(deployment_results)}/{len(self.deployment_ids)} deployments "
                             f"(timeout after {result_age:.2f}s)"
                         )
 
@@ -230,8 +236,9 @@ class ResultsSynchronizer:
                 self.stats["results_synchronized"] += 1
 
             logging.debug(
-                f"Sent synchronized result for stream {synchronized_result['stream_key']}, "
-                f"session {synchronized_result['session_id']}, order {synchronized_result['input_order']}"
+                f"Sent synchronized result for group {synchronized_result.get('stream_group_key')}, "
+                f"stream {synchronized_result['stream_key']}, "
+                f"order {synchronized_result['input_order']}"
             )
 
         except Exception as exc:

{matrice-1.0.99241.dist-info → matrice-1.0.99242.dist-info}/METADATA

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

{matrice-1.0.99241.dist-info → matrice-1.0.99242.dist-info}/RECORD

@@ -93,11 +93,11 @@ matrice/data_processing/data_formats/video_youtube_bb_tracking.py,sha256=6RbuBOW
 matrice/data_processing/data_formats/yolo_detection.py,sha256=qUeZA7_8Of_QWGZlHh-mhRnBFtb5A_u89Oihx-Meg3c,10018
 matrice/deploy/__init__.py,sha256=1IEknWS1AxZL4aGzCyASusGH_vMEPk1L6u8RnnZjI9w,1256
 matrice/deploy/aggregator/__init__.py,sha256=HFz-ufUMeSpSyRINcrx6NdmrcuVZtPfyIXxYu5UNLTc,508
-matrice/deploy/aggregator/aggregator.py,sha256=T5S4qLBkCKs_lFaT83AS1dp422mzhty1NmJkGU00KhU,11447
-matrice/deploy/aggregator/ingestor.py,sha256=4SwCDvo1ZBwNUJECbHYGcvxGz6U7CSugV5SFmLauBpY,15423
+matrice/deploy/aggregator/aggregator.py,sha256=ob-I9ZaGmhXqdzbIHZL8DDtYCaT944ipmlhFzIz6peQ,11450
+matrice/deploy/aggregator/ingestor.py,sha256=Xb6F5qn693qtF6ku80T6N-KJ76wAqPAtJLsIQgWHbmw,15898
 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=tPFwTWPHnF9c4memBoVB0b6n7v-vvUbdNeWPP4CH6bE,19662
+matrice/deploy/aggregator/synchronizer.py,sha256=8KJwJ9JZ74ok1b7IfMwSYLqgWiyAeMa_z2-NX7LuLqQ,19992
 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
@@ -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.99241.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.99241.dist-info/METADATA,sha256=dQ_fzAottar2md4qqJzOVkqiqvGmK6AfHBw6jVirIsI,14624
-matrice-1.0.99241.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.99241.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.99241.dist-info/RECORD,,
+matrice-1.0.99242.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.99242.dist-info/METADATA,sha256=l8osThgC_or1VtVsMdKYK9recYFQg_ZZLb4D1VdFpbs,14624
+matrice-1.0.99242.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.99242.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.99242.dist-info/RECORD,,