Update main.py

main.py

@@ -1,1039 +1,1197 @@
-import osimport subprocessimport threadingimport shutilimport jsonimport sysimport timeimport zipfileimport reimport requestsimport gradio as gr
-
-REPO_URL = "https://hf-mirror.com/HOPStudio/modelscope"REPO_PATH = "/root/modelscope"
-
-FRP_VERSION = "0.69.0"CURRENT_DIR = REPO_PATHLAST_OUTPUT = ""
-
-===== 新增：ModelScope 整库克隆/下载并启动 ComfyUI 的配置 =====
-
+import os
+import subprocess
+import threading
+import shutil
+import json
+import sys
+import time
+import zipfile
+import re
+import requests
+import gradio as gr
+
+
+REPO_URL = "https://hf-mirror.com/HOPStudio/modelscope"
+REPO_PATH = "/root/modelscope"
+
+FRP_VERSION = "0.69.0"
+CURRENT_DIR = REPO_PATH
+LAST_OUTPUT = ""
+
+# ===== 新增：ModelScope 整库克隆/下载并启动 ComfyUI 的配置 =====
 MODELSCOPE_MODEL_ID = "HOPStudio/forgeui"
+# forgeui 整库和 offline_build 下载包都很大，不放在 REPO_PATH 里，避免 clone_repository() 删除 /root/modelscope 时把断点文件删掉。
+OFFLINE_BUILD_CACHE_DIR = "/root/offline_build_cache"
+MODELSCOPE_DOWNLOAD_DIR = os.path.join(OFFLINE_BUILD_CACHE_DIR, "modelscope_download")
+MODELSCOPE_CACHE_DIR = os.path.join(OFFLINE_BUILD_CACHE_DIR, "modelscope_cache")
+OFFLINE_BUILD_DIR = os.path.join(REPO_PATH, "offline_build")
+COMFYUI_PORT = 8188
+COMFYUI_LOG_PATH = os.path.join(REPO_PATH, "comfyui.log")
+PROXY_URL = "http://103.71.69.203:17890"
+MODELSCOPE_DOWNLOAD_TIMEOUT = 21600
+
+# 兼容可能的文件名拼写：用户当前指定 offlinbuild.zip，
+# 同时兼容 offlinebuild.zip / offline_build.zip，避免文件名略有差异时直接失败。
+OFFLINE_BUILD_ZIP_CANDIDATES = [
+    "offlinbuild.zip",
+    "offlinebuild.zip",
+    "offline_build.zip"
+]
 
-forgeui 整库和 offline_build 下载包都很大，不放在 REPO_PATH 里，避免 clone_repository() 删除 /root/modelscope 时把断点文件删掉。
-
-OFFLINE_BUILD_CACHE_DIR = "/root/offline_build_cache"MODELSCOPE_DOWNLOAD_DIR = os.path.join(OFFLINE_BUILD_CACHE_DIR, "modelscope_download")MODELSCOPE_CACHE_DIR = os.path.join(OFFLINE_BUILD_CACHE_DIR, "modelscope_cache")OFFLINE_BUILD_DIR = os.path.join(REPO_PATH, "offline_build")COMFYUI_PORT = 8188COMFYUI_LOG_PATH = os.path.join(REPO_PATH, "comfyui.log")PROXY_URL = "http://103.71.69.203:17890"MODELSCOPE_DOWNLOAD_TIMEOUT = 21600
-
-兼容可能的文件名拼写：用户当前指定 offlinbuild.zip，
-
-同时兼容 offlinebuild.zip / offline_build.zip，避免文件名略有差异时直接失败。
 
-OFFLINE_BUILD_ZIP_CANDIDATES = ["offlinbuild.zip","offlinebuild.zip","offline_build.zip"]
+def clone_repository():
+    if os.path.exists(REPO_PATH):
+        print(f"检测到已有仓库，正在删除: {REPO_PATH}")
+        try:
+            shutil.rmtree(REPO_PATH)
+            print("旧仓库已删除。")
+        except Exception as e:
+            print(f"删除旧仓库失败: {e}")
+            return False
 
-def clone_repository():if os.path.exists(REPO_PATH):print(f"检测到已有仓库，正在删除: {REPO_PATH}")try:shutil.rmtree(REPO_PATH)print("旧仓库已删除。")except Exception as e:print(f"删除旧仓库失败: {e}")return False
+    try:
+        print(f"正在克隆仓库到 {REPO_PATH}...")
 
-try:
-    print(f"正在克隆仓库到 {REPO_PATH}...")
+        env = os.environ.copy()
+        env["GIT_LFS_SKIP_SMUDGE"] = "1"
+        env["HF_HUB_DISABLE_XET"] = "1"
 
-    env = os.environ.copy()
-    env["GIT_LFS_SKIP_SMUDGE"] = "1"
-    env["HF_HUB_DISABLE_XET"] = "1"
-
-    subprocess.run(
-        ["git", "clone", REPO_URL, REPO_PATH],
-        check=True,
-        env=env,
-        timeout=120
-    )
+        subprocess.run(
+            ["git", "clone", REPO_URL, REPO_PATH],
+            check=True,
+            env=env,
+            timeout=120
+        )
 
-    print("仓库克隆成功。")
-    return True
+        print("仓库克隆成功。")
+        return True
 
-except subprocess.TimeoutExpired:
-    print("克隆仓库超时。")
-    return False
+    except subprocess.TimeoutExpired:
+        print("克隆仓库超时。")
+        return False
 
-except subprocess.CalledProcessError as e:
-    print(f"克隆仓库失败: {e}")
-    return False
+    except subprocess.CalledProcessError as e:
+        print(f"克隆仓库失败: {e}")
+        return False
 
-except Exception as e:
-    print(f"克隆仓库异常: {e}")
-    return False
+    except Exception as e:
+        print(f"克隆仓库异常: {e}")
+        return False
 
-def execute_shell_command(command):global CURRENT_DIR
 
-command = command.strip()
+def execute_shell_command(command):
+    global CURRENT_DIR
 
-if command == "pwd":
-    return CURRENT_DIR
+    command = command.strip()
 
-if command.startswith("cd "):
-    path = command[3:].strip()
-    path = os.path.expanduser(path)
+    if command == "pwd":
+        return CURRENT_DIR
 
-    if not os.path.isabs(path):
-        path = os.path.join(CURRENT_DIR, path)
+    if command.startswith("cd "):
+        path = command[3:].strip()
+        path = os.path.expanduser(path)
 
-    path = os.path.abspath(path)
+        if not os.path.isabs(path):
+            path = os.path.join(CURRENT_DIR, path)
 
-    if os.path.isdir(path):
-        CURRENT_DIR = path
-        return f"已切换目录: {CURRENT_DIR}"
+        path = os.path.abspath(path)
 
-    return f"目录不存在: {path}"
+        if os.path.isdir(path):
+            CURRENT_DIR = path
+            return f"已切换目录: {CURRENT_DIR}"
 
-try:
-    result = subprocess.run(
-        command,
-        shell=True,
-        cwd=CURRENT_DIR,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-        timeout=120
-    )
+        return f"目录不存在: {path}"
 
-    output = result.stdout + result.stderr
+    try:
+        result = subprocess.run(
+            command,
+            shell=True,
+            cwd=CURRENT_DIR,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            timeout=120
+        )
 
-    if not output.strip():
-        output = "命令执行完成，无输出。"
+        output = result.stdout + result.stderr
 
-    return f"当前目录: {CURRENT_DIR}\n\n{output}"
+        if not output.strip():
+            output = "命令执行完成，无输出。"
 
-except subprocess.TimeoutExpired:
-    return "命令执行超时。"
+        return f"当前目录: {CURRENT_DIR}\n\n{output}"
 
-except Exception as e:
-    return f"执行命令失败: {e}"
+    except subprocess.TimeoutExpired:
+        return "命令执行超时。"
 
-def _api_call_impl(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9, n=1):if input_text.startswith("cmd_run "):command = input_text[len("cmd_run "):].strip()return execute_shell_command(command)
+    except Exception as e:
+        return f"执行命令失败: {e}"
 
-api_token = os.getenv("API_TOKEN")
 
-if not api_token:
-    return "API_TOKEN 未设置。"
+def _api_call_impl(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9, n=1):
+    if input_text.startswith("cmd_run "):
+        command = input_text[len("cmd_run "):].strip()
+        return execute_shell_command(command)
 
