Update main.py

main.py

@@ -1,32 +1,29 @@
 import os
 import subprocess
 import threading
-import shlex
 import gradio as gr
 import requests
 import json
+import shutil
 
-# 仓库路径
 REPO_URL = "https://hf-mirror.com/HOPStudio/modelscope"
 REPO_PATH = "/root/modelscope"
 
-# 当前 shell 工作目录
 CURRENT_DIR = REPO_PATH
 
 
-# 确保克隆仓库
-# 修复：
-# 1. 禁用 git lfs smudge
-# 2. 禁用 xet
-# 3. 避免 frp 下载失败
-# =====================================
 def clone_repository():
     if os.path.exists(REPO_PATH):
-        print(f"仓库已存在，跳过克隆: {REPO_PATH}")
-        return True
+        print(f"检测到已有仓库目录，正在清空: {REPO_PATH}")
+        try:
+            shutil.rmtree(REPO_PATH)
+            print("原仓库目录已清空。")
+        except Exception as e:
+            print(f"清空原仓库目录失败: {e}")
+            return False
 
     try:
-        print(f"正在克隆仓库到 {REPO_PATH}...")
+        print(f"正在强制克隆仓库到 {REPO_PATH}...")
 
         env = os.environ.copy()
         env["GIT_LFS_SKIP_SMUDGE"] = "1"
@@ -46,24 +43,15 @@ def clone_repository():
         return False
 
 
-# =====================================
-# 支持 cd 命令的 shell 执行器
-# =====================================
 def execute_shell_command(command):
     global CURRENT_DIR
 
     command = command.strip()
 
-    # =========================
-    # 处理 cd 命令
-    # =========================
     if command.startswith("cd "):
         path = command[3:].strip()
-
-        # 支持 ~
         path = os.path.expanduser(path)
 
-        # 相对路径 -> 绝对路径
         if not os.path.isabs(path):
             path = os.path.join(CURRENT_DIR, path)
 
@@ -72,12 +60,8 @@ def execute_shell_command(command):
         if os.path.isdir(path):
             CURRENT_DIR = path
             return f"已切换目录: {CURRENT_DIR}"
-        else:
-            return f"目录不存在: {path}"
+        return f"目录不存在: {path}"
 
