Update core/app.py

core/app.py

@@ -80,29 +80,8 @@ def __init__(self):
         self.device_manager = DeviceManager()
         self.memory_manager = MemoryManager(self.device_manager.get_optimal_device())
         
-        # Initialize ModelLoader - check what parameters it actually accepts
-        try:
-            # Try the expected signature first
-            self.model_loader = ModelLoader(
-                cache_dir=None,  # Will use default cache directory
-                device=self.device_manager.get_optimal_device()  # Pass device string, not manager object
-            )
-            logger.info("ModelLoader initialized with cache_dir and device parameters")
-        except TypeError as e:
-            logger.warning(f"ModelLoader doesn't accept expected parameters: {e}")
-            # Try alternative signatures
-            try:
-                # Maybe it expects the old signature with DeviceManager and MemoryManager?
-                self.model_loader = ModelLoader(self.device_manager, self.memory_manager)
-                logger.info("ModelLoader initialized with DeviceManager and MemoryManager")
-            except TypeError:
-                # Fall back to no parameters
-                try:
-                    self.model_loader = ModelLoader()
-                    logger.info("ModelLoader initialized with no parameters")
-                except Exception as e2:
-                    logger.error(f"Failed to initialize ModelLoader: {e2}")
-                    raise
+        # Initialize ModelLoader with DeviceManager and MemoryManager (as per actual implementation)
+        self.model_loader = ModelLoader(self.device_manager, self.memory_manager)
         
         self.audio_processor = AudioProcessor()
         self.progress_tracker = None
@@ -148,19 +127,23 @@ def load_models(self, progress_callback: Optional[Callable] = None) -> str:
                 if progress_callback:
                     progress_callback(0.0, f"Starting model loading on {self.device_manager.get_optimal_device()}")
                 
-                # Load models using the specialized loader
-                # load_models() returns a boolean indicating success
-                success = self.model_loader.load_models(force_reload=False)
+                # Load models using load_all_models which returns tuple of (sam2, matanyone)
+                sam2_predictor, matanyone_model = self.model_loader.load_all_models(
+                    progress_callback=progress_callback,
+                    cancel_event=self.cancel_event
+                )
                 
                 if self.cancel_event.is_set():
                     return "Model loading cancelled"
                 
+                # Check if models loaded successfully
+                success = sam2_predictor is not None and matanyone_model is not None
+                
                 if not success:
                     return "Model loading failed - check logs for details"
                 
-                # Get the actual model instances using the getter methods
-                sam2_predictor = self.model_loader.get_sam2()
-                matanyone_model = self.model_loader.get_matanyone()
+                # The models are already stored in model_loader, but also keep local references
+                # for backward compatibility
                 
                 # Initialize core processor with correct parameters
                 self.core_processor = CoreVideoProcessor(