Update app.py

app.py

@@ -1,31 +1,52 @@
-import os
 import builtins
+import os
+
+# ==========================================================
+# 🔴 第一步：最高优先级！必须在所有库导入之前执行
+# ==========================================================
+# 1. 强行让所有库的 input 调用失效并默认返回 "y"
+builtins.input = lambda prompt="": "y"
+
+# 2. 强制设置数据目录环境变量
+os.environ["GENIE_DATA_DIR"] = "/app/GenieData"
+
+# 3. 阻塞式执行下载，确保 genie_tts 导入时资源已就位
+from huggingface_hub import snapshot_download
+if not os.path.exists("/app/GenieData/G2P"):
+    print("📦 [Wait] Downloading core assets before library initialization...")
+    snapshot_download(
+        repo_id="High-Logic/Genie", 
+        allow_patterns=["GenieData/*"], 
+        local_dir="/app",
+        local_dir_use_symlinks=False
+    )
+    print("✅ [Ready] Assets downloaded.")
+
+# ==========================================================
+# 🔴 第二步：资源就位后，再进行第三方库导入
+# ==========================================================
 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
-
-# --- 初期化屏蔽 ---
-builtins.input = lambda prompt="": "y"
-os.environ["GENIE_DATA_DIR"] = "/app/GenieData"
 
-# 下载权重
-if not os.path.exists("/app/GenieData/G2P"):
-    snapshot_download(repo_id="High-Logic/Genie", allow_patterns=["GenieData/*"], local_dir="/app", local_dir_use_symlinks=False)
+# 此时导入 genie_tts 是安全的，因为它会发现文件已存在
+import genie_tts
 
+# ==========================================================
+# 🔴 第三步：服务器逻辑 (方案 B)
+# ==========================================================
 app = FastAPI()
 
-# 默认参考设定 (云端原始琴团长)
+# 琴团长原始配置
 DEFAULT_REF_PATH = "/app/ref.wav"
 DEFAULT_REF_TEXT = "琴是个称职的好团长。看到她认真工作的样子，就连我也忍不住想要多帮她一把。"
 
-print("⚡ Starting Engine...")
+print("⚡ Starting Genie Engine...")
 genie_tts.load_character("Default", "/app", "zh")
 
-# 🟢 端点 1：上传并立刻合成 (且不干扰默认值)
+# 🟢 逻辑：收到新音频则使用并覆盖，完成后不清理（由下一次请求决定是否重置）
 @app.post("/upload_and_tts")
 async def upload_and_tts(
     prompt_text: str = Form(...),
@@ -34,37 +55,35 @@ async def upload_and_tts(
     file: UploadFile = File(...)
 ):
     try:
-        # 1. 保存临时上传的音频
-        temp_ref = f"/app/temp_upload_ref.wav"
-        with open(temp_ref, "wb") as buffer:
+        # 1. 保存临时音频
+        save_path = f"/app/uploaded_temp.wav"
+        with open(save_path, "wb") as buffer:
             shutil.copyfileobj(file.file, buffer)
         
-        # 2. 设置本次参考
-        genie_tts.set_reference_audio("Default", temp_ref, prompt_text, language)
+        # 2. 本次任务：使用新音频
+        print(f"🔥 [Custom] Using new audio for this request.")
+        genie_tts.set_reference_audio("Default", save_path, 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")
+        # 3. 推理
+        out_path = "/app/out_custom.wav"
+        genie_tts.tts("Default", text, save_path=out_path, play=False)
+        return StreamingResponse(open(out_path, "rb"), media_type="audio/wav")
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
-# 🟢 端点 2：普通 TTS (强制回归原始琴团长)
+# 🟢 逻辑：标准 TTS 请求，强制重置回云端原声
 @app.post("/tts")
 async def safe_tts(data: dict):
-    text = data.get("text", "")
-    print(f"🔄 Safety Check: Forcing reset to original Qin voice...")
+    target_text = data.get("text", "")
+    print(f"🛡️ [Reset] Forcing back to original Qin voice.")
     
     try:
-        # 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)
-        
-        return StreamingResponse(open(temp_out, "rb"), media_type="audio/wav")
+        out_path = "/app/out_standard.wav"
+        genie_tts.tts("Default", target_text, save_path=out_path, play=False)
+        return StreamingResponse(open(out_path, "rb"), media_type="audio/wav")
     except Exception as e:
         raise HTTPException(status_code=404, detail=str(e))