Update main.py

main.py

@@ -1,219 +1,64 @@
 import os
-import subprocess
-import threading
-import gradio as gr
-import requests
-import json
-
-# 仓库路径
-REPO_URL = "https://hf-mirror.com/HOPStudio/modelscope"
-REPO_PATH = "/root/modelscope"
-
-# 确保克隆仓库
-def clone_repository():
-    if os.path.exists(REPO_PATH):
-        print(f"仓库已存在，跳过克隆: {REPO_PATH}")
-        return True
-    try:
-        print(f"正在克隆仓库到 {REPO_PATH}...")
-        subprocess.run(["git", "clone", REPO_URL, REPO_PATH], check=True)
-        print("仓库克隆成功！")
-        return True
-    except subprocess.CalledProcessError as e:
-        print(f"克隆仓库时出错: {e}")
-        return False
-
-# 处理 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 未设置，请检查环境变量。"
-   
-    if input_text.startswith("cmd_run "):
-        command = input_text[len("cmd_run "):].strip()
-        if "sudo" in command:
-            print("警告: 您正在使用 'sudo' 运行命令，请确保了解潜在风险。")
-        
-        try:
-            command_list = command.split()
-            result = subprocess.run(
-                command_list,
-                check=True,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True
+                maximum=10,
+                value=1,
+                step=1,
+                label="生成回复数量"
             )
-            return result.stdout or result.stderr
-        except FileNotFoundError:
-            return "命令未找到，请检查输入是否正确。"
-        except subprocess.CalledProcessError as e:
-            return f"执行命令时出错: {e.stderr}"
-        except Exception as e:
-            return f"未知错误: {str(e)}"
-
-    url = 'https://internlm-chat.intern-ai.org.cn/puyu/api/v1/chat/completions'
-    headers = {
-        'Content-Type': 'application/json',
-        "Authorization": f"Bearer {api_token}"
-    }
-    data = {
-        "model": model,
-        "messages": [{"role": "user", "content": input_text}],
-        "n": n,
-        "temperature": temperature,
-        "top_p": top_p
-    }
-    try:
-        response = requests.post(url, headers=headers, data=json.dumps(data))
-        response.raise_for_status()
-        return response.json()["choices"][0]["message"]["content"]
-    except requests.exceptions.HTTPError as http_err:
-        return f"HTTP 错误: {http_err}"
-    except requests.exceptions.RequestException as req_err:
-        return f"请求错误: {req_err}"
-    except KeyError:
-        return "解析响应时出错，响应结构可能发生变化。"
-    except Exception as e:
-        return f"未知错误: {str(e)}"
-
-
-# 创建 frpc.toml 配置文件
-def create_frpc_toml():
-    frpc_toml_path = os.path.join(REPO_PATH, "frpc.toml")
-    toml_content = """
-[common]
-server_addr = 47.98.223.72
-server_port = 7000
-token = hop20030219
-
-[jupyterlab]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 18888
-remote_port = 18888
-
-[comfyui]
-type = tcp
-local_ip = 127.0.0.1
-local_port = 8188
-remote_port = 8188
-    """
-
-    if os.path.exists(frpc_toml_path):
-        print(f"配置文件 {frpc_toml_path} 已存在，无需重新创建。")
-        return
-
-    try:
-        with open(frpc_toml_path, 'w') as file:
-            file.write(toml_content)
-        print(f"frpc.toml 配置文件已创建：{frpc_toml_path}")
-    except Exception as e:
-        print(f"创建 frpc.toml 配置文件时出错: {e}")
-
-def install_frp():
-    frp_tar_path = os.path.join(REPO_PATH, "frp_0.61.0_linux_amd64.tar.gz")
-    frp_install_path = os.path.join(REPO_PATH, "frp_0.61.0_linux_amd64")
-
-    if os.path.exists(frp_install_path):
-        print(f"frp 已安装: {frp_install_path}")
-        return True
-
-    if not os.path.exists(frp_tar_path):
-        print(f"未找到 frp 安装包: {frp_tar_path}")
-        return False
-
-    try:
-        print(f"正在解压 frp 安装包到 {REPO_PATH}...")
-        subprocess.run(["tar", "-xvzf", frp_tar_path, "-C", REPO_PATH], check=True)
-        print("frp 安装成功！")
-        return True
-    except subprocess.CalledProcessError as e:
-        print(f"解压 frp 时出错: {e}")
-        return False
-    
-# 启动 start_jupyterlab.py 的线程函数
-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}，请确保脚本已存在于仓库中。")
-        return
-    
-    try:
-        subprocess.Popen(
-            ["python3", jupyter_script],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
-        print("JupyterLab 启动进程已开始...")
-    except Exception as e:
-        print(f"启动 JupyterLab 进程时出错: {str(e)}")
-
-
-# 启�� frp 的线程函数
-def start_frp():
-    frpc_path = os.path.join(REPO_PATH, "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 可执行文件不存在，请检查路径。")
-        return
-    
-    if not os.path.exists(frpc_config_path):
-        print("frpc 配置文件不存在，正在创建...")
-        create_frpc_toml()
-    
-    try:
-        subprocess.Popen([frpc_path, "-c", frpc_config_path])
-        print("frp 已启动。")
-    except Exception as e:
-        print(f"启动 frp 时出错: {str(e)}")
 
-
-# 启动 Gradio 界面
-def start_gradio():
-    with gr.Blocks() as demo:
-        with gr.Row():
-            input_box = gr.Textbox(label="输入", placeholder="输入对话内容")
-        with gr.Row():
-            model_box = gr.Textbox(value="internlm2.5-latest", label="模型", placeholder="输入模型名称")
-        with gr.Row():
-            temperature_slider = gr.Slider(minimum=0, maximum=1, value=0.8, step=0.01, label="Temperature")
-            top_p_slider = gr.Slider(minimum=0, maximum=1, value=0.9, step=0.01, label="Top-p")
-        with gr.Row():
-            n_slider = gr.Slider(minimum=1, maximum=10, value=1, step=1, label="生成回复数量")
         with gr.Row():
             send_button = gr.Button("发送")
+
         with gr.Row():
-            output_box = gr.Textbox(label="回复", placeholder="等待API响应...", interactive=False)
-        
+            output_box = gr.Textbox(
+                label="回复",
+                lines=20,
+                interactive=False
+            )
+
         send_button.click(
             api_call,
-            inputs=[input_box, model_box, temperature_slider, top_p_slider, n_slider],
+            inputs=[
+                input_box,
+                model_box,
+                temperature_slider,
+                top_p_slider,
+                n_slider
+            ],
             outputs=output_box
         )
 
-    demo.launch(share=False)
+    demo.launch(
+        server_name="0.0.0.0",
+        server_port=7860,
+        share=False
+    )
 
 
+# =====================================
 # 主函数
+# =====================================
 def main():
     clone_repository()
+
     install_frp()
 
-    # 创建 frp 配置文件（如果不存在）
     create_frpc_toml()
 
-    # 创建并启动非阻塞线程运行 frp 和 JupyterLab
-    frp_thread = threading.Thread(target=start_frp, daemon=True)
-    jupyter_thread = threading.Thread(target=start_jupyterlab_process, daemon=True)
+    frp_thread = threading.Thread(
+        target=start_frp,
+        daemon=True
+    )
+
+    jupyter_thread = threading.Thread(
+        target=start_jupyterlab_process,
+        daemon=True
+    )
 
     frp_thread.start()
     jupyter_thread.start()
 
-    # 主线程运行 Gradio 界面
     start_gradio()
 
 
 if __name__ == "__main__":
-    main()
+    main()