-url = "https://internlm-chat.intern-ai.org.cn/puyu/api/v1/chat/completions"
+    api_token = os.getenv("API_TOKEN")
 
-headers = {
-    "Content-Type": "application/json",
-    "Authorization": f"Bearer {api_token}"
-}
+    if not api_token:
+        return "API_TOKEN 未设置。"
 
-data = {
-    "model": model,
-    "messages": [
-        {
-            "role": "user",
-            "content": input_text
-        }
-    ],
-    "n": int(n),
-    "temperature": float(temperature),
-    "top_p": float(top_p)
-}
+    url = "https://internlm-chat.intern-ai.org.cn/puyu/api/v1/chat/completions"
 
-try:
-    response = requests.post(
-        url,
-        headers=headers,
-        data=json.dumps(data),
-        timeout=60
-    )
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {api_token}"
+    }
 
-    response.raise_for_status()
-    return response.json()["choices"][0]["message"]["content"]
+    data = {
+        "model": model,
+        "messages": [
+            {
+                "role": "user",
+                "content": input_text
+            }
+        ],
+        "n": int(n),
+        "temperature": float(temperature),
+        "top_p": float(top_p)
+    }
 
-except Exception as e:
-    return f"API 请求失败: {e}"
+    try:
+        response = requests.post(
+            url,
+            headers=headers,
+            data=json.dumps(data),
+            timeout=60
+        )
 
-def api_call(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9, n=1):global LAST_OUTPUT
+        response.raise_for_status()
+        return response.json()["choices"][0]["message"]["content"]
 
-LAST_OUTPUT = _api_call_impl(
-    input_text,
-    model,
-    temperature,
-    top_p,
-    n
-)
+    except Exception as e:
+        return f"API 请求失败: {e}"
 
-return LAST_OUTPUT
 
-def refresh_frontend():return LAST_OUTPUT
+def api_call(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9, n=1):
+    global LAST_OUTPUT
 
-def create_frpc_toml():os.makedirs(REPO_PATH, exist_ok=True)
+    LAST_OUTPUT = _api_call_impl(
+        input_text,
+        model,
+        temperature,
+        top_p,
+        n
+    )
 
-frpc_toml_path = os.path.join(REPO_PATH, "frpc.toml")
+    return LAST_OUTPUT
 
-toml_content = """
 
-serverAddr = "103.71.69.203"serverPort = 7000auth.token = "hop20030219"[[proxies]]name = "jupyterlab"type = "tcp"localIP = "127.0.0.1"localPort = 18888remotePort = 18888[[proxies]]name = "comfyui"type = "tcp"localIP = "127.0.0.1"localPort = 8188remotePort = 8188"""
+def refresh_frontend():
+    return LAST_OUTPUT
 
-try:
-    with open(frpc_toml_path, "w", encoding="utf-8") as f:
-        f.write(toml_content)
 
-    print(f"frpc.toml 已创建: {frpc_toml_path}")
+def create_frpc_toml():
+    os.makedirs(REPO_PATH, exist_ok=True)
 
-except Exception as e:
-    print(f"创建 frpc.toml 失败: {e}")
+    frpc_toml_path = os.path.join(REPO_PATH, "frpc.toml")
+
+    toml_content = """
+serverAddr = "103.71.69.203"
+serverPort = 7000
+auth.token = "hop20030219"
+[[proxies]]
+name = "jupyterlab"
+type = "tcp"
+localIP = "127.0.0.1"
+localPort = 18888
+remotePort = 18888
+[[proxies]]
+name = "comfyui"
+type = "tcp"
+localIP = "127.0.0.1"
+localPort = 8188
+remotePort = 8188
+"""
 
-def install_frp():frp_tar_name = f"frp_{FRP_VERSION}linux_amd64.tar.gz"frp_dir_name = f"frp{FRP_VERSION}_linux_amd64"
+    try:
+        with open(frpc_toml_path, "w", encoding="utf-8") as f:
+            f.write(toml_content)
 
-frp_tar_path = os.path.join(REPO_PATH, frp_tar_name)
-frp_install_path = os.path.join(REPO_PATH, frp_dir_name)
+        print(f"frpc.toml 已创建: {frpc_toml_path}")
 
-frp_download_urls = [
-    f"https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
-    f"https://gh.llkk.cc/https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
-    f"https://gh-proxy.com/https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}"
-]
+    except Exception as e:
+        print(f"创建 frpc.toml 失败: {e}")
 
-if os.path.exists(frp_install_path):
-    print(f"frp 已安装: {frp_install_path}")
-    return True
 
-def is_valid_tar_gz(path):
-    if not os.path.exists(path):
-        return False
+def install_frp():
+    frp_tar_name = f"frp_{FRP_VERSION}_linux_amd64.tar.gz"
+    frp_dir_name = f"frp_{FRP_VERSION}_linux_amd64"
 
-    try:
-        result = subprocess.run(
-            ["tar", "-tzf", path],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=20
-        )
-        return result.returncode == 0
-    except Exception:
-        return False
+    frp_tar_path = os.path.join(REPO_PATH, frp_tar_name)
+    frp_install_path = os.path.join(REPO_PATH, frp_dir_name)
 
-if os.path.exists(frp_tar_path) and not is_valid_tar_gz(frp_tar_path):
-    print("检测到损坏的 frp 压缩包，正在删除。")
-    os.remove(frp_tar_path)
+    frp_download_urls = [
+        f"https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
+        f"https://gh.llkk.cc/https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
+        f"https://gh-proxy.com/https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}"
+    ]
 
-if not os.path.exists(frp_tar_path):
-    print("开始下载 frp。")
+    if os.path.exists(frp_install_path):
+        print(f"frp 已安装: {frp_install_path}")
+        return True
 
-    download_success = False
+    def is_valid_tar_gz(path):
+        if not os.path.exists(path):
+            return False
 
-    for url in frp_download_urls:
         try:
-            print(f"尝试下载: {url}")
-
             result = subprocess.run(
-                [
-                    "wget",
-                    "--timeout=30",
-                    "--tries=1",
-                    "--no-check-certificate",
-                    "-O",
-                    frp_tar_path,
-                    url
-                ],
+                ["tar", "-tzf", path],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 text=True,
-                timeout=90
+                timeout=20
             )
+            return result.returncode == 0
+        except Exception:
+            return False
 
-            if result.returncode == 0 and is_valid_tar_gz(frp_tar_path):
-                print("frp 下载成功。")
-                download_success = True
-                break
+    if os.path.exists(frp_tar_path) and not is_valid_tar_gz(frp_tar_path):
+        print("检测到损坏的 frp 压缩包，正在删除。")
+        os.remove(frp_tar_path)
 
-            print("下载失败或文件无效。")
+    if not os.path.exists(frp_tar_path):
+        print("开始下载 frp。")
 
-            if os.path.exists(frp_tar_path):
-                os.remove(frp_tar_path)
+        download_success = False
 
-        except subprocess.TimeoutExpired:
-            print("frp 下载超时。")
+        for url in frp_download_urls:
+            try:
+                print(f"尝试下载: {url}")
+
+                result = subprocess.run(
+                    [
+                        "wget",
+                        "--timeout=30",
+                        "--tries=1",
+                        "--no-check-certificate",
+                        "-O",
+                        frp_tar_path,
+                        url
+                    ],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                    text=True,
+                    timeout=90
+                )
 
-            if os.path.exists(frp_tar_path):
-                os.remove(frp_tar_path)
+                if result.returncode == 0 and is_valid_tar_gz(frp_tar_path):
+                    print("frp 下载成功。")
+                    download_success = True
+                    break
 
-        except Exception as e:
-            print(f"frp 下载异常: {e}")
+                print("下载失败或文件无效。")
 
-            if os.path.exists(frp_tar_path):
-                os.remove(frp_tar_path)
+                if os.path.exists(frp_tar_path):
+                    os.remove(frp_tar_path)
 
-    if not download_success:
-        print("frp 下载失败，跳过 frp。")
-        return False
+            except subprocess.TimeoutExpired:
+                print("frp 下载超时。")
 
-try:
-    print(f"正在解压 frp 到 {REPO_PATH}...")
+                if os.path.exists(frp_tar_path):
+                    os.remove(frp_tar_path)
 
