Update app.py

app.py

@@ -1,49 +1,75 @@
 # app.py
+from __future__ import annotations
+import os
+from typing import Optional
+
 from app.gradio_app import build_demo
 from models.tts_router import cleanup_old_audio
+from utils.config import get_settings
 
-import os
 import huggingface_hub
 
-def ensure_model():
+
+def ensure_model() -> str:
     """
-    Downloads the GGUF model into ./models if not already present.
-    - LLAMACPP_MODEL_PATH must include the filename.
-    - HF_MODEL_REPO must point to the Hugging Face repo.
+    Ensure a local GGUF exists:
+      - Reads settings from .env via pydantic (get_settings()).
+      - If the file at LLAMACPP_MODEL_PATH doesn't exist, download from HF_MODEL_REPO/HF_MODEL_FILE.
+      - HF_MODEL_FILE is optional; if missing, we use basename(LLAMACPP_MODEL_PATH).
+      - The file is saved exactly at LLAMACPP_MODEL_PATH (e.g., models/<file>.gguf).
     """
-    model_path = os.getenv("LLAMACPP_MODEL_PATH")
-    repo_id = os.getenv("HF_MODEL_REPO")
+    s = get_settings()  # <- loads .env
+    model_path: Optional[str] = getattr(s, "LLAMACPP_MODEL_PATH", None) or os.getenv("LLAMACPP_MODEL_PATH")
+    repo_id: Optional[str]   = getattr(s, "HF_MODEL_REPO", None)        or os.getenv("HF_MODEL_REPO")
+    file_name: Optional[str] = getattr(s, "HF_MODEL_FILE", None)        or os.getenv("HF_MODEL_FILE")
 
     if not model_path or not repo_id:
-        raise RuntimeError("Both LLAMACPP_MODEL_PATH and HF_MODEL_REPO must be set in .env")
+        raise RuntimeError(
+            "Missing config: set LLAMACPP_MODEL_PATH and HF_MODEL_REPO in .env "
+            "(optionally HF_MODEL_FILE)."
+        )
+
+    # Where/what to download
+    if not file_name:
+        file_name = os.path.basename(model_path)
 
+    # Already present?
     if os.path.exists(model_path):
         print(f"[MODEL] Found existing model at {model_path}")
         return model_path
 
+    # Make sure models/ exists
     os.makedirs(os.path.dirname(model_path), exist_ok=True)
 
-    filename = os.path.basename(model_path)
-
-    print(f"[MODEL] Downloading {filename} from {repo_id} …")
-    local_path = huggingface_hub.hf_hub_download(
+    print(f"[MODEL] Downloading {file_name} from {repo_id} → {model_path}")
+    # Download into a temp cache, then copy/symlink into our desired path
+    local_cached = huggingface_hub.hf_hub_download(
         repo_id=repo_id,
-        filename=filename,
-        local_dir=os.path.dirname(model_path),
-        local_dir_use_symlinks=False,
+        filename=file_name,
+        local_dir=os.path.dirname(model_path),      # ensure it lands under models/
+        local_dir_use_symlinks=False
     )
-    print(f"[MODEL] Saved at {local_path}")
-    return local_path
+
+    # hf_hub_download already placed it in local_dir; ensure final path matches model_path
+    if os.path.abspath(local_cached) != os.path.abspath(model_path):
+        # If HF wrote it to a different name/path, copy/rename
+        import shutil
+        shutil.move(local_cached, model_path)
+
+    print(f"[MODEL] Ready at {model_path}")
+    return model_path
+
 
 def main():
-    # Clean up old TTS files on boot
+    # Clean old TTS files
     cleanup_old_audio(keep_latest=None)
-    # dowload model at startup
+    # Ensure the local model is present (downloads if missing)
     ensure_model()
 
     demo = build_demo()
-    # Don’t set server_name/server_port; HF will handle it.
+    # On HF Spaces, share=True is fine; server host/port are managed by Spaces
     demo.launch(share=True)
 
+
 if __name__ == "__main__":
     main()