matrice-compute 0.1.33__tar.gz → 0.1.35__tar.gz

{matrice_compute-0.1.33 → matrice_compute-0.1.35}/PKG-INFO

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

{matrice_compute-0.1.33 → matrice_compute-0.1.35}/matrice_compute.egg-info/PKG-INFO

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

{matrice_compute-0.1.33 → matrice_compute-0.1.35}/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:
@@ -494,6 +495,10 @@ class ActionInstance:
         # Build container name option if provided
         name_option = f"--name {container_name}" if container_name else ""
 
+        # if the service provider is local, then put --restart unless-stopped
+        if os.environ.get("SERVICE_PROVIDER") in ("local", "LOCAL"):
+            env_exports += " && export DOCKER_RESTART_POLICY='--restart unless-stopped' "
+
         cmd_parts = [
             f"docker run -d {use_gpu} ",
             name_option,
@@ -1270,7 +1275,7 @@ def database_setup_execute(self: ActionInstance):
             )
             self.docker_container = existing_container_id
             cmd = "docker restart " + self.docker_container
-            self.start(cmd, "qdrant_setup")
+            self.start(cmd, "database_setup")
 
             # qdrant restart
             qdrant_cmd = f"docker restart {qdrant_container_name}"
@@ -1284,11 +1289,15 @@ def database_setup_execute(self: ActionInstance):
             )
             # Fall through to create new containers
 
+    dbPath = action_details["jobParams"].get("dbPath", "/host/data/path/mongodb_data")
+
     # MongoDB container with --net=host (Port: 27020:27017)
     cmd = (
         f"docker run --pull=always --net=host "
         f"--name {mongodb_container_name} "
         f"-v matrice_myvol:/matrice_data "
+        f"-v {dbPath}:{dbPath} "
+        f"-v /var/run/docker.sock:/var/run/docker.sock "
         f"--cidfile ./{self.action_record_id}.cid "
         f"-e ACTION_RECORD_ID={self.action_record_id} "
         f"-e MATRICE_ACCESS_KEY_ID={self.matrice_access_key_id} "
@@ -1297,22 +1306,29 @@ def database_setup_execute(self: ActionInstance):
         f'-e ENV="{os.environ.get("ENV", "prod")}" '
         f"{image} "
     )
-    logging.info("Starting MongoDB container (Port: 27020:27017): %s", cmd)
+    logging.info("Starting DB container (Port: 27020:27017): %s", cmd)
 
     # Qdrant container with --net=host (Port: 6334)
     qdrant_cmd = (
-        f"docker run --pull=always --net=host "
+        f"docker run -d --pull=always --net=host "
         f"--name {qdrant_container_name} "
         f"-v matrice_myvol:/matrice_data "
-        f"{'qdrant/qdrant:latest'} "
+        f"qdrant/qdrant:latest "
     )
     logging.info("Starting Qdrant container (Port: 6334): %s", qdrant_cmd)
 
+    # Start Qdrant container
+    qdrant_process = subprocess.Popen(
+        qdrant_cmd,
+        shell=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+    )
+    logging.info("Qdrant container started successfully")
+
     # Docker Command run
     self.start(cmd, "database_setup") 
 
-    # Docker for qdrant
-    self.start(qdrant_cmd, 'qdrant_setup')
 
 @log_errors(raise_exception=False)
 def facial_recognition_setup_execute(self: ActionInstance):
@@ -1358,6 +1374,7 @@ def facial_recognition_setup_execute(self: ActionInstance):
         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' --restart=unless-stopped '
         f"{image}"
     )
     logging.info("Starting facial recognition worker (Port: 8081): %s", worker_cmd)
@@ -1410,6 +1427,7 @@ def lpr_setup_execute(self: ActionInstance):
         f'-e MATRICE_ACCESS_KEY_ID="{self.matrice_access_key_id}" '
         f'-e ACTION_ID="{self.action_record_id}" '
         f'-e PORT=8082 '
+        f' --restart=unless-stopped '
         f"{image}"
     )
     logging.info("Starting LPR worker (Port: 8082): %s", worker_cmd)
@@ -1468,6 +1486,7 @@ def inference_ws_server_execute(self: ActionInstance):
         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' --restart=unless-stopped '
         f"{image} "
         f"./app "
         f"{self.action_record_id} "
@@ -1529,6 +1548,7 @@ def fe_fs_streaming_execute(self: ActionInstance):
         f'-e MATRICE_ACCESS_KEY_ID="{self.matrice_access_key_id}" '
         f"-e PORT=3000 "
         f'-e WS_HOST="{ws_url}" '
+        f' --restart=unless-stopped '
         f"{image}"
     )
     logging.info("Starting frontend streaming (Port: 3000) with WS_HOST=%s: %s", ws_url, worker_cmd)
@@ -1584,6 +1604,7 @@ def fe_analytics_service_execute(self: ActionInstance):
         f'-e ACTION_ID="{self.action_record_id}" '
         f"-e PORT=3001 "
         f'-e PROJECT_ID="{project_id}" '
+        f' --restart=unless-stopped '
         f"{image}"
     )
     logging.info("Starting frontend analytics service (Port: 3001): %s", worker_cmd)
@@ -2193,7 +2214,50 @@ def inference_tracker_setup_execute(self: ActionInstance):
         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' --restart=unless-stopped '
+        f"{image}"
+    )
+    
+    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'--restart=unless-stopped '
         f"{image}"
     )
     
-    self.start(worker_cmd, "inference_tracker_setup")
+    self.start(worker_cmd, "video_storage_setup_execute")