Update main.py

main.py

@@ -172,15 +172,11 @@ remotePort = 8188
 
 def install_frp():
     FRP_VERSION = "0.69.0"
-
     frp_tar_name = f"frp_{FRP_VERSION}_linux_amd64.tar.gz"
+    frp_dir_name = f"frp_{FRP_VERSION}_linux_amd64"
 
     frp_tar_path = os.path.join(REPO_PATH, frp_tar_name)
-
-    frp_install_path = os.path.join(
-        REPO_PATH,
-        f"frp_{FRP_VERSION}_linux_amd64"
-    )
+    frp_install_path = os.path.join(REPO_PATH, frp_dir_name)
 
     frp_download_urls = [
         f"https://github.com/fatedier/frp/releases/download/v{FRP_VERSION}/{frp_tar_name}",
@@ -201,29 +197,19 @@ def install_frp():
                 ["tar", "-tzf", path],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
-                text=True
+                text=True,
+                timeout=20
             )
-
             return result.returncode == 0
-
         except Exception:
             return False
 
-    # =========================
-    # 删除损坏文件
-    # =========================
-    if os.path.exists(frp_tar_path):
-        if not is_valid_tar_gz(frp_tar_path):
-            print("检测到损坏的 frp 压缩包，正在删除...")
-            os.remove(frp_tar_path)
-
-    # =========================
-    # 下载 frp
-    # =========================
-    if not os.path.exists(frp_tar_path):
-        print("开始下载 frp...")
+    if os.path.exists(frp_tar_path) and not is_valid_tar_gz(frp_tar_path):
+        print("检测到损坏的 frp 压缩包，删除重下。")
+        os.remove(frp_tar_path)
 
-        download_success = False
+    if not os.path.exists(frp_tar_path):
+        print("开始下载 frp。")
 
         for url in frp_download_urls:
             try:
@@ -232,6 +218,8 @@ def install_frp():
                 result = subprocess.run(
                     [
                         "wget",
+                        "--timeout=30",
+                        "--tries=1",
                         "--no-check-certificate",
                         "-O",
                         frp_tar_path,
@@ -239,258 +227,62 @@ def install_frp():
                     ],
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
-                    text=True
+                    text=True,
+                    timeout=60
                 )
 
                 if result.returncode == 0 and is_valid_tar_gz(frp_tar_path):
                     print("frp 下载成功。")
-                    download_success = True
                     break
 
-                print("下载失败或文件损坏，尝试下一个下载源。")
+                print("下载失败或文件无效。")
 
                 if os.path.exists(frp_tar_path):
                     os.remove(frp_tar_path)
 
-            except Exception as e:
-                print(f"下载异常: {e}")
-
-        if not download_success:
-            print("frp 下载失败。")
-            return False
-
-    # =========================
-    # 解压 frp
-    # =========================
-    try:
-        print(f"正在解压 frp 到 {REPO_PATH}...")
-
-        subprocess.run(
-            [
-                "tar",
-                "-xzf",
-                frp_tar_path,
-                "-C",
-                REPO_PATH
-            ],
-            check=True
-        )
-
-        frpc_path = os.path.join(
-            frp_install_path,
-            "frpc"
-        )
-
-        frps_path = os.path.join(
-            frp_install_path,
-            "frps"
-        )
-
-        subprocess.run(
-            ["chmod", "+x", frpc_path],
-            check=False
-        )
-
-        subprocess.run(
-            ["chmod", "+x", frps_path],
-            check=False
-        )
-
-        print("frp 安装成功！")
-        return True
-
-    except subprocess.CalledProcessError as e:
-        print(f"解压 frp 时出错: {e}")
-        return False
-
-    def is_valid_tar_gz(path):
-        if not os.path.exists(path):
-            return False
-
-        try:
-            result = subprocess.run(
-                ["tar", "-tzf", path],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                text=True
-            )
-            return result.returncode == 0
-        except Exception:
-            return False
-
-    if not is_valid_tar_gz(frp_tar_path):
-        print("frp 压缩包不存在或不是有效 gzip 文件，正在重新下载...")
-
-        if os.path.exists(frp_tar_path):
-            os.remove(frp_tar_path)
-
-        download_success = False
-
-        for url in frp_download_urls:
-            try:
-                print(f"尝试下载: {url}")
-
-                result = subprocess.run(
-                    ["wget", "-O", frp_tar_path, url],
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
-                    text=True
-                )
-
-                if result.returncode == 0 and is_valid_tar_gz(frp_tar_path):
-                    print("frp 下载成功。")
-                    download_success = True
-                    break
+            except subprocess.TimeoutExpired:
+                print("frp 下载超时，尝试下一个源。")
 
