Update app.py
Browse files
app.py
CHANGED
|
@@ -50,14 +50,14 @@ def patched_get_type(schema):
|
|
| 50 |
logger.error(f"Gradio patch failed: {e}")
|
| 51 |
|
| 52 |
# Import modular components
|
| 53 |
-
|
| 54 |
-
|
| 55 |
-
|
| 56 |
-
|
| 57 |
-
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
|
| 62 |
# Import utilities (existing)
|
| 63 |
from utilities import (
|
|
@@ -84,11 +84,11 @@ class VideoProcessor:
|
|
| 84 |
|
| 85 |
def __init__(self):
|
| 86 |
"""Initialize the video processor with all required components"""
|
| 87 |
-
self.config = ProcessingConfig()
|
| 88 |
-
self.device_manager = DeviceManager()
|
| 89 |
-
self.memory_manager = MemoryManager(self.device_manager.get_optimal_device())
|
| 90 |
-
self.model_loader = ModelLoader(self.device_manager.get_optimal_device())
|
| 91 |
-
self.audio_processor = AudioProcessor()
|
| 92 |
|
| 93 |
# Initialize core processor (will be set up after models load)
|
| 94 |
self.core_processor = None
|
|
@@ -123,7 +123,7 @@ def load_models(self, progress_callback: Optional[Callable] = None) -> str:
|
|
| 123 |
return "Model loading cancelled"
|
| 124 |
|
| 125 |
# Initialize core processor with loaded models
|
| 126 |
-
self.core_processor = CoreVideoProcessor(
|
| 127 |
sam2_predictor=sam2_predictor,
|
| 128 |
matanyone_model=matanyone_model,
|
| 129 |
config=self.config,
|
|
@@ -143,7 +143,7 @@ def load_models(self, progress_callback: Optional[Callable] = None) -> str:
|
|
| 143 |
logger.info(message)
|
| 144 |
return message
|
| 145 |
|
| 146 |
-
except ModelLoadingError as e:
|
| 147 |
self.models_loaded = False
|
| 148 |
error_msg = f"Model loading failed: {str(e)}"
|
| 149 |
logger.error(error_msg)
|
|
@@ -191,7 +191,7 @@ def process_video(
|
|
| 191 |
progress_callback, preview_mask, preview_greenscreen
|
| 192 |
)
|
| 193 |
|
| 194 |
-
except VideoProcessingError as e:
|
| 195 |
logger.error(f"Video processing failed: {e}")
|
| 196 |
return None, f"Processing failed: {str(e)}"
|
| 197 |
except Exception as e:
|
|
|
|
| 50 |
logger.error(f"Gradio patch failed: {e}")
|
| 51 |
|
| 52 |
# Import modular components
|
| 53 |
+
import app_config
|
| 54 |
+
import device_manager
|
| 55 |
+
import memory_manager
|
| 56 |
+
import model_loader
|
| 57 |
+
import video_processor
|
| 58 |
+
import audio_processor
|
| 59 |
+
import progress_tracker
|
| 60 |
+
import exceptions
|
| 61 |
|
| 62 |
# Import utilities (existing)
|
| 63 |
from utilities import (
|
|
|
|
| 84 |
|
| 85 |
def __init__(self):
|
| 86 |
"""Initialize the video processor with all required components"""
|
| 87 |
+
self.config = app_config.ProcessingConfig()
|
| 88 |
+
self.device_manager = device_manager.DeviceManager()
|
| 89 |
+
self.memory_manager = memory_manager.MemoryManager(self.device_manager.get_optimal_device())
|
| 90 |
+
self.model_loader = model_loader.ModelLoader(self.device_manager.get_optimal_device())
|
| 91 |
+
self.audio_processor = audio_processor.AudioProcessor()
|
| 92 |
|
| 93 |
# Initialize core processor (will be set up after models load)
|
| 94 |
self.core_processor = None
|
|
|
|
| 123 |
return "Model loading cancelled"
|
| 124 |
|
| 125 |
# Initialize core processor with loaded models
|
| 126 |
+
self.core_processor = video_processor.CoreVideoProcessor(
|
| 127 |
sam2_predictor=sam2_predictor,
|
| 128 |
matanyone_model=matanyone_model,
|
| 129 |
config=self.config,
|
|
|
|
| 143 |
logger.info(message)
|
| 144 |
return message
|
| 145 |
|
| 146 |
+
except exceptions.ModelLoadingError as e:
|
| 147 |
self.models_loaded = False
|
| 148 |
error_msg = f"Model loading failed: {str(e)}"
|
| 149 |
logger.error(error_msg)
|
|
|
|
| 191 |
progress_callback, preview_mask, preview_greenscreen
|
| 192 |
)
|
| 193 |
|
| 194 |
+
except exceptions.VideoProcessingError as e:
|
| 195 |
logger.error(f"Video processing failed: {e}")
|
| 196 |
return None, f"Processing failed: {str(e)}"
|
| 197 |
except Exception as e:
|