matrice-analytics 0.1.40__py3-none-any.whl → 0.1.41__py3-none-any.whl

matrice_analytics/post_processing/usecases/color/clip.py

@@ -56,28 +56,77 @@ def try_install_clip_dependencies():
     Only called when ClipProcessor is actually instantiated (lazy installation).
     Returns True if successful, False otherwise.
     """
-    global ort, Image, CLIPProcessor, ir_files, ir_as_file
-
     print("→ Color detection is being used but dependencies are missing")
     print("→ Attempting auto-installation of missing packages...")
 
+    import platform
+    import subprocess
+
+    # Detect platform
+    machine = platform.machine().lower()
+    is_jetson = machine in ['aarch64', 'arm64'] or os.path.exists('/etc/nv_tegra_release')
+
+    if is_jetson:
+        print(f"→ Detected Jetson/ARM platform ({machine})")
+    else:
+        print(f"→ Detected x86_64 platform ({machine})")
+
     packages_to_install = []
 
+    # Helper function to check if package is installed
+    def is_package_installed(package_name):
+        try:
+            result = subprocess.run(
+                [sys.executable, "-m", "pip", "show", package_name],
+                capture_output=True,
+                text=True,
+                timeout=10
+            )
+            return result.returncode == 0
+        except Exception:
+            return False
+
     # Check which packages are missing
     try:
         import onnxruntime
-    except ImportError:
-        packages_to_install.append("onnxruntime-gpu")
+        print("→ onnxruntime imported successfully")
+    except ImportError as e:
+        # Check if onnxruntime is installed but import is failing
+        if is_package_installed("onnxruntime"):
+            print(f"→ onnxruntime is installed but import failed: {e}")
+            print("→ This may be due to NumPy version mismatch or CUDA library issues")
+            print("→ Skipping installation, will check other dependencies")
+        elif is_jetson and is_package_installed("onnxruntime-gpu"):
+            print("→ onnxruntime-gpu found on Jetson (this may not work on ARM)")
+            print("→ Attempting import with installed version")
+        else:
+            # Choose appropriate onnxruntime package based on platform
+            if is_jetson:
+                print("→ onnxruntime not installed on Jetson platform")
+                print("→ Note: Jetson usually has onnxruntime pre-installed via JetPack")
+                print("→ If you see this, check your JetPack installation")
+                # Try installing anyway
+                packages_to_install.append("onnxruntime")
+            else:
+                packages_to_install.append("onnxruntime-gpu")
 
     try:
         from PIL import Image as PILImage
+        print("→ PIL/Pillow imported successfully")
     except ImportError:
-        packages_to_install.append("pillow")
+        if not is_package_installed("pillow") and not is_package_installed("PIL"):
+            packages_to_install.append("pillow")
+        else:
+            print("→ pillow is installed but import failed")
 
     try:
         from transformers import CLIPProcessor as CLIP
+        print("→ transformers imported successfully")
     except ImportError:
-        packages_to_install.append("transformers")
+        if not is_package_installed("transformers"):
+            packages_to_install.append("transformers")
+        else:
+            print("→ transformers is installed but import failed (may be incompatible with torch version)")
 
     if not packages_to_install:
         print("→ All packages are available, retrying import...")
@@ -103,30 +152,62 @@ def try_install_clip_dependencies():
             print(f"✗ Installation failed: {install_error}")
             return False
 
-    # Retry imports after installation
+    # Retry imports after installation (or if packages were already installed)
+    print("→ Attempting to import dependencies...")
+
+    ort_module = None
+    PILImage = None
+    CLIPProc = None
+    ir_files_module = None
+    ir_as_file_module = None
+
+    import_errors = []
+
+    # Try importing each package individually
     try:
-        print("→ Retrying imports after installation...")
         import onnxruntime as ort_module
+        print("  ✓ onnxruntime imported")
+    except Exception as e:
+        import_errors.append(f"onnxruntime: {e}")
+        print(f"  ✗ onnxruntime import failed: {e}")
+
+    try:
         from PIL import Image as PILImage
-        from transformers import CLIPProcessor as CLIPProc
-        from importlib.resources import files as ir_files_module, as_file as ir_as_file_module
+        print("  ✓ PIL imported")
+    except Exception as e:
+        import_errors.append(f"PIL: {e}")
+        print(f"  ✗ PIL import failed: {e}")
 
-        # Update global variables
-        ort = ort_module
-        Image = PILImage
-        CLIPProcessor = CLIPProc
-        ir_files = ir_files_module
-        ir_as_file = ir_as_file_module
+    try:
+        from transformers import CLIPProcessor as CLIPProc
+        print("  ✓ transformers imported")
+    except Exception as e:
+        import_errors.append(f"transformers: {e}")
+        print(f"  ✗ transformers import failed: {e}")
 
-        print("✓ CLIP dependencies imported successfully after installation!")
-        return True
-    except ImportError as e:
-        print(f"✗ Import still failed after installation: {e}")
-        return False
+    try:
+        from importlib.resources import files as ir_files_module, as_file as ir_as_file_module
+        print("  ✓ importlib.resources imported")
     except Exception as e:
-        print(f"✗ Unexpected error: {e}")
+        import_errors.append(f"importlib.resources: {e}")
+        print(f"  ✗ importlib.resources import failed: {e}")
+
+    # Check if we have at least the critical dependencies
+    if ort_module is None or PILImage is None or CLIPProc is None:
+        print(f"✗ Critical dependencies missing after installation attempt")
+        print(f"  Errors: {'; '.join(import_errors)}")
         return False
 
+    # Update global variables with successfully imported modules
+    globals()['ort'] = ort_module
+    globals()['Image'] = PILImage
+    globals()['CLIPProcessor'] = CLIPProc
+    globals()['ir_files'] = ir_files_module
+    globals()['ir_as_file'] = ir_as_file_module
+
+    print("✓ CLIP dependencies imported successfully!")
+    return True
+
 def load_model_from_checkpoint(checkpoint_url: str, providers: Optional[List] = None):
     """
     Load an ONNX model from a URL directly into memory without writing locally.

