matrice-compute 0.1.32__tar.gz → 0.1.34__tar.gz

{matrice_compute-0.1.32 → matrice_compute-0.1.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice_compute
-Version: 0.1.32
+Version: 0.1.34
 Summary: Common server utilities for Matrice.ai services
 Author-email: "Matrice.ai" <dipendra@matrice.ai>
 License-Expression: MIT

{matrice_compute-0.1.32 → matrice_compute-0.1.34}/matrice_compute.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice_compute
-Version: 0.1.32
+Version: 0.1.34
 Summary: Common server utilities for Matrice.ai services
 Author-email: "Matrice.ai" <dipendra@matrice.ai>
 License-Expression: MIT

{matrice_compute-0.1.32 → matrice_compute-0.1.34}/src/matrice_compute/action_instance.py

@@ -83,7 +83,8 @@ class ActionInstance:
             "inference_ws_server": inference_ws_server_execute,
             "fe_analytics_service": fe_analytics_service_execute,
             "lpr_setup": lpr_setup_execute,
-            "inference_tracker_server": inference_tracker_setup_execute
+            "inference_tracker_server": inference_tracker_setup_execute,
+            "video_storage_setup" : video_storage_setup_execute
         }
         if self.action_type not in self.actions_map:
             raise ValueError(f"Unknown action type: {self.action_type}")
@@ -309,7 +310,7 @@ class ActionInstance:
             )
 
     @log_errors(default_return=None, raise_exception=False, log_error=False)
-    def get_action_details(self):
+    def  get_action_details(self):
         """Get action details from scaling service.
 
         Returns:
@@ -939,7 +940,16 @@ class ActionInstance:
             env={**os.environ},
         )
         
-        stdout, stderr = process.communicate(timeout=120)
+        # Use a longer timeout for docker run since --pull=always may need to
+        # download large images on first run. Default: 30 minutes (1800 seconds)
+        # Can be configured via DOCKER_START_TIMEOUT_SECONDS environment variable
+        docker_start_timeout = int(os.environ.get("DOCKER_START_TIMEOUT_SECONDS", 1800))
+        logging.info(
+            "Waiting for docker container to start for action %s (timeout: %d seconds)",
+            self.action_record_id,
+            docker_start_timeout,
+        )
+        stdout, stderr = process.communicate(timeout=docker_start_timeout)
         
         if process.returncode != 0:
             logging.error(
@@ -2187,4 +2197,45 @@ def inference_tracker_setup_execute(self: ActionInstance):
         f"{image}"
     )
     
-    self.start(worker_cmd, "inference_tracker_setup")
+    self.start(worker_cmd, "inference_tracker_setup")
+
+@log_errors(raise_exception=False)
+def video_storage_setup_execute(self: ActionInstance):
+
+    """
+    Creates and start Video Storage
+    Video Stroage runs on port 8106 (localhost only with --net=host).
+    """ 
+    
+    action_details = self.get_action_details()
+    if not action_details:
+        return
+    
+    image = self.docker_container
+    
+    self.setup_action_requirements(action_details)
+
+    if action_details["actionDetails"].get("containerId"):
+        logging.info(
+            "Using existing container ID for inference tracker: %s",
+            action_details["actionDetails"]["containerId"],
+        )
+        self.docker_container = action_details["actionDetails"]["containerId"]
+        cmd = "docker restart " + self.docker_container 
+        self.start(cmd, "video_storage_setup_execute")
+        return
+    
+    # This is the existing Docker run command
+    worker_cmd = (
+        f"docker run -d --pull=always --net=host "
+         f"--cidfile ./{self.action_record_id}.cid "
+        f"--name media_server "
+        f"-v matrice_myvol:/matrice_data "
+        f'-e ENV="{os.environ.get("ENV", "prod")}" '
+        f'-e MATRICE_SECRET_ACCESS_KEY="{self.matrice_secret_access_key}" '
+        f'-e MATRICE_ACCESS_KEY_ID="{self.matrice_access_key_id}" '
+        f'-e ACTION_ID="{self.action_record_id}" '
+        f"{image}"
+    )
+    
+    self.start(worker_cmd, "video_storage_setup_execute")

{matrice_compute-0.1.32 → matrice_compute-0.1.34}/src/matrice_compute/actions_manager.py

@@ -43,7 +43,11 @@ class ActionsManager:
         """
         actions = []
         logging.info("Polling backend for new jobs")
-        fetched_actions, error, _ = self.scaling.assign_jobs(has_gpu())
+        result = self.scaling.assign_jobs(has_gpu())
+        if result is None:
+            logging.error("assign_jobs returned None")
+            return actions
+        fetched_actions, error, _ = result
         if error:
             logging.error("Error assigning jobs: %s", error)
             return actions