matrice-compute 0.1.42__py3-none-any.whl → 0.1.44__py3-none-any.whl

matrice_compute/action_instance.py

@@ -1905,11 +1905,14 @@ def video_storage_setup_execute(self: ActionInstance):
         self.start(cmd, "video_storage_setup_execute")
         return
     
+    # get the mediaStorage path from jobParams
+    media_storage_path = action_details["jobParams"].get("mediaStoragePath", "/host/data/path/video_storage")
+    
     # This is the existing Docker run command
     worker_cmd = (
         f"docker run -d --pull=always --net=host "
         f"--name {self.action_record_id}_{self.action_type} "
-        f"-v matrice_myvol:/matrice_data "
+        f"-v {media_storage_path}:/storage "  
         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}" '

matrice_compute/resources_tracker.py

@@ -1543,12 +1543,12 @@ class KafkaResourceMonitor:
         return gpu_usage
 
     @staticmethod
-    def get_all_storage_info() -> Dict[str, float]:
+    def get_all_storage_info() -> Dict[str, tuple]:
         """
-        Get free storage space for all mounted drives.
+        Get storage information for all mounted drives.
 
         Returns:
-            Dict[str, float]: Dictionary mapping mount point to free storage space in GB.
+            Dict[str, tuple]: Dictionary mapping mount point to (free_gb, total_gb).
         """
         storage_info = {}
 
@@ -1563,8 +1563,9 @@ class KafkaResourceMonitor:
                     
                     # Convert bytes to GB
                     free_gb = usage.free / (1024 ** 3)
+                    total_gb = usage.total / (1024 ** 3)
                     
-                    storage_info[partition.mountpoint] = round(free_gb, 2)
+                    storage_info[partition.mountpoint] = (round(free_gb, 2), round(total_gb, 2))
                     
                 except PermissionError:
                     # Skip drives that we can't access (common on Windows)
@@ -1580,13 +1581,13 @@ class KafkaResourceMonitor:
 
         return storage_info
 
-    def get_stats(self) -> Tuple[float, int, float, float, Dict[int, tuple], Dict[str, float]]:
+    def get_stats(self) -> Tuple[float, int, float, float, Dict[int, tuple], Dict[str, tuple]]:
         """
         Collect current system resource statistics.
 
         Returns:
-            Tuple[float, int, float, float, Dict[int, tuple], Dict[str, float]]: 
-            CPU usage %, CPU cores, RAM total GB, RAM used GB, GPU memory dict (used, total), Free storage dict
+            Tuple[float, int, float, float, Dict[int, tuple], Dict[str, tuple]]: 
+            CPU usage %, CPU cores, RAM total GB, RAM used GB, GPU memory dict (used, total), Storage dict (free, total)
         """
         cpu_usage = psutil.cpu_percent(interval=1)
         cpu_cores = psutil.cpu_count(logical=True)  # Total logical CPU cores
@@ -1627,6 +1628,8 @@ class KafkaResourceMonitor:
 
                 # Format GPU info for output: {0: {"used_gb": x, "total_gb": y}, ...}
                 gpu_memory_gb = {k: {"used_gb": v[0], "total_gb": v[1]} for k, v in gpus.items()}
+                # Format storage info for output: {"/": {"free_gb": x, "total_gb": y}, ...}
+                storage_gb = {k: {"free_gb": v[0], "total_gb": v[1]} for k, v in storage.items()}
                 payload = {
                     "instance_id": self.instance_id,
                     "cpu_usage_percent": round(cpu, 2),
@@ -1634,7 +1637,7 @@ class KafkaResourceMonitor:
                     "ram_total_gb": round(total, 2),
                     "ram_used_gb": round(used, 2),
                     "gpu_memory_gb": gpu_memory_gb,  # dict: {0: {used_gb, total_gb}, ...}
-                    "free_storage_gb": storage,  # dict: {"/": 50.5, "C:": 123.4}
+                    "storage_gb": storage_gb,  # dict: {"/": {free_gb, total_gb}, ...}
                     "timestamp": datetime.now(timezone.utc).isoformat()
                 }
 

{matrice_compute-0.1.42.dist-info → matrice_compute-0.1.44.dist-info}/METADATA

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

{matrice_compute-0.1.42.dist-info → matrice_compute-0.1.44.dist-info}/RECORD

@@ -1,5 +1,5 @@
 matrice_compute/__init__.py,sha256=YZhx7rQlD1TAlhBMbsU3_Xp-tpLyTAxWZDcQvqmwR2g,723
-matrice_compute/action_instance.py,sha256=N74jgcNm_l6zk9w8shPlgR9EWFjICXWkfOP4MKwig2o,73979
+matrice_compute/action_instance.py,sha256=Wowl1Sw6gwH2iwXD6yIWnODhgFDNBzM1olpUthV7m44,74145
 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
@@ -7,12 +7,12 @@ matrice_compute/instance_manager.py,sha256=W0BN1mkfcqCP1jxb6JjhNPUHM-iTmrDu7Woyf
 matrice_compute/instance_utils.py,sha256=N4yPDvNukFEEBngR0lEt4x_XT5hur1q0P-spM2xQIlU,42025
 matrice_compute/prechecks.py,sha256=W9YmNF3RcLhOf4U8WBlExvFqDw1aGWSNTlJtA73lbDQ,17196
 matrice_compute/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-matrice_compute/resources_tracker.py,sha256=1HDCRZLDbYAHGhJojM_Hee8vSpVGbFB96WUUc_rqudY,67870
+matrice_compute/resources_tracker.py,sha256=Hn_auCSQ2vQIc8X3PZ-KvoVOamjfEkQmbL4ekmWgbt8,68149
 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.42.dist-info/licenses/LICENSE.txt,sha256=_uQUZpgO0mRYL5-fPoEvLSbNnLPv6OmbeEDCHXhK6Qc,1066
-matrice_compute-0.1.42.dist-info/METADATA,sha256=jSxrKx79IwTZZzRkTuqcHaNwixeEpxT6zG4W2F52UJI,1038
-matrice_compute-0.1.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice_compute-0.1.42.dist-info/top_level.txt,sha256=63Plr3L1GzBUWZO5JZaFkiv8IcB10xUPU-9w3i6ptvE,16
-matrice_compute-0.1.42.dist-info/RECORD,,
+matrice_compute-0.1.44.dist-info/licenses/LICENSE.txt,sha256=_uQUZpgO0mRYL5-fPoEvLSbNnLPv6OmbeEDCHXhK6Qc,1066
+matrice_compute-0.1.44.dist-info/METADATA,sha256=yrkFxOzfY0cq4wKGpoetb3vt8PoPoRDszI64DKTWZWE,1038
+matrice_compute-0.1.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice_compute-0.1.44.dist-info/top_level.txt,sha256=63Plr3L1GzBUWZO5JZaFkiv8IcB10xUPU-9w3i6ptvE,16
+matrice_compute-0.1.44.dist-info/RECORD,,