Update main.py

main.py

@@ -4,132 +4,25 @@ import gradio as gr
 import requests
 import json
 
-# 处理 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_run" 开头，则执行系统命令
-    if input_text.startswith("cmd_run "):
-        command = input_text[len("cmd_run "):].strip()
-        
-        # 提示用户谨慎使用 sudo
-        if "sudo" in command:
-            print("警告: 您正在使用 'sudo' 运行命令，请确保了解潜在风险。")
-        
-        try:
-            # 将命令拆分为列表，避免 shell=True 的安全隐患
-            command_list = command.split()
-            result = subprocess.run(
-                command_list,
-                check=True,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True
-            )
-            # 返回命令输出或错误信息
-            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)}"
-
-    # 否则，调用API
-    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
-    }
+# 替换原有的 JupyterLab 安装和启动功能
+def start_jupyterlab_process():
+    # 检查 start_jupyterlab.py 是否存在
+    jupyter_script = "./start_jupyterlab.py"
+    if not os.path.exists(jupyter_script):
+        return "无法找到 start_jupyterlab.py，请确保脚本存在于当前目录下。"
     
     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)}"
-
-# 启动 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)
-        
-        # 定义按钮点击事件
-        send_button.click(
-            api_call,
-            inputs=[input_box, model_box, temperature_slider, top_p_slider, n_slider],
-            outputs=output_box
-        )
-
-    demo.launch(share=False)
-
-# 安装并启动 JupyterLab
-def install_and_start_jupyterlab(port=8888):
-    try:
-        # 安装 JupyterLab
-        subprocess.run(["pip", "install", "jupyterlab"], check=True)
-        print("JupyterLab 安装成功！")
-
-        # 检查端口是否已被占用
-        port_check_command = f"lsof -i:{port}"
-        port_check_result = subprocess.run(
-            port_check_command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
-        )
-        if port_check_result.stdout:
-            return f"端口 {port} 已被占用，请选择其他端口。"
-
-        # 启动 JupyterLab
-        command = [
-            "jupyter-lab",
-            "--ip=0.0.0.0",  # 接受外部连接
-            f"--port={port}",   # 指定端口
-            "--no-browser",  # 禁止自动打开浏览器
-            "--NotebookApp.token=''"  # 禁用 token，方便外部直接访问
-        ]
+        # 启动 start_jupyterlab.py 脚本
         process = subprocess.Popen(
-            command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
+            ["python3", jupyter_script],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
         )
-
-        # 检查是否成功启动
-        for line in process.stdout:
-            if "http://" in line or "https://" in line:
-                print(f"JupyterLab 已成功启动！{line.strip()}")
-                return f"JupyterLab 已成功启动，请通过以下 URL 访问：{line.strip()}"
-
-        return "JupyterLab 已启动，请检查后台是否有进一步输出。"
-    except subprocess.CalledProcessError as e:
-        return f"安装或启动 JupyterLab 时出错: {e}"
+        print("JupyterLab 启动进程已开始...")
+        return "JupyterLab 启动成功，详情请查看日志输出。"
     except Exception as e:
-        return f"未知错误: {str(e)}"
+        return f"启动 JupyterLab 进程时出错: {str(e)}"
 
 # 克隆仓库
 def clone_repository():
@@ -213,6 +106,32 @@ def start_frp():
     except subprocess.CalledProcessError as e:
         return f"启动 frp 时出错: {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)
+        
+        # 定义按钮点击事件
+        send_button.click(
+            api_call,
+            inputs=[input_box, model_box, temperature_slider, top_p_slider, n_slider],
+            outputs=output_box
+        )
+
+    demo.launch(share=False)
+
 # 主函数
 def main():
     clone_message = clone_repository()
@@ -226,10 +145,11 @@ def main():
     frp_message = start_frp()
     print(frp_message)
 
-    jupyter_message = install_and_start_jupyterlab()
+    jupyter_message = start_jupyterlab_process()
     print(jupyter_message)
 
     start_gradio()
 
 if __name__ == "__main__":
     main()
+