Update server.py

server.py

@@ -70,7 +70,7 @@ def update():
     os.system("pip install ruamel.yaml") # install ruamel.yaml to solve the import issue
     os.system("pip install pexpect")
     print('-----------更新软件包列表结束-------------')
-update()
+# update()
 from ruamel.yaml import YAML
 clear_output(wait=True)  # 清除输出
 
@@ -137,7 +137,7 @@ def ssh():
     os.system("service ssh restart ")
     os.system("export LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | tr ':' '\n' | grep -v '/opt/conda/lib' | paste -sd ':') ")
     print('-----------SSH结束-------------')
-ssh()
+# ssh()
 clear_output()
 
 
@@ -285,6 +285,9 @@ def check_api1():
     Service_status = False
     # 第二次检查接口状态
     while True:
+        if Service_status:
+            print("结束检测")
+            break
         url = f"{st_url}/v1"  # 确保这个 URL 是正确的   
         try:
             response = requests_retry_session().get(url, timeout=30)
@@ -295,22 +298,17 @@ def check_api1():
             if "注册" in response_text or "账号" in response_text:
                 print("检测到注册账号相关信息，结束检测")
                 break  # 跳出循环
-            if "detail" in response_json and response_json["detail"] in ("Method Not Allowed", "Not Found"):
-                print("接口正常1")
             else:
-                print("接口返回信息：", response_json)
-
-        except requests.exceptions.HTTPError as e:
-            if Service_status:
-                print("结束检测")
-                break
-            if e.response.status_code == 403:
-                print("接口正常2")  # 再次确认服务已启动
-                try:
-                    subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:/sillytavern/ /sillytavern/", shell=True, check=True)
-                except subprocess.CalledProcessError as e:
-                    print(f"Rsync failed with return code: {e.returncode}")
-                    print(f"Command output: {e.output}")
+                print("接口返回信息：", response_text)
+
+        # except requests.exceptions.HTTPError as e:
+        #     if e.response.status_code == 403:
+        #         print("接口正常2")  # 再次确认服务已启动
+        #         try:
+        #             subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:/sillytavern/ /sillytavern/", shell=True, check=True)
+        #         except subprocess.CalledProcessError as e:
+        #             print(f"Rsync failed with return code: {e.returncode}")
+        #             print(f"Command output: {e.output}")
                 # if thread_started:
                 #     subprocess.run(f"rsync -avz -e 'ssh -p {ssh_port} -o StrictHostKeyChecking=no' root@{frp_url}:/sillytavern/ /sillytavern/", shell=True, check=True)
                 #     threading.Thread(target=sync, daemon=True).start()