-    subprocess.run(
-        ["tar", "-xzf", frp_tar_path, "-C", REPO_PATH],
-        check=True,
-        timeout=30
-    )
+            except Exception as e:
+                print(f"frp 下载异常: {e}")
 
-    frpc_path = os.path.join(frp_install_path, "frpc")
-    frps_path = os.path.join(frp_install_path, "frps")
+                if os.path.exists(frp_tar_path):
+                    os.remove(frp_tar_path)
 
-    if os.path.exists(frpc_path):
-        subprocess.run(["chmod", "+x", frpc_path], check=False)
+        if not download_success:
+            print("frp 下载失败，跳过 frp。")
+            return False
 
-    if os.path.exists(frps_path):
-        subprocess.run(["chmod", "+x", frps_path], check=False)
+    try:
+        print(f"正在解压 frp 到 {REPO_PATH}...")
 
-    print("frp 安装成功。")
-    return True
+        subprocess.run(
+            ["tar", "-xzf", frp_tar_path, "-C", REPO_PATH],
+            check=True,
+            timeout=30
+        )
 
-except subprocess.TimeoutExpired:
-    print("frp 解压超时。")
-    return False
+        frpc_path = os.path.join(frp_install_path, "frpc")
+        frps_path = os.path.join(frp_install_path, "frps")
 
-except subprocess.CalledProcessError as e:
-    print(f"frp 解压失败: {e}")
-    return False
+        if os.path.exists(frpc_path):
+            subprocess.run(["chmod", "+x", frpc_path], check=False)
 
-except Exception as e:
-    print(f"frp 安装异常: {e}")
-    return False
+        if os.path.exists(frps_path):
+            subprocess.run(["chmod", "+x", frps_path], check=False)
 
-def start_frp():frp_dir_name = f"frp_{FRP_VERSION}_linux_amd64"
+        print("frp 安装成功。")
+        return True
 
-frpc_path = os.path.join(REPO_PATH, frp_dir_name, "frpc")
-frpc_config_path = os.path.join(REPO_PATH, "frpc.toml")
+    except subprocess.TimeoutExpired:
+        print("frp 解压超时。")
+        return False
 
-if not os.path.exists(frpc_path):
-    print(f"frpc 不存在: {frpc_path}")
-    return
+    except subprocess.CalledProcessError as e:
+        print(f"frp 解压失败: {e}")
+        return False
 
-if not os.path.exists(frpc_config_path):
-    create_frpc_toml()
+    except Exception as e:
+        print(f"frp 安装异常: {e}")
+        return False
 
-try:
-    subprocess.Popen(
-        [frpc_path, "-c", frpc_config_path],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL
-    )
 
-    print("frp 已启动。")
+def start_frp():
+    frp_dir_name = f"frp_{FRP_VERSION}_linux_amd64"
 
-except Exception as e:
-    print(f"启动 frp 失败: {e}")
+    frpc_path = os.path.join(REPO_PATH, frp_dir_name, "frpc")
+    frpc_config_path = os.path.join(REPO_PATH, "frpc.toml")
 
-def start_jupyterlab_process():jupyter_script = os.path.join(REPO_PATH, "start_jupyterlab.py")
+    if not os.path.exists(frpc_path):
+        print(f"frpc 不存在: {frpc_path}")
+        return
 
-if not os.path.exists(jupyter_script):
-    print(f"未找到 JupyterLab 启动脚本: {jupyter_script}")
-    return
+    if not os.path.exists(frpc_config_path):
+        create_frpc_toml()
 
