Update server.py

server.py

@@ -1,4 +1,5 @@
 ini_content = {"username":"xovale7506","key":"502e30bafc004c02aa668a279df23f3e"}
+st_url = 'http://8.217.96.17:7073'
 config_data = """
 [common]
 server_addr = 8.217.96.17
@@ -138,33 +139,50 @@ def check_api1():
         
         time.sleep(5)  # 等待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
+    print('开始检测接口状态')
+    while True:
+        url = f"{sd_url}/v1"
+        try:
+            response = requests_retry_session().get(url, timeout=30)
+            response.raise_for_status()  # 检查响应状态
+            
+            # 检查返回的状态码
+            if response.status_code == 403:
+                print("SillyTavern已经启动")
+                break  # 服务已启动，退出循环
+            
+            # 尝试解析 JSON 响应
+            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:
+            if e.response.status_code == 403:
+                print("SillyTavern已经启动")  # 再次确认服务已启动
+                break
+            
+            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)
+        except requests.exceptions.RequestException as e:
+            print(f"接口异常3: {e}")
+            threading.Thread(target=Frpc, daemon=True).start()
+            break
+        
+        time.sleep(5)  # 等待5秒后重试
 
 
 def frp():