matrice-compute 0.1.34__py3-none-any.whl → 0.1.35__py3-none-any.whl

matrice_compute/action_instance.py

@@ -495,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,
@@ -1271,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}"
@@ -1285,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} "
@@ -1298,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):
@@ -1359,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)
@@ -1411,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)
@@ -1469,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} "
@@ -1530,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)
@@ -1585,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)
@@ -2194,6 +2214,7 @@ 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}"
     )
     
@@ -2235,6 +2256,7 @@ def video_storage_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}"
     )
     

{matrice_compute-0.1.34.dist-info → matrice_compute-0.1.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrice_compute
-Version: 0.1.34
+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.34.dist-info → matrice_compute-0.1.35.dist-info}/RECORD

@@ -1,5 +1,5 @@
 matrice_compute/__init__.py,sha256=YZhx7rQlD1TAlhBMbsU3_Xp-tpLyTAxWZDcQvqmwR2g,723
-matrice_compute/action_instance.py,sha256=GF49-yYJp_5EHZ6ZT5kY4U-y1zyPkFjjDt1xMb2BaIg,87439
+matrice_compute/action_instance.py,sha256=zVsW7-O3u5QoeZlh2D9Qlo5HsQNMOrUGbaR1jY1QFFg,88286
 matrice_compute/actions_manager.py,sha256=a_TulMnu462xc0t_A-Mpug5zhQTmtpjiv7mhiC_IAVw,18280
 matrice_compute/actions_scaledown_manager.py,sha256=pJ0nduNwHWZ10GnqJNx0Ok7cVWabQ_M8E2Vb9pH3A_k,2002
 matrice_compute/compute_operations_handler.py,sha256=amcMhmXtv2irE6qK8Vbgec_8uFqjWmVVp0VWq-73_MU,17781
@@ -11,8 +11,8 @@ matrice_compute/resources_tracker.py,sha256=DffKitGU1gran0OAuKIsfH0XeOe03xU7NGl-
 matrice_compute/scaling.py,sha256=UQDI8wN9JEKafvUVPF0Pk9XmhKlbMkeu16AZyyOuSE8,55147
 matrice_compute/shutdown_manager.py,sha256=rnP9Qes6JJKDnebmBC9rqkH__X9a8TMjhWQPWoOQKFs,13232
 matrice_compute/task_utils.py,sha256=3qIutiQdYPyGRxH9ZwLbqdg8sZcnp6jp08pszWCRFl0,2820
-matrice_compute-0.1.34.dist-info/licenses/LICENSE.txt,sha256=_uQUZpgO0mRYL5-fPoEvLSbNnLPv6OmbeEDCHXhK6Qc,1066
-matrice_compute-0.1.34.dist-info/METADATA,sha256=K4c_uaSlUeEbbC7yWB9RzW_qvLoxfgwGOk94BbbtaQs,1038
-matrice_compute-0.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice_compute-0.1.34.dist-info/top_level.txt,sha256=63Plr3L1GzBUWZO5JZaFkiv8IcB10xUPU-9w3i6ptvE,16
-matrice_compute-0.1.34.dist-info/RECORD,,
+matrice_compute-0.1.35.dist-info/licenses/LICENSE.txt,sha256=_uQUZpgO0mRYL5-fPoEvLSbNnLPv6OmbeEDCHXhK6Qc,1066
+matrice_compute-0.1.35.dist-info/METADATA,sha256=iP3k-FJhne2q4kbSSZx6IcTX1MPDr5upMcFeG0I_z6g,1038
+matrice_compute-0.1.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice_compute-0.1.35.dist-info/top_level.txt,sha256=63Plr3L1GzBUWZO5JZaFkiv8IcB10xUPU-9w3i6ptvE,16
+matrice_compute-0.1.35.dist-info/RECORD,,