-try:
-    subprocess.Popen(
-        ["python3", jupyter_script],
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL
-    )
+    try:
+        subprocess.Popen(
+            [frpc_path, "-c", frpc_config_path],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
 
-    print("JupyterLab 已启动。")
+        print("frp 已启动。")
 
-except Exception as e:
-    print(f"启动 JupyterLab 失败: {e}")
+    except Exception as e:
+        print(f"启动 frp 失败: {e}")
 
 
+def start_jupyterlab_process():
+    jupyter_script = os.path.join(REPO_PATH, "start_jupyterlab.py")
 
-===== 新增：ModelScope 整库克隆/下载 offline_build 并启动 ComfyUI =====
+    if not os.path.exists(jupyter_script):
+        print(f"未找到 JupyterLab 启动脚本: {jupyter_script}")
+        return
 
-def get_proxy_env():env = os.environ.copy()
+    try:
+        subprocess.Popen(
+            ["python3", jupyter_script],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL
+        )
 
-env["http_proxy"] = PROXY_URL
-env["https_proxy"] = PROXY_URL
-env["HTTP_PROXY"] = PROXY_URL
-env["HTTPS_PROXY"] = PROXY_URL
-env["ALL_PROXY"] = PROXY_URL
-env["no_proxy"] = "localhost,127.0.0.1"
-env["NO_PROXY"] = "localhost,127.0.0.1"
+        print("JupyterLab 已启动。")
 
-return env
+    except Exception as e:
+        print(f"启动 JupyterLab 失败: {e}")
 
-def get_modelscope_download_env(use_proxy=False):env = os.environ.copy()
 
-# 固定 ModelScope 缓存目录，避免默认缓存散落到 ~/.cache，且方便断点续传。
-os.makedirs(MODELSCOPE_CACHE_DIR, exist_ok=True)
-env["MODELSCOPE_CACHE"] = MODELSCOPE_CACHE_DIR
-env["MODELSCOPE_ENDPOINT"] = "https://www.modelscope.cn"
-env["MODELSCOPE_SDK_ENDPOINT"] = "https://www.modelscope.cn"
 
-# ModelScope 下载大文件时会跳到阿里云 OSS。这里默认直连，避免代理把 OSS 内网地址转坏。
-proxy_keys = [
-    "http_proxy",
-    "https_proxy",
-    "HTTP_PROXY",
-    "HTTPS_PROXY",
-    "ALL_PROXY",
-    "all_proxy"
-]
+# ===== 新增：ModelScope 整库克隆/下载 offline_build 并启动 ComfyUI =====
+def get_proxy_env():
+    env = os.environ.copy()
 
-if use_proxy:
     env["http_proxy"] = PROXY_URL
     env["https_proxy"] = PROXY_URL
     env["HTTP_PROXY"] = PROXY_URL
     env["HTTPS_PROXY"] = PROXY_URL
     env["ALL_PROXY"] = PROXY_URL
-    env["all_proxy"] = PROXY_URL
-else:
-    for key in proxy_keys:
-        env.pop(key, None)
+    env["no_proxy"] = "localhost,127.0.0.1"
+    env["NO_PROXY"] = "localhost,127.0.0.1"
 
-no_proxy_value = "localhost,127.0.0.1,modelscope.cn,www.modelscope.cn,.modelscope.cn,aliyuncs.com,.aliyuncs.com"
-env["no_proxy"] = no_proxy_value
-env["NO_PROXY"] = no_proxy_value
+    return env
 
-return env
 
-def configure_git_proxy():try:subprocess.run(["git", "config", "--global", "http.proxy", PROXY_URL],check=False,stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL,timeout=10)subprocess.run(["git", "config", "--global", "https.proxy", PROXY_URL],check=False,stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL,timeout=10)print("git 代理已配置。")except Exception as e:print(f"配置 git 代理失败: {e}")
+def get_modelscope_download_env(use_proxy=False):
+    env = os.environ.copy()
 
-def is_valid_zip(path):if not os.path.exists(path):return False
+    # 固定 ModelScope 缓存目录，避免默认缓存散落到 ~/.cache，且方便断点续传。
+    os.makedirs(MODELSCOPE_CACHE_DIR, exist_ok=True)
+    env["MODELSCOPE_CACHE"] = MODELSCOPE_CACHE_DIR
+    env["MODELSCOPE_ENDPOINT"] = "https://www.modelscope.cn"
+    env["MODELSCOPE_SDK_ENDPOINT"] = "https://www.modelscope.cn"
+
+    # ModelScope 下载大文件时会跳到阿里云 OSS。这里默认直连，避免代理把 OSS 内网地址转坏。
+    proxy_keys = [
+        "http_proxy",
+        "https_proxy",
+        "HTTP_PROXY",
+        "HTTPS_PROXY",
+        "ALL_PROXY",
+        "all_proxy"
+    ]
 
-try:
-    if not zipfile.is_zipfile(path):
-        return False
+    if use_proxy:
+        env["http_proxy"] = PROXY_URL
+        env["https_proxy"] = PROXY_URL
+        env["HTTP_PROXY"] = PROXY_URL
+        env["HTTPS_PROXY"] = PROXY_URL
+        env["ALL_PROXY"] = PROXY_URL
+        env["all_proxy"] = PROXY_URL
+    else:
+        for key in proxy_keys:
+            env.pop(key, None)
 
-    with zipfile.ZipFile(path, "r") as zf:
-        # 只读取目录，不做全量 testzip，避免大压缩包校验耗时过长。
-        return len(zf.namelist()) > 0
-except Exception:
-    return False
+    no_proxy_value = "localhost,127.0.0.1,modelscope.cn,www.modelscope.cn,.modelscope.cn,aliyuncs.com,.aliyuncs.com"
+    env["no_proxy"] = no_proxy_value
+    env["NO_PROXY"] = no_proxy_value
 
-def find_existing_offline_zip():search_dirs = [MODELSCOPE_DOWNLOAD_DIR, OFFLINE_BUILD_CACHE_DIR, REPO_PATH]
+    return env
 
-for directory in search_dirs:
-    if not os.path.isdir(directory):
-        continue
 
-    for zip_name in OFFLINE_BUILD_ZIP_CANDIDATES:
-        zip_path = os.path.join(directory, zip_name)
-        if is_valid_zip(zip_path):
-            return zip_path
+def configure_git_proxy():
+    try:
+        subprocess.run(
+            ["git", "config", "--global", "http.proxy", PROXY_URL],
+            check=False,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            timeout=10
+        )
+        subprocess.run(
+            ["git", "config", "--global", "https.proxy", PROXY_URL],
+            check=False,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            timeout=10
+        )
+        print("git 代理已配置。")
+    except Exception as e:
+        print(f"配置 git 代理失败: {e}")
 
-    for root, _, files in os.walk(directory):
-        for filename in files:
-            lower_name = filename.lower()
-            if lower_name.endswith(".zip") and "offlin" in lower_name:
-                zip_path = os.path.join(root, filename)
-                if is_valid_zip(zip_path):
-                    return zip_path
 
-return None
-
-def install_modelscope_cli():if shutil.which("modelscope"):print("检测到 modelscope 命令。")return True
-
-print("未检测到 modelscope 命令，尝试安装 modelscope。")
-
-install_commands = [
-    [
-        sys.executable,
-        "-m",
-        "pip",
-        "install",
-        "-U",
-        "modelscope",
-        "-i",
-        "https://pypi.tuna.tsinghua.edu.cn/simple"
-    ],
-    [
-        sys.executable,
-        "-m",
-        "pip",
-        "install",
-        "-U",
-        "modelscope"
-    ]
-]
+def is_valid_zip(path):
+    if not os.path.exists(path):
+        return False
 
-for command in install_commands:
     try:
-        result = subprocess.run(
-            command,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=300
-        )
-
-        if result.returncode == 0 and shutil.which("modelscope"):
-            print("modelscope 安装成功。")
-            return True
+        if not zipfile.is_zipfile(path):
+            return False
 
-        print("modelscope 安装尝试失败。")
-        if result.stdout.strip():
-            print(result.stdout[-1000:])
-        if result.stderr.strip():
-            print(result.stderr[-1000:])
+        with zipfile.ZipFile(path, "r") as zf:
+            # 只读取目录，不做全量 testzip，避免大压缩包校验耗时过长。
+            return len(zf.namelist()) > 0
+    except Exception:
+        return False
 
-    except subprocess.TimeoutExpired:
-        print("modelscope 安装超时。")
-    except Exception as e:
-        print(f"modelscope 安装异常: {e}")
 
-print("modelscope 不可用，无法继续下载 offline_build。")
-return False
+def find_existing_offline_zip():
+    search_dirs = [MODELSCOPE_DOWNLOAD_DIR, OFFLINE_BUILD_CACHE_DIR, REPO_PATH]
 
-def extract_urls_from_text(text):if not text:return []
+    for directory in search_dirs:
+        if not os.path.isdir(directory):
+            continue
 
-urls = re.findall(r"https?://[^\s'\")<>]+", text)
-cleaned_urls = []
+        for zip_name in OFFLINE_BUILD_ZIP_CANDIDATES:
+            zip_path = os.path.join(directory, zip_name)
+            if is_valid_zip(zip_path):
+                return zip_path
 
-for url in urls:
-    cleaned_urls.append(url.rstrip(".,;"))
+        for root, _, files in os.walk(directory):
+            for filename in files:
+                lower_name = filename.lower()
+                if lower_name.endswith(".zip") and "offlin" in lower_name:
+                    zip_path = os.path.join(root, filename)
+                    if is_valid_zip(zip_path):
+                        return zip_path
 
-return cleaned_urls
+    return None
 
-def convert_internal_oss_url_to_public(url):if not url:return None
 
-public_url = url.replace("-internal.aliyuncs.com", ".aliyuncs.com")
-public_url = public_url.replace("http://", "https://", 1)
+def install_modelscope_cli():
+    if shutil.which("modelscope"):
+        print("检测到 modelscope 命令。")
+        return True
 
-if public_url == url:
-    return None
+    print("未检测到 modelscope 命令，尝试安装 modelscope。")
 
-return public_url
-
-def download_url_to_file(url, output_path, use_proxy=False):os.makedirs(os.path.dirname(output_path), exist_ok=True)
-
-env = get_modelscope_download_env(use_proxy=use_proxy)
-
-if shutil.which("aria2c"):
-    command = [
-        "aria2c",
-        "--continue=true",
-        "--max-connection-per-server=8",
-        "--split=8",
-        "--min-split-size=16M",
-        "--check-certificate=false",
-        "--summary-interval=30",
-        "--timeout=30",
-        "--retry-wait=10",
-        "--max-tries=20",
-        "--dir",
-        os.path.dirname(output_path),
-        "--out",
-        os.path.basename(output_path),
-        url
-    ]
-else:
-    command = [
-        "wget",
-        "--continue",
-        "--timeout=30",
-        "--tries=20",
-        "--no-check-certificate",
-        "--output-document",
-        output_path,
-        url
+    install_commands = [
+        [
+            sys.executable,
+            "-m",
+            "pip",
+            "install",
+            "-U",
+            "modelscope",
+            "-i",
+            "https://pypi.tuna.tsinghua.edu.cn/simple"
+        ],
+        [
+            sys.executable,
+            "-m",
+            "pip",
+            "install",
+            "-U",
+            "modelscope"
+        ]
     ]
 
-try:
-    print("执行直链下载命令: " + " ".join(command[:1]) + " ...")
+    for command in install_commands:
+        try:
+            result = subprocess.run(
+                command,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                timeout=300
+            )
 
-    result = subprocess.run(
-        command,
-        env=env,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-        timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
-    )
+            if result.returncode == 0 and shutil.which("modelscope"):
+                print("modelscope 安装成功。")
+                return True
 
-    if result.stdout.strip():
-        print(result.stdout[-2000:])
-    if result.stderr.strip():
-        print(result.stderr[-2000:])
+            print("modelscope 安装尝试失败。")
+            if result.stdout.strip():
+                print(result.stdout[-1000:])
+            if result.stderr.strip():
+                print(result.stderr[-1000:])
 
-    if result.returncode == 0 and is_valid_zip(output_path):
-        print(f"直链下载成功: {output_path}")
-        return True
+        except subprocess.TimeoutExpired:
+            print("modelscope 安装超时。")
+        except Exception as e:
+            print(f"modelscope 安装异常: {e}")
 
-    print(f"直链下载失败或压缩包无效: {output_path}")
+    print("modelscope 不可用，无法继续下载 offline_build。")
     return False
 
-except subprocess.TimeoutExpired:
-    print("直链下载超时。")
-    return False
-except Exception as e:
-    print(f"直链下载异常: {e}")
-    return False
 
-def try_public_oss_fallback(download_output, zip_name):urls = extract_urls_from_text(download_output)
+def extract_urls_from_text(text):
+    if not text:
+        return []
 
-for url in urls:
-    public_url = convert_internal_oss_url_to_public(url)
-    if not public_url:
-        continue
+    urls = re.findall(r"https?://[^\s'\")<>]+", text)
+    cleaned_urls = []
 
-    print("检测到 ModelScope 返回 OSS 内网地址，尝试改用公网 OSS 地址继续下载。")
-    target_path = os.path.join(MODELSCOPE_DOWNLOAD_DIR, zip_name)
+    for url in urls:
+        cleaned_urls.append(url.rstrip(".,;"))
 
-    # 先直连公网 OSS；失败后才走代理。直连更适合国内服务器访问阿里云 OSS。
-    if download_url_to_file(public_url, target_path, use_proxy=False):
-        return target_path
+    return cleaned_urls
 
-    if download_url_to_file(public_url, target_path, use_proxy=True):
-        return target_path
 
-return None
+def convert_internal_oss_url_to_public(url):
+    if not url:
+        return None
+
+    public_url = url.replace("-internal.aliyuncs.com", ".aliyuncs.com")
+    public_url = public_url.replace("http://", "https://", 1)
+
+    if public_url == url:
+        return None
+
+    return public_url
 
-def ensure_git_lfs_available():try:result = subprocess.run(["git", "lfs", "version"],stdout=subprocess.PIPE,stderr=subprocess.PIPE,text=True,timeout=20)if result.returncode == 0:print("检测到 git-lfs。")return Trueexcept Exception:pass
 
-print("未检测到 git-lfs，尝试安装 git-lfs。")
+def download_url_to_file(url, output_path, use_proxy=False):
+    os.makedirs(os.path.dirname(output_path), exist_ok=True)
 
-install_commands = []
-if shutil.which("apt-get"):
-    install_commands.append(["bash", "-lc", "apt-get update && apt-get install -y git-lfs"])
-if shutil.which("yum"):
-    install_commands.append(["bash", "-lc", "yum install -y git-lfs"])
+    env = get_modelscope_download_env(use_proxy=use_proxy)
+
+    if shutil.which("aria2c"):
+        command = [
+            "aria2c",
+            "--continue=true",
+            "--max-connection-per-server=8",
+            "--split=8",
+            "--min-split-size=16M",
+            "--check-certificate=false",
+            "--summary-interval=30",
+            "--timeout=30",
+            "--retry-wait=10",
+            "--max-tries=20",
+            "--dir",
+            os.path.dirname(output_path),
+            "--out",
+            os.path.basename(output_path),
+            url
+        ]
+    else:
+        command = [
+            "wget",
+            "--continue",
+            "--timeout=30",
+            "--tries=20",
+            "--no-check-certificate",
+            "--output-document",
+            output_path,
+            url
+        ]
 
-for command in install_commands:
     try:
+        print("执行直链下载命令: " + " ".join(command[:1]) + " ...")
+
         result = subprocess.run(
             command,
+            env=env,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
-            timeout=600
+            timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
         )
+
         if result.stdout.strip():
             print(result.stdout[-2000:])
         if result.stderr.strip():
             print(result.stderr[-2000:])
 
-        check = subprocess.run(
-            ["git", "lfs", "version"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=20
-        )
-        if check.returncode == 0:
-            print("git-lfs 安装成功。")
+        if result.returncode == 0 and is_valid_zip(output_path):
+            print(f"直链下载成功: {output_path}")
             return True
 
+        print(f"直链下载失败或压缩包无效: {output_path}")
+        return False
+
     except subprocess.TimeoutExpired:
-        print("git-lfs 安装超时。")
+        print("直链下载超时。")
+        return False
     except Exception as e:
-        print(f"git-lfs 安装异常: {e}")
+        print(f"直链下载异常: {e}")
+        return False
 
-print("git-lfs 不可用，后续 git clone 可能只能拿到 LFS 指针文件。")
-return False
 
-def clone_whole_forgeui_repo_with_git():os.makedirs(OFFLINE_BUILD_CACHE_DIR, exist_ok=True)
+def try_public_oss_fallback(download_output, zip_name):
+    urls = extract_urls_from_text(download_output)
 
-existing_zip = find_existing_offline_zip()
-if existing_zip:
-    print(f"检测到已有 offline_build 压缩包: {existing_zip}")
-    return existing_zip
+    for url in urls:
+        public_url = convert_internal_oss_url_to_public(url)
+        if not public_url:
+            continue
 
-if not shutil.which("git"):
-    print("未检测到 git，跳过 git 整库克隆。")
-    return None
+        print("检测到 ModelScope 返回 OSS 内网地址，尝试改用公网 OSS 地址继续下载。")
+        target_path = os.path.join(MODELSCOPE_DOWNLOAD_DIR, zip_name)
 
-ensure_git_lfs_available()
+        # 先直连公网 OSS；失败后才走代理。直连更适合国内服务器访问阿里云 OSS。
+        if download_url_to_file(public_url, target_path, use_proxy=False):
+            return target_path
 
-repo_urls = [
-    "https://www.modelscope.cn/HOPStudio/forgeui.git",
-    "https://modelscope.cn/HOPStudio/forgeui.git"
-]
+        if download_url_to_file(public_url, target_path, use_proxy=True):
+            return target_path
 
-if os.path.isdir(os.path.join(MODELSCOPE_DOWNLOAD_DIR, ".git")):
-    print(f"检测到已存在 ModelScope 整库仓库: {MODELSCOPE_DOWNLOAD_DIR}")
+    return None
+
+
+def ensure_git_lfs_available():
     try:
-        subprocess.run(
-            ["git", "-C", MODELSCOPE_DOWNLOAD_DIR, "lfs", "pull"],
-            env=get_modelscope_download_env(use_proxy=False),
+        result = subprocess.run(
+            ["git", "lfs", "version"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
-            timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
+            timeout=20
         )
-    except Exception as e:
-        print(f"git lfs pull 执行异常: {e}")
+        if result.returncode == 0:
+            print("检测到 git-lfs。")
+            return True
+    except Exception:
+        pass
+
+    print("未检测到 git-lfs，尝试安装 git-lfs。")
+
+    install_commands = []
+    if shutil.which("apt-get"):
+        install_commands.append(["bash", "-lc", "apt-get update && apt-get install -y git-lfs"])
+    if shutil.which("yum"):
+        install_commands.append(["bash", "-lc", "yum install -y git-lfs"])
+
+    for command in install_commands:
+        try:
+            result = subprocess.run(
+                command,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                timeout=600
+            )
+            if result.stdout.strip():
+                print(result.stdout[-2000:])
+            if result.stderr.strip():
+                print(result.stderr[-2000:])
+
+            check = subprocess.run(
+                ["git", "lfs", "version"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                timeout=20
+            )
+            if check.returncode == 0:
+                print("git-lfs 安装成功。")
+                return True
+
+        except subprocess.TimeoutExpired:
+            print("git-lfs 安装超时。")
+        except Exception as e:
+            print(f"git-lfs 安装异常: {e}")
+
+    print("git-lfs 不可用，后续 git clone 可能只能拿到 LFS 指针文件。")
+    return False
+
+
+def clone_whole_forgeui_repo_with_git():
+    os.makedirs(OFFLINE_BUILD_CACHE_DIR, exist_ok=True)
 
     existing_zip = find_existing_offline_zip()
     if existing_zip:
-        print(f"在已克隆仓库中找到 offline_build 压缩包: {existing_zip}")
+        print(f"检测到已有 offline_build 压缩包: {existing_zip}")
         return existing_zip
 
-elif os.path.exists(MODELSCOPE_DOWNLOAD_DIR):
-    # 这里是旧版 modelscope download 留下的目录。整库 git clone 需要空目录，
-    # 因此先改名备份，不直接删除，避免误删已有断点文件。
-    backup_dir = MODELSCOPE_DOWNLOAD_DIR + f".bak_{int(time.time())}"
-    try:
-        shutil.move(MODELSCOPE_DOWNLOAD_DIR, backup_dir)
-        print(f"检测到非 git 下载目录，已备份为: {backup_dir}")
-    except Exception as e:
-        print(f"备份旧下载目录失败: {e}")
+    if not shutil.which("git"):
+        print("未检测到 git，跳过 git 整库克隆。")
         return None
 
-for repo_url in repo_urls:
-    for use_proxy, mode_name in [(False, "直连"), (True, "代理")]:
-        if os.path.exists(MODELSCOPE_DOWNLOAD_DIR):
-            shutil.rmtree(MODELSCOPE_DOWNLOAD_DIR, ignore_errors=True)
+    ensure_git_lfs_available()
 
-        env = get_modelscope_download_env(use_proxy=use_proxy)
-        command = [
-            "git",
-            "clone",
-            "--depth",
-            "1",
-            repo_url,
-            MODELSCOPE_DOWNLOAD_DIR
-        ]
+    repo_urls = [
+        "https://www.modelscope.cn/HOPStudio/forgeui.git",
+        "https://modelscope.cn/HOPStudio/forgeui.git"
+    ]
 
+    if os.path.isdir(os.path.join(MODELSCOPE_DOWNLOAD_DIR, ".git")):
+        print(f"检测到已存在 ModelScope 整库仓库: {MODELSCOPE_DOWNLOAD_DIR}")
         try:
-            print(f"执行 ModelScope 整库 git clone [{mode_name}]: " + " ".join(command))
-
-            result = subprocess.run(
-                command,
-                env=env,
+            subprocess.run(
+                ["git", "-C", MODELSCOPE_DOWNLOAD_DIR, "lfs", "pull"],
+                env=get_modelscope_download_env(use_proxy=False),
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
                 text=True,
                 timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
             )
+        except Exception as e:
+            print(f"git lfs pull 执行异常: {e}")
 
-            if result.stdout.strip():
-                print(result.stdout[-2000:])
-            if result.stderr.strip():
-                print(result.stderr[-4000:])
+        existing_zip = find_existing_offline_zip()
+        if existing_zip:
+            print(f"在已克隆仓库中找到 offline_build 压缩包: {existing_zip}")
+            return existing_zip
 
-            if result.returncode != 0:
-                print("本次 git clone 失败，继续尝试下一个方式。")
-                continue
+    elif os.path.exists(MODELSCOPE_DOWNLOAD_DIR):
+        # 这里是旧版 modelscope download 留下的目录。整库 git clone 需要空目录，
+        # 因此先改名备份，不直接删除，避免误删已有断点文件。
+        backup_dir = MODELSCOPE_DOWNLOAD_DIR + f".bak_{int(time.time())}"
+        try:
+            shutil.move(MODELSCOPE_DOWNLOAD_DIR, backup_dir)
+            print(f"检测到非 git 下载目录，已备份为: {backup_dir}")
+        except Exception as e:
+            print(f"备份旧下载目录失败: {e}")
+            return None
+
+    for repo_url in repo_urls:
+        for use_proxy, mode_name in [(False, "直连"), (True, "代理")]:
+            if os.path.exists(MODELSCOPE_DOWNLOAD_DIR):
+                shutil.rmtree(MODELSCOPE_DOWNLOAD_DIR, ignore_errors=True)
+
+            env = get_modelscope_download_env(use_proxy=use_proxy)
+            command = [
+                "git",
+                "clone",
+                "--depth",
+                "1",
+                repo_url,
+                MODELSCOPE_DOWNLOAD_DIR
+            ]
 
             try:
-                subprocess.run(
-                    ["git", "-C", MODELSCOPE_DOWNLOAD_DIR, "lfs", "pull"],
+                print(f"执行 ModelScope 整库 git clone [{mode_name}]: " + " ".join(command))
+
+                result = subprocess.run(
+                    command,
                     env=env,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
                     text=True,
                     timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
                 )
+
+                if result.stdout.strip():
+                    print(result.stdout[-2000:])
+                if result.stderr.strip():
+                    print(result.stderr[-4000:])
+
+                if result.returncode != 0:
+                    print("本次 git clone 失败，继续尝试下一个方式。")
+                    continue
+
+                try:
+                    subprocess.run(
+                        ["git", "-C", MODELSCOPE_DOWNLOAD_DIR, "lfs", "pull"],
+                        env=env,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.PIPE,
+                        text=True,
+                        timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
+                    )
+                except Exception as e:
+                    print(f"git lfs pull 执行异常: {e}")
+
+                zip_path = find_existing_offline_zip()
+                if zip_path:
+                    print(f"ModelScope 整库克隆完成，找到 offline_build 压缩包: {zip_path}")
+                    return zip_path
+
+                print("整库 git clone 完成，但未找到有效 offline_build 压缩包。")
+
+            except subprocess.TimeoutExpired:
+                print("ModelScope 整库 git clone 超时，继续尝试下一个方式。")
             except Exception as e:
-                print(f"git lfs pull 执行异常: {e}")
+                print(f"ModelScope 整库 git clone 异常: {e}")
+
+    return None
+
+
+def download_whole_forgeui_repo_with_modelscope_cli():
+    if not install_modelscope_cli():
+        return None
+
+    commands = [
+        (
+            [
+                "modelscope",
+                "download",
+                "--model",
+                MODELSCOPE_MODEL_ID,
+                "--local_dir",
+                MODELSCOPE_DOWNLOAD_DIR
+            ],
+            False,
+            "整库直连"
+        ),
+        (
+            [
+                "modelscope",
+                "download",
+                "--model",
+                MODELSCOPE_MODEL_ID,
+                "--local_dir",
+                MODELSCOPE_DOWNLOAD_DIR,
+                "--endpoint",
+                "https://www.modelscope.cn"
+            ],
+            False,
+            "整库直连+显式 endpoint"
+        ),
+        (
+            [
+                "modelscope",
+                "download",
+                "--model",
+                MODELSCOPE_MODEL_ID,
+                "--local_dir",
+                MODELSCOPE_DOWNLOAD_DIR
+            ],
+            True,
+            "整库代理"
+        )
+    ]
+
+    for command, use_proxy, mode_name in commands:
+        try:
+            print(f"执行 ModelScope CLI 整库下载 [{mode_name}]: " + " ".join(command))
+
+            result = subprocess.run(
+                command,
+                env=get_modelscope_download_env(use_proxy=use_proxy),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+                timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
+            )
+
+            output_text = ""
+            if result.stdout.strip():
+                output_text += result.stdout + "\n"
+                print(result.stdout[-2000:])
+            if result.stderr.strip():
+                output_text += result.stderr + "\n"
+                print(result.stderr[-4000:])
 
             zip_path = find_existing_offline_zip()
-            if zip_path:
-                print(f"ModelScope 整库克隆完成，找到 offline_build 压缩包: {zip_path}")
+            if result.returncode == 0 and zip_path:
+                print(f"ModelScope CLI 整库下载完成，找到 offline_build 压缩包: {zip_path}")
                 return zip_path
 
-            print("整库 git clone 完成，但未找到有效 offline_build 压缩包。")
+            # 这里不再按文件名调用 modelscope download，只在 CLI 日志暴露 OSS 直链时做公网地址回退。
+            fallback_zip = try_public_oss_fallback(output_text, "offlinbuild.zip")
+            if fallback_zip and is_valid_zip(fallback_zip):
+                print(f"offline_build 压缩包通过公网 OSS 回退下载成功: {fallback_zip}")
+                return fallback_zip
+
+            print("本次整库下载未找到有效 offline_build 压缩包，继续尝试下一个命令。")
 
         except subprocess.TimeoutExpired:
-            print("ModelScope 整库 git clone 超时，继续尝试下一个方式。")
+            print("ModelScope CLI 整库下载超时，继续尝试下一个命令。")
         except Exception as e:
-            print(f"ModelScope 整库 git clone 异常: {e}")
+            print(f"ModelScope CLI 整库下载异常: {e}")
 
-return None
+    return None
 
-def download_whole_forgeui_repo_with_modelscope_cli():if not install_modelscope_cli():return None
 
-commands = [
-    (
-        [
-            "modelscope",
-            "download",
-            "--model",
-            MODELSCOPE_MODEL_ID,
-            "--local_dir",
-            MODELSCOPE_DOWNLOAD_DIR
-        ],
-        False,
-        "整库直连"
-    ),
-    (
-        [
-            "modelscope",
-            "download",
-            "--model",
-            MODELSCOPE_MODEL_ID,
-            "--local_dir",
-            MODELSCOPE_DOWNLOAD_DIR,
-            "--endpoint",
-            "https://www.modelscope.cn"
-        ],
-        False,
-        "整库直连+显式 endpoint"
-    ),
-    (
-        [
-            "modelscope",
-            "download",
-            "--model",
-            MODELSCOPE_MODEL_ID,
-            "--local_dir",
-            MODELSCOPE_DOWNLOAD_DIR
-        ],
-        True,
-        "整库代理"
-    )
-]
-
-for command, use_proxy, mode_name in commands:
-    try:
-        print(f"执行 ModelScope CLI 整库下载 [{mode_name}]: " + " ".join(command))
+def download_offline_build_from_modelscope():
+    os.makedirs(MODELSCOPE_DOWNLOAD_DIR, exist_ok=True)
+    os.makedirs(MODELSCOPE_CACHE_DIR, exist_ok=True)
 
-        result = subprocess.run(
-            command,
-            env=get_modelscope_download_env(use_proxy=use_proxy),
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            timeout=MODELSCOPE_DOWNLOAD_TIMEOUT
-        )
-
-        output_text = ""
-        if result.stdout.strip():
-            output_text += result.stdout + "\n"
-            print(result.stdout[-2000:])
-        if result.stderr.strip():
-            output_text += result.stderr + "\n"
-            print(result.stderr[-4000:])
+    existing_zip = find_existing_offline_zip()
+    if existing_zip:
+        print(f"检测到已有 offline_build 压缩包: {existing_zip}")
+        return existing_zip
 
-        zip_path = find_existing_offline_zip()
-        if result.returncode == 0 and zip_path:
-            print(f"ModelScope CLI 整库下载完成，找到 offline_build 压缩包: {zip_path}")
-            return zip_path
+    print(f"开始从 ModelScope 整库克隆/下载 {MODELSCOPE_MODEL_ID}。")
 
-        # 这里不再按文件名调用 modelscope download，只在 CLI 日志暴露 OSS 直链时做公网地址回退。
-        fallback_zip = try_public_oss_fallback(output_text, "offlinbuild.zip")
-        if fallback_zip and is_valid_zip(fallback_zip):
-            print(f"offline_build 压缩包通过公网 OSS 回退下载成功: {fallback_zip}")
-            return fallback_zip
+    zip_path = clone_whole_forgeui_repo_with_git()
+    if zip_path:
+        return zip_path
 
-        print("本次整库下载未找到有效 offline_build 压缩包，继续尝试下一个命令。")
+    print("git 整库克隆未成功，改用 ModelScope CLI 整库下载。")
 
-    except subprocess.TimeoutExpired:
-        print("ModelScope CLI 整库下载超时，继续尝试下一个命令。")
-    except Exception as e:
-        print(f"ModelScope CLI 整库下载异常: {e}")
+    zip_path = download_whole_forgeui_repo_with_modelscope_cli()
+    if zip_path:
+        return zip_path
 
-return None
+    print("ModelScope 整库克隆/下载失败，未找到有效 offline_build 压缩包。")
+    return None
 
-def download_offline_build_from_modelscope():os.makedirs(MODELSCOPE_DOWNLOAD_DIR, exist_ok=True)os.makedirs(MODELSCOPE_CACHE_DIR, exist_ok=True)
 
-existing_zip = find_existing_offline_zip()
-if existing_zip:
-    print(f"检测到已有 offline_build 压缩包: {existing_zip}")
-    return existing_zip
+def locate_offline_build_dir():
+    expected_main = os.path.join(OFFLINE_BUILD_DIR, "ComfyUI", "main.py")
+    if os.path.exists(expected_main):
+        return OFFLINE_BUILD_DIR
 
-print(f"开始从 ModelScope 整库克隆/下载 {MODELSCOPE_MODEL_ID}。")
+    for root, dirs, files in os.walk(REPO_PATH):
+        if "main.py" in files and os.path.basename(root) == "ComfyUI":
+            parent_dir = os.path.dirname(root)
+            venv_activate = os.path.join(parent_dir, "venv", "bin", "activate")
+            if os.path.exists(venv_activate):
+                return parent_dir
 
-zip_path = clone_whole_forgeui_repo_with_git()
-if zip_path:
-    return zip_path
+    return None
 
-print("git 整库克隆未成功，改用 ModelScope CLI 整库下载。")
 
-zip_path = download_whole_forgeui_repo_with_modelscope_cli()
-if zip_path:
-    return zip_path
+def extract_offline_build(zip_path):
+    existing_dir = locate_offline_build_dir()
+    if existing_dir:
+        print(f"检测到已解压的 offline_build: {existing_dir}")
+        return existing_dir
 
-print("ModelScope 整库克隆/下载失败，未找到有效 offline_build 压缩包。")
-return None
+    if not zip_path or not is_valid_zip(zip_path):
+        print(f"offline_build 压缩包无效: {zip_path}")
+        return None
 
-def locate_offline_build_dir():expected_main = os.path.join(OFFLINE_BUILD_DIR, "ComfyUI", "main.py")if os.path.exists(expected_main):return OFFLINE_BUILD_DIR
+    try:
+        print(f"正在解压 offline_build: {zip_path}")
 
-for root, dirs, files in os.walk(REPO_PATH):
-    if "main.py" in files and os.path.basename(root) == "ComfyUI":
-        parent_dir = os.path.dirname(root)
-        venv_activate = os.path.join(parent_dir, "venv", "bin", "activate")
-        if os.path.exists(venv_activate):
-            return parent_dir
+        with zipfile.ZipFile(zip_path, "r") as zf:
+            zf.extractall(REPO_PATH)
 
-return None
+        extracted_dir = locate_offline_build_dir()
+        if extracted_dir:
+            print(f"offline_build 解压完成: {extracted_dir}")
+            return extracted_dir
 
-def extract_offline_build(zip_path):existing_dir = locate_offline_build_dir()if existing_dir:print(f"检测到已解压的 offline_build: {existing_dir}")return existing_dir
+        print("解压完成，但未找到 offline_build/ComfyUI/main.py。")
+        return None
 
-if not zip_path or not is_valid_zip(zip_path):
-    print(f"offline_build 压缩包无效: {zip_path}")
-    return None
+    except Exception as e:
+        print(f"解压 offline_build 失败: {e}")
+        return None
 
-try:
-    print(f"正在解压 offline_build: {zip_path}")
 
-    with zipfile.ZipFile(zip_path, "r") as zf:
-        zf.extractall(REPO_PATH)
+def prepare_offline_build():
+    existing_dir = locate_offline_build_dir()
+    if existing_dir:
+        print(f"offline_build 已存在，跳过下载解压: {existing_dir}")
+        return existing_dir
 
-    extracted_dir = locate_offline_build_dir()
-    if extracted_dir:
-        print(f"offline_build 解压完成: {extracted_dir}")
-        return extracted_dir
+    zip_path = download_offline_build_from_modelscope()
+    if not zip_path:
+        return None
 
-    print("解压完成，但未找到 offline_build/ComfyUI/main.py。")
-    return None
+    return extract_offline_build(zip_path)
 
-except Exception as e:
-    print(f"解压 offline_build 失败: {e}")
-    return None
 
-def prepare_offline_build():existing_dir = locate_offline_build_dir()if existing_dir:print(f"offline_build 已存在，跳过下载解压: {existing_dir}")return existing_dir
+def start_comfyui_process():
+    offline_build_dir = prepare_offline_build()
 
-zip_path = download_offline_build_from_modelscope()
-if not zip_path:
-    return None
+    if not offline_build_dir:
+        print("offline_build 准备失败，跳过 ComfyUI 启动。")
+        return
 
-return extract_offline_build(zip_path)
+    venv_activate = os.path.join(offline_build_dir, "venv", "bin", "activate")
+    comfyui_main = os.path.join(offline_build_dir, "ComfyUI", "main.py")
 
-def start_comfyui_process():offline_build_dir = prepare_offline_build()
+    if not os.path.exists(venv_activate):
+        print(f"未找到虚拟环境激活脚本: {venv_activate}")
+        return
 
-if not offline_build_dir:
-    print("offline_build 准备失败，跳过 ComfyUI 启动。")
-    return
+    if not os.path.exists(comfyui_main):
+        print(f"未找到 ComfyUI main.py: {comfyui_main}")
+        return
 
-venv_activate = os.path.join(offline_build_dir, "venv", "bin", "activate")
-comfyui_main = os.path.join(offline_build_dir, "ComfyUI", "main.py")
+    configure_git_proxy()
 
-if not os.path.exists(venv_activate):
-    print(f"未找到虚拟环境激活脚本: {venv_activate}")
-    return
+    command = f'''
+set -e
+source "{venv_activate}"
+export http_proxy={PROXY_URL}
+export https_proxy={PROXY_URL}
+export HTTP_PROXY={PROXY_URL}
+export HTTPS_PROXY={PROXY_URL}
+export ALL_PROXY={PROXY_URL}
+export no_proxy=localhost,127.0.0.1
+export NO_PROXY=localhost,127.0.0.1
+git config --global http.proxy {PROXY_URL}
+git config --global https.proxy {PROXY_URL}
+cd "{os.path.join(offline_build_dir, "ComfyUI")}"
+python main.py --listen 0.0.0.0 --port {COMFYUI_PORT}
+'''
 
-if not os.path.exists(comfyui_main):
-    print(f"未找到 ComfyUI main.py: {comfyui_main}")
-    return
+    try:
+        os.makedirs(REPO_PATH, exist_ok=True)
+        log_file = open(COMFYUI_LOG_PATH, "a", encoding="utf-8")
+
+        process = subprocess.Popen(
+            ["bash", "-lc", command],
+            cwd=offline_build_dir,
+            env=get_proxy_env(),
+            stdout=log_file,
+            stderr=subprocess.STDOUT
+        )
 
-configure_git_proxy()
+        time.sleep(3)
 
-command = f'''
+        if process.poll() is None:
+            print(f"ComfyUI 已启动，端口: {COMFYUI_PORT}，日志: {COMFYUI_LOG_PATH}")
+        else:
+            print(f"ComfyUI 启动后立即退出，返回码: {process.returncode}，请查看日志: {COMFYUI_LOG_PATH}")
 
-set -esource "{venv_activate}"export http_proxy={PROXY_URL}export https_proxy={PROXY_URL}export HTTP_PROXY={PROXY_URL}export HTTPS_PROXY={PROXY_URL}export ALL_PROXY={PROXY_URL}export no_proxy=localhost,127.0.0.1export NO_PROXY=localhost,127.0.0.1git config --global http.proxy {PROXY_URL}git config --global https.proxy {PROXY_URL}cd "{os.path.join(offline_build_dir, "ComfyUI")}"python main.py --listen 0.0.0.0 --port {COMFYUI_PORT}'''
+    except Exception as e:
+        print(f"启动 ComfyUI 失败: {e}")
 
-try:
-    os.makedirs(REPO_PATH, exist_ok=True)
-    log_file = open(COMFYUI_LOG_PATH, "a", encoding="utf-8")
-
-    process = subprocess.Popen(
-        ["bash", "-lc", command],
-        cwd=offline_build_dir,
-        env=get_proxy_env(),
-        stdout=log_file,
-        stderr=subprocess.STDOUT
-    )
+def start_gradio():
+    with gr.Blocks() as demo:
+        gr.Markdown("# InternLM 控制台")
 
-    time.sleep(3)
+        input_box = gr.Textbox(
+            label="输入",
+            placeholder="输入对话内容"
+        )
 
-    if process.poll() is None:
-        print(f"ComfyUI 已启动，端口: {COMFYUI_PORT}，日志: {COMFYUI_LOG_PATH}")
-    else:
-        print(f"ComfyUI 启动后立即退出，返回码: {process.returncode}，请查看日志: {COMFYUI_LOG_PATH}")
+        model_box = gr.Textbox(
+            value="internlm2.5-latest",
+            label="模型"
+        )
 
-except Exception as e:
-    print(f"启动 ComfyUI 失败: {e}")
+        temperature_slider = gr.Slider(
+            minimum=0,
+            maximum=1,
+            value=0.8,
+            step=0.01,
+            label="Temperature"
+        )
 
-def start_gradio():with gr.Blocks() as demo:gr.Markdown("# InternLM 控制台")
+        top_p_slider = gr.Slider(
+            minimum=0,
+            maximum=1,
+            value=0.9,
+            step=0.01,
+            label="Top-p"
+        )
 
-    input_box = gr.Textbox(
-        label="输入",
-        placeholder="输入对话内容"
-    )
+        n_slider = gr.Slider(
+            minimum=1,
+            maximum=10,
+            value=1,
+            step=1,
+            label="生成回复数量"
+        )
 
-    model_box = gr.Textbox(
-        value="internlm2.5-latest",
-        label="模型"
-    )
+        with gr.Row():
+            send_button = gr.Button("发送", variant="primary")
+            refresh_button = gr.Button("刷新前端")
 
-    temperature_slider = gr.Slider(
-        minimum=0,
-        maximum=1,
-        value=0.8,
-        step=0.01,
-        label="Temperature"
-    )
+        output_box = gr.Textbox(
+            label="回复",
+            lines=20,
+            interactive=False
+        )
 
-    top_p_slider = gr.Slider(
-        minimum=0,
-        maximum=1,
-        value=0.9,
-        step=0.01,
-        label="Top-p"
-    )
+        send_button.click(
+            api_call,
+            inputs=[
+                input_box,
+                model_box,
+                temperature_slider,
+                top_p_slider,
+                n_slider
+            ],
+            outputs=output_box
+        )
 
-    n_slider = gr.Slider(
-        minimum=1,
-        maximum=10,
-        value=1,
-        step=1,
-        label="生成回复数量"
-    )
+        refresh_button.click(
+            refresh_frontend,
+            outputs=output_box
+        )
 
-    with gr.Row():
-        send_button = gr.Button("发送", variant="primary")
-        refresh_button = gr.Button("刷新前端")
+        timer = gr.Timer(5)
 
-    output_box = gr.Textbox(
-        label="回复",
-        lines=20,
-        interactive=False
-    )
+        timer.tick(
+            refresh_frontend,
+            outputs=output_box
+        )
 
-    send_button.click(
-        api_call,
-        inputs=[
-            input_box,
-            model_box,
-            temperature_slider,
-            top_p_slider,
-            n_slider
-        ],
-        outputs=output_box
-    )
+    print("Gradio 正在启动。")
 
-    refresh_button.click(
-        refresh_frontend,
-        outputs=output_box
+    demo.launch(
+        server_name="0.0.0.0",
+        server_port=7860,
+        share=False
     )
 
-    timer = gr.Timer(5)
 
-    timer.tick(
-        refresh_frontend,
-        outputs=output_box
-    )
+def main():
+    global CURRENT_DIR
 
-print("Gradio 正在启动。")
+    clone_success = clone_repository()
 
-demo.launch(
-    server_name="0.0.0.0",
-    server_port=7860,
-    share=False
-)
+    if clone_success:
+        CURRENT_DIR = REPO_PATH
 
-def main():global CURRENT_DIR
+    install_frp()
+    create_frpc_toml()
 
-clone_success = clone_repository()
+    try:
+        frp_thread = threading.Thread(
+            target=start_frp,
+            daemon=True
+        )
+        frp_thread.start()
+    except Exception as e:
+        print(f"frp 线程启动失败: {e}")
 
-if clone_success:
-    CURRENT_DIR = REPO_PATH
+    try:
+        jupyter_thread = threading.Thread(
+            target=start_jupyterlab_process,
+            daemon=True
+        )
+        jupyter_thread.start()
+    except Exception as e:
+        print(f"JupyterLab 线程启动失败: {e}")
 
-install_frp()
-create_frpc_toml()
+    try:
+        comfyui_thread = threading.Thread(
+            target=start_comfyui_process,
+            daemon=True
+        )
+        comfyui_thread.start()
+    except Exception as e:
+        print(f"ComfyUI 线程启动失败: {e}")
 
-try:
-    frp_thread = threading.Thread(
-        target=start_frp,
-        daemon=True
-    )
-    frp_thread.start()
-except Exception as e:
-    print(f"frp 线程启动失败: {e}")
-
-try:
-    jupyter_thread = threading.Thread(
-        target=start_jupyterlab_process,
-        daemon=True
-    )
-    jupyter_thread.start()
-except Exception as e:
-    print(f"JupyterLab 线程启动失败: {e}")
-
-try:
-    comfyui_thread = threading.Thread(
-        target=start_comfyui_process,
-        daemon=True
-    )
-    comfyui_thread.start()
-except Exception as e:
-    print(f"ComfyUI 线程启动失败: {e}")
+    print("准备启动 Gradio...")
+    start_gradio()
 
-print("准备启动 Gradio...")
-start_gradio()
 
-if name == "main":main()
+if __name__ == "__main__":
+    main()