Update app.py

app.py

@@ -1,7 +1,7 @@
 import os
 import sys
-import shutil
 import requests
+import shutil
 
 # ==========================================
 # 1. 基础环境净化
@@ -16,61 +16,56 @@ torch.nn.Module.cuda = no_op
 print("💉 CUDA 已屏蔽")
 
 # ==========================================
-# 2. 焦土战术：全盘覆盖 + 清理缓存
+# 2. 核心补丁：补全 CPU 缺失文件
 # ==========================================
-print("🔥 启动焦土战术...")
-
-# 1. 下载官方 CPU 代码
-CPU_CODE_URL = "https://raw.githubusercontent.com/RVC-Boss/GPT-SoVITS/main/GPT_SoVITS/AR/models/t2s_model.py"
-try:
-    print("⬇️ 下载 CPU 源码...")
-    code_resp = requests.get(CPU_CODE_URL, timeout=10)
-    if code_resp.status_code != 200:
-        raise Exception("下载失败")
-    cpu_code = code_resp.text
-    print("✅ CPU 源码下载完成")
-except Exception as e:
-    print(f"❌ 源码下载失败: {e}")
-    # 备用方案：写入一段最小化的 Mock 代码，防止崩溃
-    cpu_code = "class Text2SemanticDecoder: pass\nprint('⚠️ 使用了 Mock Decoder')"
-
-# 2. 地毯式搜索并覆盖
-target_name = "t2s_model_flash_attn.py"
-hit_count = 0
-
-for root, dirs, files in os.walk("."):
-    # A. 清理缓存 (防止尸变)
-    if "__pycache__" in dirs:
-        cache_path = os.path.join(root, "__pycache__")
-        try:
-            shutil.rmtree(cache_path)
-            print(f"🧹 已清理缓存: {cache_path}")
-        except: pass
-
-    # B. 覆盖文件 (狡兔三窟，全部堵死)
-    if target_name in files:
-        full_path = os.path.join(root, target_name)
-        try:
-            with open(full_path, "w", encoding="utf-8") as f:
-                f.write(cpu_code)
-            hit_count += 1
-            print(f"🎯 [HIT] 已覆盖毒瘤文件: {full_path}")
+print("🏗️ 启动依赖补全计划...")
+
+FILES_TO_PATCH = [
+    {
+        "url": "https://raw.githubusercontent.com/RVC-Boss/GPT-SoVITS/main/GPT_SoVITS/AR/models/t2s_model.py",
+        "path": "AR/models/t2s_model_flash_attn.py", # 覆盖目标
+        "desc": "模型主文件 (CPU替换GPU)"
+    },
+    {
+        "url": "https://raw.githubusercontent.com/RVC-Boss/GPT-SoVITS/main/GPT_SoVITS/AR/models/utils.py",
+        "path": "AR/models/utils.py",
+        "desc": "工具库 (Utils)"
+    },
+    {
+        "url": "https://raw.githubusercontent.com/RVC-Boss/GPT-SoVITS/main/GPT_SoVITS/AR/modules/embedding.py",
+        "path": "AR/modules/embedding.py",
+        "desc": "嵌入层 (Embedding)"
+    }
+]
+
+for item in FILES_TO_PATCH:
+    try:
+        # 1. 确保目录存在
+        dir_name = os.path.dirname(item["path"])
+        if not os.path.exists(dir_name):
+            os.makedirs(dir_name, exist_ok=True)
+            print(f"📁 创建目录: {dir_name}")
+            
+            # 补一个 __init__.py 确保可导入
+            with open(os.path.join(dir_name, "__init__.py"), "w") as f: f.write("")
+
+        # 2. 下载文件
+        print(f"⬇️ 下载 {item['desc']} ...")
+        resp = requests.get(item["url"], timeout=10)
+        if resp.status_code == 200:
+            # 3. 写入文件
+            with open(item["path"], "w", encoding="utf-8") as f:
+                f.write(resp.text)
+            print(f"✅ 写入成功: {item['path']}")
+        else:
+            print(f"❌ 下载失败 {item['url']}: {resp.status_code}")
             
-            # C. 立即验尸 (确认文件内容已变)
-            with open(full_path, "r") as f:
-                head = f.read(100)
-            if "flash_attn" in head:
-                print("❌ 警告：文件似乎未被成功修改！")
-            else:
-                print("✅ 验证通过：文件头已变为 CPU 代码。")
-                
-        except Exception as e:
-            print(f"❌ 覆盖失败 {full_path}: {e}")
-
-if hit_count == 0:
-    print("⚠️ 警告：全盘扫描未发现目标文件！")
-else:
-    print(f"🎉 共处理了 {hit_count} 个文件，清理了所有缓存。")
+    except Exception as e:
+        print(f"⚠️ 处理 {item['path']} 时出错: {e}")
+
+# 补充根目录 AR 的 __init__.py
+if os.path.exists("AR") and not os.path.exists("AR/__init__.py"):
+    with open("AR/__init__.py", "w") as f: f.write("")
 
 # ==========================================
 # 3. 导入核心逻辑
@@ -80,8 +75,10 @@ sys.path.append(os.getcwd())
 try:
     import inference_webui as core
     print("✅ 成功导入 inference_webui")
+    
     if hasattr(core, "is_half"): core.is_half = False
     if hasattr(core, "device"): core.device = "cpu"
+        
 except Exception as e:
     print(f"❌ 导入失败: {e}")
     sys.exit(1)
@@ -111,7 +108,7 @@ try:
             core.change_gpt_weights(gpt_path=gpt_path)
         if hasattr(core, "change_sovits_weights"):
             core.change_sovits_weights(sovits_path=sovits_path)
-        print(f"🎉 模型加载成功！(CPU Mode)")
+        print(f"🎉 模型加载成功！(CPU Full Patch)")
     else:
         print("❌ 未找到模型文件")
 except Exception as e:
@@ -163,13 +160,16 @@ def run_predict(text):
 # 7. 界面
 # ==========================================
 with gr.Blocks() as app:
-    gr.Markdown(f"### GPT-SoVITS V2 (Scorched Earth Policy)")
+    gr.Markdown(f"### GPT-SoVITS V2 (CPU Full Repair)")
+    
     with gr.Row():
-        inp = gr.Textbox(label="文本", value="别报错了，求求了。")
+        inp = gr.Textbox(label="文本", value="这下真的真的真的要成功了。")
         btn = gr.Button("生成")
+    
     with gr.Row():
         out = gr.Audio(label="结果")
         log = gr.Textbox(label="日志")
+        
     btn.click(run_predict, [inp], [out, log], api_name="predict")
 
 if __name__ == "__main__":