-                print("下载失败或文件无效，尝试下一个地址。")
+                if os.path.exists(frp_tar_path):
+                    os.remove(frp_tar_path)
 
             except Exception as e:
-                print(f"下载出错: {e}")
+                print(f"frp 下载异常: {e}")
 
-        if not download_success:
-            print("frp 下载失败，请检查网络。")
+                if os.path.exists(frp_tar_path):
+                    os.remove(frp_tar_path)
+        else:
+            print("frp 下载失败，跳过 frp，不影响 Gradio 启动。")
             return False
 
     try:
-        print(f"正在解压 frp 安装包到 {REPO_PATH}...")
+        print(f"正在解压 frp 到 {REPO_PATH}...")
 
         subprocess.run(
-            ["tar", "-xvzf", frp_tar_path, "-C", REPO_PATH],
-            check=True
+            ["tar", "-xzf", frp_tar_path, "-C", REPO_PATH],
+            check=True,
+            timeout=30
         )
 
         frpc_path = os.path.join(frp_install_path, "frpc")
+        frps_path = os.path.join(frp_install_path, "frps")
 
         if os.path.exists(frpc_path):
             subprocess.run(["chmod", "+x", frpc_path], check=False)
 
-        print("frp 安装成功！")
+        if os.path.exists(frps_path):
+            subprocess.run(["chmod", "+x", frps_path], check=False)
+
+        print("frp 安装成功。")
         return True
 
-    except subprocess.CalledProcessError as e:
-        print(f"解压 frp 时出错: {e}")
+    except subprocess.TimeoutExpired:
+        print("frp 解压超时，跳过 frp。")
         return False
-        
-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)}")
-
-
-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):
-        create_frpc_toml()
-
-    try:
-        subprocess.Popen(
-            [frpc_path, "-c", frpc_config_path],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True
-        )
 
-        print("frp 已启动。")
-
-    except Exception as e:
-        print(f"启动 frp 时出错: {str(e)}")
-
-
-def start_gradio():
-    with gr.Blocks() as demo:
-        gr.Markdown("# InternLM 控制台")
-
-        with gr.Row():
-            input_box = gr.Textbox(
-                label="输入",
-                placeholder="输入对话内容，或使用 cmd_run 执行命令"
-            )
-
-        with gr.Row():
-            model_box = gr.Textbox(
-                value="internlm2.5-latest",
-                label="模型"
-            )
-
-        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="回复",
-                lines=20,
-                interactive=False
-            )
-
-        send_button.click(
-            api_call,
-            inputs=[
-                input_box,
-                model_box,
-                temperature_slider,
-                top_p_slider,
-                n_slider
-            ],
-            outputs=output_box
-        )
-
-    demo.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        share=False
-    )
+    except subprocess.CalledProcessError as e:
+        print(f"frp 解压失败: {e}")
+        return False
 
 
 def main():
@@ -504,19 +296,25 @@ def main():
     install_frp()
     create_frpc_toml()
 
-    frp_thread = threading.Thread(
-        target=start_frp,
-        daemon=True
-    )
-
-    jupyter_thread = threading.Thread(
-        target=start_jupyterlab_process,
-        daemon=True
-    )
+    try:
+        frp_thread = threading.Thread(
+            target=start_frp,
+            daemon=True
+        )
+        frp_thread.start()
+    except Exception as e:
+        print(f"frp 线程启动失败: {e}")
 
-    frp_thread.start()
-    jupyter_thread.start()
+    try:
+        jupyter_thread = threading.Thread(
+            target=start_jupyterlab_process,
+            daemon=True
+        )
+        jupyter_thread.start()
+    except Exception as e:
+        print(f"JupyterLab 线程启动失败: {e}")
 
+    print("准备启动 Gradio...")
     start_gradio()