matrice 1.0.98850__py3-none-any.whl → 1.0.98852__py3-none-any.whl

matrice/compute_manager/task_utils.py

@@ -1,8 +1,9 @@
 """Module providing task_utils functionality."""
 
 import os
-import shlex
-import subprocess
+import shutil
+import urllib.request
+import zipfile
 from matrice.utils import log_errors
 
 
@@ -30,24 +31,46 @@ def setup_workspace_and_run_task(
     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)
+    
+    # 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:
-        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,
-        )
+        urllib.request.urlretrieve(model_codebase_requirements_url, requirements_txt_path)

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.dist-info → matrice-1.0.98852.dist-info}/METADATA

@@ -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.dist-info → matrice-1.0.98852.dist-info}/RECORD

@@ -31,7 +31,7 @@ matrice/compute_manager/prechecks.py,sha256=sarrX0DIUWRfWvCowTANiMvSi2VPZ-5tCEdZ
 matrice/compute_manager/resources_tracker.py,sha256=84yzWYyLZmd2wENnKMk-mBUMAhE3CZ7oyZ3-5hnAwdI,16178
 matrice/compute_manager/scaling.py,sha256=95gt9KxYLtcOskSpdbC0ddbduSgZuDD6bGsJX-SVlwc,22976
 matrice/compute_manager/shutdown_manager.py,sha256=3m0DjItl1uSyTO7fvQb-IV8lapNX31Zul8FG0yCge0M,5245
-matrice/compute_manager/task_utils.py,sha256=gBmlD4Fw73mm6Z3keXMSk33joF_Kkf_6CucR1iyciME,1761
+matrice/compute_manager/task_utils.py,sha256=hwT3_RyCu7RTH7T83NYNHBJ8XXkS8V3sUSb3oO0QNrU,2626
 matrice/data_processing/__init__.py,sha256=JqYtcyzrQGSXN2EmQBjS4rqwj0CKe0tg9x1Nd3UAAgQ,120
 matrice/data_processing/client.py,sha256=AtimRASg8nH3mxwwih1EHvvHNeXl9NvJhIJHjLjSxHY,55309
 matrice/data_processing/client_utils.py,sha256=q0bJg6bmlUTzy83RSuViCcpazHWgRgKgx77fqDqT2kQ,50121
@@ -123,7 +123,7 @@ matrice/deploy/utils/post_processing/usecases/flare_analysis.py,sha256=_pPKa16ax
 matrice/deploy/utils/post_processing/usecases/license_plate_detection.py,sha256=f38mdyAdW2Lopqy2XcT97HzI31_FcxTux-_tIdCm37g,26855
 matrice/deploy/utils/post_processing/usecases/people_counting.py,sha256=QSvq2zwFotp0o_T15EqFePAkukIyACleBZCf4fy7dHM,77973
 matrice/deploy/utils/post_processing/usecases/ppe_compliance.py,sha256=UhFFy7awb3vmBd4eOdFeO43um497J0Xt90Nl9v6reoQ,27599
-matrice/deploy/utils/post_processing/usecases/vehicle_monitoring.py,sha256=EkbZc1yYrb3rtloQQqZLNOTJsFPGPD8dyTG8J1M4ZNQ,39277
+matrice/deploy/utils/post_processing/usecases/vehicle_monitoring.py,sha256=BD-7iz1TGS7Br1wmtBZoiL9YCW_qYGRn8xoh175RHJ4,39792
 matrice/deploy/utils/post_processing/utils/__init__.py,sha256=A49ksdXL7gRwBbIUwnU2ueFDGA67qVnEW_9lItOibtk,3626
 matrice/deploy/utils/post_processing/utils/advanced_counting_utils.py,sha256=D6jlZNRCfPtfG8COv3AMCbCfZf4_DK9rFhwzVJEYjpg,19152
 matrice/deploy/utils/post_processing/utils/advanced_helper_utils.py,sha256=W8mDqJTpg98YJgWYBod0rZUNbR4bmvYMeWAGASs14_s,11624
@@ -137,8 +137,8 @@ matrice/deploy/utils/post_processing/utils/format_utils.py,sha256=ce2VpQicTYKfxu
 matrice/deploy/utils/post_processing/utils/geometry_utils.py,sha256=BWfdM6RsdJTTLR1GqkWfdwpjMEjTCJyuBxA4zVGKdfk,9623
 matrice/deploy/utils/post_processing/utils/smoothing_utils.py,sha256=gQPykV1HGh-IMMz_3fumgtrhpyCRgXMS1hOEDcLRMO0,12542
 matrice/deploy/utils/post_processing/utils/tracking_utils.py,sha256=rWxuotnJ3VLMHIBOud2KLcu4yZfDp7hVPWUtNAq_2xw,8288
-matrice-1.0.98850.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
-matrice-1.0.98850.dist-info/METADATA,sha256=0DEEGtD_S91fmHYOV3wONYu3S94DMa7XHrBOpA4rwTk,14624
-matrice-1.0.98850.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice-1.0.98850.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
-matrice-1.0.98850.dist-info/RECORD,,
+matrice-1.0.98852.dist-info/licenses/LICENSE.txt,sha256=2bm9uFabQZ3Ykb_SaSU_uUbAj2-htc6WJQmS_65qD00,1073
+matrice-1.0.98852.dist-info/METADATA,sha256=6LpPKRORYoxIvokieEh3qlx_v_1BaFKjXM7WuTZmD0Q,14624
+matrice-1.0.98852.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice-1.0.98852.dist-info/top_level.txt,sha256=P97js8ur6o5ClRqMH3Cjoab_NqbJ6sOQ3rJmVzKBvMc,8
+matrice-1.0.98852.dist-info/RECORD,,