-    # =========================
-    # 执行普通命令
-    # =========================
     try:
         result = subprocess.run(
             command,
@@ -99,37 +83,21 @@ def execute_shell_command(command):
         return f"执行命令时发生错误: {str(e)}"
 
 
-# =====================================
-# API 请求函数
-# =====================================
 def api_call(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9, n=1):
     api_token = os.getenv("API_TOKEN")
 
-    if not api_token:
-        return "API token 未设置，请检查环境变量。"
-
-    # =========================
-    # CMD 模式
-    # 使用:
-    # cmd_run ls
-    # cmd_run cd /root
-    # =========================
     if input_text.startswith("cmd_run "):
         command = input_text[len("cmd_run "):].strip()
-
-        if "sudo" in command:
-            print("警告: 正在使用 sudo 命令")
-
         return execute_shell_command(command)
 
-    # =========================
-    # AI 对话模式
-    # =========================
-    url = 'https://internlm-chat.intern-ai.org.cn/puyu/api/v1/chat/completions'
+    if not api_token:
+        return "API token 未设置，请检查环境变量。"
+
+    url = "https://internlm-chat.intern-ai.org.cn/puyu/api/v1/chat/completions"
 
     headers = {
-        'Content-Type': 'application/json',
-        'Authorization': f'Bearer {api_token}'
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {api_token}"
     }
 
     data = {
@@ -153,7 +121,6 @@ def api_call(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9,
         )
 
         response.raise_for_status()
-
         return response.json()["choices"][0]["message"]["content"]
 
     except requests.exceptions.HTTPError as http_err:
@@ -169,9 +136,6 @@ def api_call(input_text, model="internlm2.5-latest", temperature=0.8, top_p=0.9,
         return f"未知错误: {str(e)}"
 
 
-# =====================================
-# 创建 frpc.toml
-# =====================================
 def create_frpc_toml():
     frpc_toml_path = os.path.join(REPO_PATH, "frpc.toml")
 
@@ -196,23 +160,16 @@ localPort = 8188
 remotePort = 8188
 """
 
-    if os.path.exists(frpc_toml_path):
-        print(f"配置文件已存在: {frpc_toml_path}")
-        return
-
     try:
-        with open(frpc_toml_path, 'w', encoding='utf-8') as file:
+        with open(frpc_toml_path, "w", encoding="utf-8") as file:
             file.write(toml_content)
 
-        print(f"frpc.toml 创建成功: {frpc_toml_path}")
+        print(f"frpc.toml 配置文件已创建: {frpc_toml_path}")
 
     except Exception as e:
-        print(f"创建 frpc.toml 时出错: {e}")
+        print(f"创建 frpc.toml 配置文件时出错: {e}")
 
 
-# =====================================
-# 安装 frp
-# =====================================
 def install_frp():
     frp_tar_path = os.path.join(
         REPO_PATH,
@@ -230,11 +187,10 @@ def install_frp():
 
     if not os.path.exists(frp_tar_path):
         print(f"未找到 frp ��装包: {frp_tar_path}")
-        print("请手动上传 frp_0.61.0_linux_amd64.tar.gz")
         return False
 
     try:
-        print("正在解压 frp...")
+        print(f"正在解压 frp 安装包到 {REPO_PATH}...")
 
         subprocess.run(
             ["tar", "-xvzf", frp_tar_path, "-C", REPO_PATH],
@@ -249,14 +205,11 @@ def install_frp():
         return False
 
 
-# =====================================
-# 启动 JupyterLab
-# =====================================
 def start_jupyterlab_process():
     jupyter_script = os.path.join(REPO_PATH, "start_jupyterlab.py")
 
     if not os.path.exists(jupyter_script):
-        print(f"找不到文件: {jupyter_script}")
+        print(f"无法找到 {jupyter_script}")
         return
 
     try:
@@ -267,55 +220,50 @@ def start_jupyterlab_process():
             text=True
         )
 
-        print("JupyterLab 已启动")
+        print("JupyterLab 启动进程已开始。")
 
     except Exception as e:
-        print(f"启动 JupyterLab 出错: {str(e)}")
+        print(f"启动 JupyterLab 进程时出错: {str(e)}")
 
 
-# =====================================
-# 启动 frp
-# =====================================
 def start_frp():
     frpc_path = os.path.join(
         REPO_PATH,
-        "frp_0.61.0_linux_amd64/frpc"
+        "frp_0.61.0_linux_amd64",
+        "frpc"
     )
 
     frpc_config_path = os.path.join(REPO_PATH, "frpc.toml")
 
     if not os.path.exists(frpc_path):
-        print("frpc 不存在")
+        print("frpc 可执行文件不存在，请检查路径。")
         return
 
     if not os.path.exists(frpc_config_path):
         create_frpc_toml()
 
     try:
-        subprocess.Popen([
-            frpc_path,
-            "-c",
-            frpc_config_path
-        ])
+        subprocess.Popen(
+            [frpc_path, "-c", frpc_config_path],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
 
-        print("frp 已启动")
+        print("frp 已启动。")
 
     except Exception as e:
-        print(f"启动 frp 出错: {str(e)}")
+        print(f"启动 frp 时出错: {str(e)}")
 
 
-# =====================================
-# 启动 Gradio
-# =====================================
 def start_gradio():
     with gr.Blocks() as demo:
-
         gr.Markdown("# InternLM 控制台")
 
         with gr.Row():
             input_box = gr.Textbox(
                 label="输入",
-                placeholder="输入对话或 cmd_run 命令"
+                placeholder="输入对话内容，或使用 cmd_run 执行命令"
             )
 
         with gr.Row():
@@ -379,14 +327,15 @@ def start_gradio():
     )
 
 
-# =====================================
-# 主函数
-# =====================================
 def main():
-    clone_repository()
+    global CURRENT_DIR
 
-    install_frp()
+    clone_success = clone_repository()
 
+    if clone_success:
+        CURRENT_DIR = REPO_PATH
+
+    install_frp()
     create_frpc_toml()
 
     frp_thread = threading.Thread(
@@ -406,5 +355,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
-
+    main()