Update core/app.py

core/app.py

@@ -6,8 +6,7 @@
 from __future__ import annotations
 # ── Early env/threading hygiene (safe default to silence libgomp) ────────────
 import os
-if not os.environ.get("OMP_NUM_THREADS", "").isdigit():
-    os.environ["OMP_NUM_THREADS"] = "2"
+os.environ["OMP_NUM_THREADS"] = "2"  # Force valid value early
 # If you use early_env in your project, keep this import (harmless if absent)
 try:
     import early_env # sets OMP/MKL/OPENBLAS + torch threads safely
@@ -18,7 +17,25 @@
 import traceback
 import sys
 from pathlib import Path
-from utils.cv_processing import validate_video_file
+from typing import Optional, Tuple, Dict, Any, Callable
+# Mitigate CUDA fragmentation (must be set before importing torch)
+if "PYTORCH_CUDA_ALLOC_CONF" not in os.environ:
+    os.environ["PYTORCH_CUDA_ALLOC_CONF"] = "expandable_segments:True,max_split_size_mb:128"
+# ── Logging ──────────────────────────────────────────────────────────────────
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+)
+logger = logging.getLogger("core.app")
+# ── Ensure project root importable ───────────────────────────────────────────
+PROJECT_FILE = Path(__file__).resolve()
+CORE_DIR = PROJECT_FILE.parent
+ROOT = CORE_DIR.parent
+if str(ROOT) not in sys.path:
+    sys.path.insert(0, str(ROOT))
+# Create loader directories if they don't exist
+loaders_dir = ROOT / "models" / "loaders"
+loaders_dir.mkdir(parents=True, exist_ok=True)
 # ── Gradio schema patch (HF quirk) ───────────────────────────────────────────
 try:
     import gradio_client.utils as gc_utils
@@ -35,6 +52,8 @@ def _patched_get_type(schema):
 except Exception as e:
     logger.warning(f"Gradio patch failed: {e}")
 # ── Core config + components ─────────────────────────────────────────────────
+from config.app_config import get_config
+from core.exceptions import ModelLoadingError, VideoProcessingError
 from utils.hardware.device_manager import DeviceManager
 from utils.system.memory_manager import MemoryManager
 # Try to import the new split loaders first, fall back to old if needed
@@ -48,6 +67,7 @@ def _patched_get_type(schema):
 from processing.video.video_processor import CoreVideoProcessor
 from processing.audio.audio_processor import AudioProcessor
 from utils.monitoring.progress_tracker import ProgressTracker
+from utils.cv_processing import validate_video_file
 # ── Optional Two-Stage import ────────────────────────────────────────────────
 TWO_STAGE_AVAILABLE = False
 TWO_STAGE_IMPORT_ORIGIN = ""
@@ -224,7 +244,7 @@ def process_video(
             if use_two_stage:
                 if not TWO_STAGE_AVAILABLE or self.two_stage_processor is None:
                     return None, None, "Two-stage processing not available"
-                return self._process_two_stage(
+                final, green, msg = self._process_two_stage(
                     video_path,
                     background_choice,
                     custom_background_path,
@@ -232,8 +252,9 @@ def process_video(
                     chroma_preset,
                     key_color_mode,
                 )
+                return final, green, msg
             else:
-                return self._process_single_stage(
+                final, green, msg = self._process_single_stage(
                     video_path,
                     background_choice,
                     custom_background_path,
@@ -241,6 +262,7 @@ def process_video(
                     preview_mask,
                     preview_greenscreen,
                 )
+                return final, green, msg
         except VideoProcessingError as e:
             logger.error(f"Processing failed: {e}")
             return None, None, f"Processing failed: {e}"