Update app/utils/model_cache.py

app/utils/model_cache.py

@@ -112,6 +112,21 @@ class ModelCache:
                 efficientnet_path.replace('efficient_best_model.pth', 'efficientnet_efficient_best_model_quantized.pth'),
             ]
             
+            # Also search in HF Hub cache directories (nested structure)
+            hf_cache_base = MODELS_DIR / "optimized_models"
+            if hf_cache_base.exists():
+                # Search for HF Hub cache structure: models--*--*/snapshots/*/model.pth
+                for cache_dir in hf_cache_base.glob("models--*"):
+                    if cache_dir.is_dir():
+                        snapshots_dir = cache_dir / "snapshots"
+                        if snapshots_dir.exists():
+                            for snapshot_dir in snapshots_dir.glob("*"):
+                                if snapshot_dir.is_dir():
+                                    hf_model_path = snapshot_dir / "efficientnet_efficient_best_model_quantized.pth"
+                                    if hf_model_path.exists():
+                                        optimized_efficient_paths.insert(0, str(hf_model_path))
+                                        logger.info(f"Found model in HF Hub cache: {hf_model_path}")
+            
             # Find optimized EfficientNet model
             for opt_path in optimized_efficient_paths:
                 if os.path.exists(opt_path):
@@ -309,12 +324,41 @@ class ModelCache:
             logger.info(f"Found model at: {alt_path}")
             return alt_path
         
+        # Try in optimized_models directory
+        alt_path = str(MODELS_DIR / "optimized_models" / os.path.basename(checkpoint_path))
+        if os.path.exists(alt_path):
+            logger.info(f"Found model at: {alt_path}")
+            return alt_path
+        
         # Try in root directory (backward compatibility)
         alt_path = str(BASE_DIR / os.path.basename(checkpoint_path))
         if os.path.exists(alt_path):
             logger.info(f"Found model at: {alt_path}")
             return alt_path
         
+        # Search in HF Hub cache directories (nested structure)
+        hf_cache_base = MODELS_DIR / "optimized_models"
+        if hf_cache_base.exists():
+            model_filename = os.path.basename(checkpoint_path)
+            # Also try quantized variant if looking for base model
+            search_filenames = [model_filename]
+            if 'efficient_best_model.pth' in model_filename and 'quantized' not in model_filename:
+                search_filenames.append('efficientnet_efficient_best_model_quantized.pth')
+                search_filenames.append(model_filename.replace('efficient_best_model.pth', 'efficientnet_efficient_best_model_quantized.pth'))
+            
+            # Search for HF Hub cache structure: models--*--*/snapshots/*/model.pth
+            for cache_dir in hf_cache_base.glob("models--*"):
+                if cache_dir.is_dir():
+                    snapshots_dir = cache_dir / "snapshots"
+                    if snapshots_dir.exists():
+                        for snapshot_dir in snapshots_dir.glob("*"):
+                            if snapshot_dir.is_dir():
+                                for search_filename in search_filenames:
+                                    hf_model_path = snapshot_dir / search_filename
+                                    if hf_model_path.exists():
+                                        logger.info(f"Found model in HF Hub cache: {hf_model_path}")
+                                        return str(hf_model_path)
+        
         # Return original path (will fail with clear error)
         return checkpoint_path