Update app.py

app.py

@@ -1,115 +1,91 @@
-import os, pathlib, tempfile, shutil, uuid
 from fastapi import FastAPI, HTTPException, Request
-from fastapi.responses import JSONResponse
-from fastapi.middleware.cors import CORSMiddleware
-from pydantic import BaseModel
+from fastapi.responses import FileResponse
+from pathlib import Path
+import uuid
 import subprocess
+import os
+import shutil
 
-# ----------------------------------
-# CONFIG & PATHS (robust writable base)
-# ----------------------------------
-def _first_writable(candidates):
-    for p in candidates:
-        try:
-            path = pathlib.Path(p).resolve()
-            path.mkdir(parents=True, exist_ok=True)
-            test_file = path / ".write_test"
-            test_file.write_text("ok", encoding="utf-8")
-            test_file.unlink(missing_ok=True)
-            return path
-        except Exception:
-            continue
-    fallback = pathlib.Path(tempfile.gettempdir()) / "tts_app"
-    fallback.mkdir(parents=True, exist_ok=True)
-    return fallback.resolve()
+app = FastAPI()
 
-_env_base = os.environ.get("TTS_BASE_DIR", "").strip()
-_candidates = []
-if _env_base:
-    _candidates.append(_env_base)
-_candidates += ["/data/tts_app", "/tmp/tts_app", "/home/user/tts_app"]
+# ========== Dynamic VOICES_DIR fix ==========
+# Try /tmp/tts_app/voices first
+base_dirs = [Path("/tmp/tts_app/voices"), Path("/data/voices"), Path("/home/user/voices"), Path.cwd() / "voices"]
 
-BASE_DIR = _first_writable(_candidates)
-FILES_DIR = BASE_DIR / "files"
-VOICES_DIR = BASE_DIR / "voices"
-FILES_DIR.mkdir(parents=True, exist_ok=True)
-VOICES_DIR.mkdir(parents=True, exist_ok=True)
+for path in base_dirs:
+    try:
+        path.mkdir(parents=True, exist_ok=True)
+        test_file = path / ".write_test"
+        test_file.write_text("ok")
+        test_file.unlink()
+        VOICES_DIR = path
+        break
+    except Exception:
+        continue
+else:
+    raise RuntimeError("❌ Could not find any writable directory for VOICES_DIR.")
 
-# ----------------------------------
-# FASTAPI SETUP
-# ----------------------------------
-app = FastAPI()
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"],
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
+FILES_DIR = VOICES_DIR.parent / "files"
+FILES_DIR.mkdir(parents=True, exist_ok=True)
 
-# ----------------------------------
-# UTILITIES
-# ----------------------------------
-class TTSRequest(BaseModel):
-    text: str
-    voice: str = "en_US-libritts-high"
-    length_scale: float = 1.0
-    noise_scale: float = 0.33
-    noise_w: float = 0.8
+# ========== Piper engine config ==========
+VOICE_TAGS = [
+    "en_US-libritts-high",   # Humanlike, CPU-friendly (VITS-based)
+    "en_US-amy-medium",      # Classic Piper Amy
+    "en_US-lessac-high",     # LJSpeech-derived VITS
+]
 
 @app.get("/health")
 def health():
     return {
         "ok": True,
         "engine": "piper-tts (CLI, CPU)",
-        "default_voice": None,
         "voice_dir": str(VOICES_DIR),
-        "available_voices": sorted([v.name for v in VOICES_DIR.glob("/*.onnx")]),
         "files_dir": str(FILES_DIR),
+        "default_voice": None,
+        "available_voices": VOICE_TAGS,
     }
 
 @app.post("/speak")
-def speak(body: TTSRequest):
-    if not body.text.strip():
-        raise HTTPException(status_code=400, detail="Empty text")
-
-    text_id = str(uuid.uuid4())[:8]
-    txt_path = FILES_DIR / f"{text_id}.txt"
-    wav_path = FILES_DIR / f"{text_id}.wav"
+async def speak(request: Request):
+    try:
+        payload = await request.json()
+        text = payload.get("text", "").strip()
+        voice = payload.get("voice", VOICE_TAGS[0])
+        length_scale = float(payload.get("length_scale", 1.08))
+        noise_scale = float(payload.get("noise_scale", 0.33))
+        noise_w = float(payload.get("noise_w", 0.8))
 
-    txt_path.write_text(body.text.strip(), encoding="utf-8")
+        if not text:
+            raise HTTPException(status_code=400, detail="No text provided")
 
-    # --------------------------
-    # Run piper
-    # --------------------------
-    voice = body.voice
-    voice_path = VOICES_DIR / voice / "model.onnx"
-    if not voice_path.exists():
-        return JSONResponse(content={"ok": False, "error": f"Voice not found: {voice}"})
+        output_file = FILES_DIR / f"{uuid.uuid4().hex}.wav"
+        command = [
+            "piper",
+            "--model", f"voices/{voice}.onnx",
+            "--output_file", str(output_file),
+            "--text", text,
+            "--length_scale", str(length_scale),
+            "--noise_scale", str(noise_scale),
+            "--noise_w", str(noise_w),
+        ]
 
-    cmd = [
-        "piper",
-        "--model", str(voice_path),
-        "--output_file", str(wav_path),
-        "--length_scale", str(body.length_scale),
-        "--noise_scale", str(body.noise_scale),
-        "--noise_w", str(body.noise_w),
-    ]
+        result = subprocess.run(command, capture_output=True, text=True)
+        if result.returncode != 0 or not output_file.exists():
+            raise HTTPException(status_code=500, detail=f"TTS failed: {result.stderr.strip()}")
 
-    try:
-        with open(txt_path, "r", encoding="utf-8") as f:
-            subprocess.run(cmd, stdin=f, check=True)
-    except subprocess.CalledProcessError as e:
-        return JSONResponse(content={"ok": False, "error": str(e)})
+        return {
+            "ok": True,
+            "voice": voice,
+            "audio_url": f"/file/{output_file.name}"
+        }
 
-    return {
-        "ok": True,
-        "audio_url": f"/files/{wav_path.name}",
-    }
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
 
-@app.get("/files/{filename}")
-def get_file(filename: str):
-    f = FILES_DIR / filename
-    if not f.exists():
-        raise HTTPException(status_code=404, detail="File not found")
-    return JSONResponse(content={"url": f"/files/{filename}"})
+@app.get("/file/{filename}")
+async def get_file(filename: str):
+    path = FILES_DIR / filename
+    if path.exists():
+        return FileResponse(path)
+    raise HTTPException(status_code=404, detail="File not found")