Update app.py

app.py

@@ -1,26 +1,38 @@
 import builtins
 import os
 import shutil
+import io
+import uvicorn
+from fastapi import FastAPI, UploadFile, File, Form, HTTPException
+from fastapi.responses import StreamingResponse
+import genie_tts
+from huggingface_hub import snapshot_download
 
-# 1. 劫持 input 防止崩溃
+# 1. 劫持交互式输入，防止部署卡死
 builtins.input = lambda prompt="": "y"
 
-# 2. 设置环境
+# 2. 环境变量设置
 os.environ["GENIE_DATA_DIR"] = "/app/GenieData"
 
-# 3. 手动下载权重
-from huggingface_hub import snapshot_download
+# 3. 手动下载核心权重（G2P, HuBERT 等）
 if not os.path.exists("/app/GenieData/G2P"):
     print("📦 Downloading GenieData Dependencies...")
-    snapshot_download(repo_id="High-Logic/Genie", allow_patterns=["GenieData/*"], local_dir="/app", local_dir_use_symlinks=False)
+    snapshot_download(
+        repo_id="High-Logic/Genie", 
+        allow_patterns=["GenieData/*"], 
+        local_dir="/app",
+        local_dir_use_symlinks=False
+    )
 
-# 4. 导入库
-from fastapi import UploadFile, File, Form
-import genie_tts
-from genie_tts.Server import app as genie_app
+# 创建独立的 FastAPI 应用
+app = FastAPI(title="Genie-TTS Custom Server")
+
+# 启动时预载角色模型
+print("⚡ Loading Default Character...")
+genie_tts.load_character("Default", "/app", "zh")
 
-# --- 核心：上传并设置参考音频 ---
-@genie_app.post("/upload_and_set")
+# 自定义上传并设置端点
+@app.post("/upload_and_set")
 async def upload_and_set(
     character_name: str = Form("Default"),
     prompt_text: str = Form(...),
@@ -28,7 +40,6 @@ async def upload_and_set(
     file: UploadFile = File(...)
 ):
     char_name = character_name.capitalize()
-    # 存放在固定位置
     save_path = f"/app/uploaded_ref.wav"
     
     with open(save_path, "wb") as buffer:
@@ -36,24 +47,40 @@ async def upload_and_set(
     
     print(f"🔄 Setting reference audio for {char_name}: {prompt_text}")
     try:
-        # 🟢 调用官方顶级 API，这是最稳妥的
         genie_tts.set_reference_audio(char_name, save_path, prompt_text, language)
         return {"message": f"Successfully updated style for {char_name}"}
     except Exception as e:
         print(f"❌ Error: {e}")
-        return {"error": str(e)}, 500
+        raise HTTPException(status_code=500, detail=str(e))
 
-# --- 极简调试：只看当前角色状态 ---
-@genie_app.get("/status")
-async def status():
-    return {"status": "ok", "engine": "Genie-TTS V2 Pro Plus"}
-
-if __name__ == "__main__":
-    # 启动前先预载角色模型
+# 手动接管 TTS 合成逻辑
+@app.post("/tts")
+async def tts_endpoint(data: dict):
+    char_name = data.get("character_name", "Default").capitalize()
+    text = data.get("text", "")
+    
+    print(f"🎙️ Generating TTS for {char_name}: {text[:20]}...")
+    
     try:
-        genie_tts.load_character("Default", "/app", "zh")
+        temp_out = "/app/temp_tts_out.wav"
+        # 直接调用推理核心
+        genie_tts.tts(
+            character_name=char_name,
+            text=text,
+            save_path=temp_out,
+            play=False
+        )
+        
+        if os.path.exists(temp_out):
+            with open(temp_out, "rb") as f:
+                return StreamingResponse(io.BytesIO(f.read()), media_type="audio/wav")
+        else:
+            raise Exception("Generated file not found")
+            
     except Exception as e:
-        print(f"Initial load error: {e}")
+        print(f"❌ TTS Error: {e}")
+        raise HTTPException(status_code=404, detail=str(e))
 
-    # 启动 FastAPI 服务 (HF Space 固定 7860)
-    genie_tts.start_server(host="0.0.0.0", port=7860)
+if __name__ == "__main__":
+    # 在 Space 要求的 7860 端口启动
+    uvicorn.run(app, host="0.0.0.0", port=7860)