{matrice_analytics-0.1.40.dist-info → matrice_analytics-0.1.41.dist-info}/METADATA

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

{matrice_analytics-0.1.40.dist-info → matrice_analytics-0.1.41.dist-info}/RECORD

@@ -166,7 +166,7 @@ matrice_analytics/post_processing/usecases/weld_defect_detection.py,sha256=b0dAJ
 matrice_analytics/post_processing/usecases/wildlife_monitoring.py,sha256=TMVHJ5GLezmqG7DywmqbLggqNXgpsb63MD7IR6kvDkk,43446
 matrice_analytics/post_processing/usecases/windmill_maintenance.py,sha256=G1eqo3Z-HYmGJ6oeZYrpZwhpvqQ9Lc_T-6S7BLBXHeA,40498
 matrice_analytics/post_processing/usecases/wound_segmentation.py,sha256=ehNX6VuWMB3xAnCySO3ra3Tf_5FUNg5LCSdq_91h374,38342
-matrice_analytics/post_processing/usecases/color/clip.py,sha256=12ir0RkJCb4FJErn_e_9UbjtbBki5PMH2hWJLzyV75Q,21471
+matrice_analytics/post_processing/usecases/color/clip.py,sha256=qtG1YUngpt-5Emx4vdX1Hv_X9U6Sa4BMCNRDYpuM_4g,24828
 matrice_analytics/post_processing/usecases/color/color_map_utils.py,sha256=SP-AEVcjLmL8rxblu-ixqUJC2fqlcr7ab4hWo4Fcr_k,2677
 matrice_analytics/post_processing/usecases/color/color_mapper.py,sha256=nKPc28mJLlrl2HPua5EUUMweRRSI6WrrUBkeitTm7ms,17459
 matrice_analytics/post_processing/usecases/color/clip_processor/merges.txt,sha256=n9aR98gDkhDg_O0VhlRmxlgg0JtjmIsBdL_iXeKZBRo,524619
@@ -188,8 +188,8 @@ matrice_analytics/post_processing/utils/format_utils.py,sha256=UTF7A5h9j0_S12xH9
 matrice_analytics/post_processing/utils/geometry_utils.py,sha256=BWfdM6RsdJTTLR1GqkWfdwpjMEjTCJyuBxA4zVGKdfk,9623
 matrice_analytics/post_processing/utils/smoothing_utils.py,sha256=78U-yucAcjUiZ0NIAc9NOUSIT0PWP1cqyIPA_Fdrjp0,14699
 matrice_analytics/post_processing/utils/tracking_utils.py,sha256=rWxuotnJ3VLMHIBOud2KLcu4yZfDp7hVPWUtNAq_2xw,8288
-matrice_analytics-0.1.40.dist-info/licenses/LICENSE.txt,sha256=_uQUZpgO0mRYL5-fPoEvLSbNnLPv6OmbeEDCHXhK6Qc,1066
-matrice_analytics-0.1.40.dist-info/METADATA,sha256=tROotN2KHqbTIpf18BknZQ8Z4zO8VHNMcf7f1q4svas,14378
-matrice_analytics-0.1.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-matrice_analytics-0.1.40.dist-info/top_level.txt,sha256=STAPEU-e-rWTerXaspdi76T_eVRSrEfFpURSP7_Dt8E,18
-matrice_analytics-0.1.40.dist-info/RECORD,,
+matrice_analytics-0.1.41.dist-info/licenses/LICENSE.txt,sha256=_uQUZpgO0mRYL5-fPoEvLSbNnLPv6OmbeEDCHXhK6Qc,1066
+matrice_analytics-0.1.41.dist-info/METADATA,sha256=aGpFsA4ZZ5rNPFR2iqDy8JlA-gAhpAtjniELau5yH1I,14378
+matrice_analytics-0.1.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+matrice_analytics-0.1.41.dist-info/top_level.txt,sha256=STAPEU-e-rWTerXaspdi76T_eVRSrEfFpURSP7_Dt8E,18
+matrice_analytics-0.1.41.dist-info/RECORD,,