matrice 1.0.98850__tar.gz → 1.0.98852__tar.gz

{matrice-1.0.98850/src/matrice.egg-info → matrice-1.0.98852}/PKG-INFO

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

{matrice-1.0.98850 → matrice-1.0.98852}/setup.py

@@ -15,7 +15,7 @@ setup(
     name="matrice",
 
 
-    version = "1.0.98850",
+    version = "1.0.98852",
 
 
     description="SDK for connecting to matrice.ai services",

matrice-1.0.98852/src/matrice/compute_manager/task_utils.py

@@ -0,0 +1,76 @@
+"""Module providing task_utils functionality."""
+
+import os
+import shutil
+import urllib.request
+import zipfile
+from matrice.utils import log_errors
+
+
+@log_errors(raise_exception=True, log_error=True)
+def setup_workspace_and_run_task(
+    work_fs,
+    action_id,
+    model_codebase_url,
+    model_codebase_requirements_url,
+):
+    """Set up workspace and run task with provided parameters.
+
+    Args:
+        work_fs: Working filesystem path
+        action_id: Unique identifier for the action
+        model_codebase_url: URL to download model codebase from
+        model_codebase_requirements_url: URL to download requirements from
+
+    Returns:
+        None
+    """
+    workspace_dir = f"{work_fs}/{action_id}"
+    codebase_zip_path = f"{workspace_dir}/file.zip"
+    requirements_txt_path = f"{workspace_dir}/requirements.txt"
+    if os.path.exists(workspace_dir):
+        return
+    os.makedirs(workspace_dir, exist_ok=True)
+    
+    # Download codebase ZIP file
+    urllib.request.urlretrieve(model_codebase_url, codebase_zip_path)
+    
+    # Extract ZIP file with overwrite
+    with zipfile.ZipFile(codebase_zip_path, 'r') as zip_ref:
+        zip_ref.extractall(workspace_dir)
+    
+    # Move files from subdirectories to workspace root (equivalent to rsync -av)
+    for root, dirs, files in os.walk(workspace_dir):
+        # Skip the workspace_dir itself to avoid moving files to themselves
+        if root == workspace_dir:
+            continue
+        
+        for file in files:
+            src_file = os.path.join(root, file)
+            dst_file = os.path.join(workspace_dir, file)
+            
+            # If destination file exists, overwrite it (equivalent to rsync -av behavior)
+            if os.path.exists(dst_file):
+                os.remove(dst_file)
+            
+            shutil.move(src_file, dst_file)
+        
+        # Remove empty directories after moving files
+        for dir_name in dirs:
+            dir_path = os.path.join(root, dir_name)
+            if os.path.exists(dir_path) and not os.listdir(dir_path):
+                os.rmdir(dir_path)
+    
+    # Clean up any remaining empty subdirectories
+    for root, dirs, files in os.walk(workspace_dir, topdown=False):
+        if root == workspace_dir:
+            continue
+        if not files and not dirs:
+            try:
+                os.rmdir(root)
+            except OSError:
+                pass  # Directory might not be empty or might not exist
+    
+    # Download requirements.txt if URL is provided
+    if model_codebase_requirements_url:
+        urllib.request.urlretrieve(model_codebase_requirements_url, requirements_txt_path)

{matrice-1.0.98850 → matrice-1.0.98852}/src/matrice/deploy/utils/post_processing/usecases/vehicle_monitoring.py

@@ -566,6 +566,8 @@ class VehicleMonitoringUseCase(BaseProcessor):
         total_vehicles = counting_summary.get("total_count", 0)
         total_vehicle_counts = counting_summary.get("total_vehicle_counts", {})
         cumulative_total = sum(total_vehicle_counts.values()) if total_vehicle_counts else 0
+        per_category_count = counting_summary.get("per_category_count", {})
+
 
         track_ids_info = self._get_track_ids_info(counting_summary.get("detections", []))
 
@@ -577,7 +579,14 @@ class VehicleMonitoringUseCase(BaseProcessor):
         # CURRENT FRAME section
         human_text_lines.append(f"CURRENT FRAME @ {current_timestamp}:")
         if total_vehicles > 0:
-            human_text_lines.append(f"\t- Vehicles Detected: {total_vehicles}")
+            category_counts = [f"{count} {cat}" for cat, count in per_category_count.items()]
+            if len(category_counts) == 1:
+                vehicles_text = category_counts[0] + " detected"
+            elif len(category_counts) == 2:
+                vehicles_text = f"{category_counts[0]} and {category_counts[1]} detected"
+            else:
+                vehicles_text = f"{', '.join(category_counts[:-1])}, and {category_counts[-1]} detected"
+            human_text_lines.append(f"\t- {vehicles_text}")
         else:
             human_text_lines.append(f"\t- No vehicles detected")
 

{matrice-1.0.98850 → matrice-1.0.98852/src/matrice.egg-info}/PKG-INFO

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

matrice-1.0.98850/src/matrice/compute_manager/task_utils.py

@@ -1,53 +0,0 @@
-"""Module providing task_utils functionality."""
-
-import os
-import shlex
-import subprocess
-from matrice.utils import log_errors
-
-
-@log_errors(raise_exception=True, log_error=True)
-def setup_workspace_and_run_task(
-    work_fs,
-    action_id,
-    model_codebase_url,
-    model_codebase_requirements_url,
-):
-    """Set up workspace and run task with provided parameters.
-
-    Args:
-        work_fs: Working filesystem path
-        action_id: Unique identifier for the action
-        model_codebase_url: URL to download model codebase from
-        model_codebase_requirements_url: URL to download requirements from
-
-    Returns:
-        None
-    """
-    workspace_dir = f"{work_fs}/{action_id}"
-    codebase_zip_path = f"{workspace_dir}/file.zip"
-    requirements_txt_path = f"{workspace_dir}/requirements.txt"
-    if os.path.exists(workspace_dir):
-        return
-    os.makedirs(workspace_dir, exist_ok=True)
-    download_codebase_cmd = (
-        f"curl -L -o {shlex.quote(codebase_zip_path)} {shlex.quote(model_codebase_url)}"
-    )
-    subprocess.run(
-        download_codebase_cmd,
-        shell=True,
-        check=True,
-    )
-    unzip_codebase_cmd = (
-        f"unzip -o {shlex.quote(codebase_zip_path)} -d {shlex.quote(workspace_dir)}"
-    )
-    subprocess.run(unzip_codebase_cmd, shell=True, check=True)
-    move_files_cmd = f"rsync -av {shlex.quote(workspace_dir)}/*/ {shlex.quote(workspace_dir)}/ "
-    subprocess.run(move_files_cmd, shell=True, check=True)
-    if model_codebase_requirements_url:
-        download_requirements_cmd = f"curl -L -o {shlex.quote(requirements_txt_path)} {shlex.quote(model_codebase_requirements_url)}"
-        subprocess.run(
-            download_requirements_cmd,
-            shell=True,
-            check=True,
-        )