Update server.py

server.py

@@ -46,6 +46,7 @@ def update():
     # 安装 p7zip-full
     os.system("sudo apt install p7zip-full -y")
     os.system("pip install -U kaggle")
+    os.system("apt-get install inotify-tools")
     os.system("pip install ruamel.yaml") # install ruamel.yaml to solve the import issue
     print('-----------更新软件包列表结束-------------')
 update()
@@ -111,6 +112,59 @@ def ssh():
 # ssh()
 clear_output()
 
+def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500, 502, 504), session=None):
+    session = session or requests.Session()
+    retry = Retry(total=retries, backoff_factor=backoff_factor, status_forcelist=status_forcelist)
+    adapter = HTTPAdapter(max_retries=retry)
+    session.mount('http://', adapter)
+    session.mount('https://', adapter)
+    return session
+def check_api1():
+    while True:
+        try:
+            url = "http://127.0.0.1:8000/v1"
+            response = requests.get(url, timeout=30)
+            try:
+                response_json = response.json()
+                if response_json.get("detail") in ("Forbidden", "Forbidden"):
+                    print("SillyTavern已经启动")
+                    break  # 接口正常，退出循环
+                else:
+                    print("SillyTavern未启动" )
+            except json.JSONDecodeError:
+                # 如果响应内容不是有效的 JSON，打印错误信息
+                print("SillyTavern未启动2")
+        except requests.exceptions.RequestException as e:
+            print("SillyTavern未启动3")
+        time.sleep(5)
+    
+    # print('开始检测接口状态')
+    # while True:
+    #     url = f"{sd_url}/sdapi/v1/txt2img" 
+    #     try:
+    #         response = requests_retry_session().get(url, timeout=30)
+    #         response.raise_for_status() 
+    #         response_json = response.json()
+    #         if "detail" in response_json and response_json["detail"] in ("Method Not Allowed", "Not Found"):
+    #             print("接口正常")
+    #         else:
+    #             print("接口返回信息：", response_json)
+    #     except requests.exceptions.HTTPError as e:
+    #         print("接口正常2")
+    #     except requests.exceptions.ConnectionError as e:
+    #         print(f"接口异常1: {e}")
+    #         threading.Thread(target=Frpc, daemon=True).start()
+    #         break
+    #     except requests.exceptions.Timeout as e:
+    #         print(f"接口异常2: {e}")
+    #         threading.Thread(target=Frpc, daemon=True).start()
+    #         break
+            
+    #     except requests.exceptions.RequestException as e:
+    #         print(f"接口异常3: {e}")
+    #         threading.Thread(target=Frpc, daemon=True).start()
+    #         break
+    #     time.sleep(5)
 
 
 def frp():
@@ -124,9 +178,9 @@ def frp():
         config_file.write(config_data)
     # frpc 启动命令和参数
     frpc_cmd = ['/content/frp/frpc', '-c', config_file_path]
-    subprocess.Popen(frpc_cmd)
+    # subprocess.Popen(frpc_cmd)
     print('-----------FPR结束-------------')
-    # /content/frp/frpc -c /content/frp/frpc.ini
+    /content/frp/frpc -c /content/frp/frpc.ini
 
 def SillyTavern():
     print('-----------SillyTavern开始-------------')
@@ -156,11 +210,9 @@ def SillyTavern():
     # !git clone https://github.com/SillyTavern/SillyTavern.git
     # 强制替换掉备份
     # !rsync -a --delete /SillyTavern/* /sillytavern/
-
-
+    
     # threading.Thread(target=repeat_task, daemon=True).start()
-    # threading.Thread(target=Oneapi, daemon=True).start()
-    frp()
+    threading.Thread(target=Oneapi, daemon=True).start()
     os.chdir('/sillytavern')
     
     subprocess.run('yes | sh /sillytavern/start.sh', shell=True, check=True)
@@ -172,4 +224,5 @@ def SillyTavern():
     #     'yes | sh start.sh -y'
     # ]
     # run_commands(commands)
-SillyTavern()
+threading.Thread(target=SillyTavern, daemon=True).start()
+check_api1()