Update app.py

app.py

@@ -2,80 +2,71 @@ import os
 import builtins
 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
 
-# 🔴 最高优先级：在任何其他 import 之前直接劫持！
+# --- 初期化屏蔽 ---
 builtins.input = lambda prompt="": "y"
 os.environ["GENIE_DATA_DIR"] = "/app/GenieData"
 
-# 🟢 关键：先下载，下载完之前不许往下走
-from huggingface_hub import snapshot_download
+# 下载权重
 if not os.path.exists("/app/GenieData/G2P"):
-    print("📦 Booting: Downloading weights...")
-    snapshot_download(
-        repo_id="High-Logic/Genie", 
-        allow_patterns=["GenieData/*"], 
-        local_dir="/app",
-        local_dir_use_symlinks=False
-    )
-    print("✅ Booting: Weights ready.")
-
-# 现在才允许导入其他库
-import uvicorn
-from fastapi import FastAPI, UploadFile, File, Form, HTTPException
-from fastapi.responses import StreamingResponse
-from fastapi.concurrency import run_in_threadpool
-import genie_tts
+    snapshot_download(repo_id="High-Logic/Genie", allow_patterns=["GenieData/*"], local_dir="/app", local_dir_use_symlinks=False)
 
 app = FastAPI()
 
-# 启动后再预载入模型
-print("⚡ Warming up model...")
-try:
-    genie_tts.load_character("Default", "/app", "zh")
-except:
-    pass
+# 默认参考设定 (云端原始琴团长)
+DEFAULT_REF_PATH = "/app/ref.wav"
+DEFAULT_REF_TEXT = "琴是个称职的好团长。看到她认真工作的样子，就连我也忍不住想要多帮她一把。"
 
-@app.post("/upload_and_set")
-async def upload_and_set(
-    character_name: str = Form("Default"),
+print("⚡ Starting Engine...")
+genie_tts.load_character("Default", "/app", "zh")
+
+# 🟢 端点 1：上传并立刻合成 (且不干扰默认值)
+@app.post("/upload_and_tts")
+async def upload_and_tts(
     prompt_text: str = Form(...),
+    text: str = Form(...),
     language: str = Form("zh"),
     file: UploadFile = File(...)
 ):
-    char_name = character_name.capitalize()
-    save_path = f"/app/uploaded_ref.wav"
-    with open(save_path, "wb") as b:
-        shutil.copyfileobj(file.file, b)
-    
     try:
-        await run_in_threadpool(genie_tts.set_reference_audio, char_name, save_path, prompt_text, language)
-        return {"message": "Style updated"}
+        # 1. 保存临时上传的音频
+        temp_ref = f"/app/temp_upload_ref.wav"
+        with open(temp_ref, "wb") as buffer:
+            shutil.copyfileobj(file.file, buffer)
+        
+        # 2. 设置本次参考
+        genie_tts.set_reference_audio("Default", temp_ref, prompt_text, language)
+        
+        # 3. 推理合成
+        temp_out = "/app/temp_out.wav"
+        genie_tts.tts("Default", text, save_path=temp_out, play=False)
+        
+        return StreamingResponse(open(temp_out, "rb"), media_type="audio/wav")
     except Exception as e:
-        return {"error": str(e)}, 500
+        raise HTTPException(status_code=500, detail=str(e))
 
+# 🟢 端点 2：普通 TTS (强制回归原始琴团长)
 @app.post("/tts")
-async def tts_endpoint(data: dict):
-    char_name = data.get("character_name", "Default").capitalize()
+async def safe_tts(data: dict):
     text = data.get("text", "")
+    print(f"🔄 Safety Check: Forcing reset to original Qin voice...")
     
     try:
-        temp_out = "/app/temp_tts.wav"
-        await run_in_threadpool(
-            genie_tts.tts,
-            character_name=char_name,
-            text=text,
-            save_path=temp_out,
-            play=False
-        )
+        # 1. 强制重置回云端内置的 ref.wav
+        genie_tts.set_reference_audio("Default", DEFAULT_REF_PATH, DEFAULT_REF_TEXT, "zh")
+        
+        # 2. 推理合成
+        temp_out = "/app/temp_std_out.wav"
+        genie_tts.tts("Default", text, save_path=temp_out, play=False)
         
-        if os.path.exists(temp_out):
-            with open(temp_out, "rb") as f:
-                content = f.read()
-            return StreamingResponse(io.BytesIO(content), media_type="audio/wav")
-        raise Exception("Inference failed")
-            
+        return StreamingResponse(open(temp_out, "rb"), media_type="audio/wav")
     except Exception as e:
-        return {"detail": str(e)}, 400
+        raise HTTPException(status_code=404, detail=str(e))
 
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)