Qilan2 commited on
Commit
7a4ea6e
·
verified ·
1 Parent(s): 51410e1

Update server.py

Browse files
Files changed (1) hide show
  1. server.py +25 -6
server.py CHANGED
@@ -113,19 +113,32 @@ def ssh():
113
  # ssh()
114
  clear_output()
115
 
 
 
 
 
 
 
116
  def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500, 502, 504), session=None):
 
117
  session = session or requests.Session()
118
  retry = Retry(total=retries, backoff_factor=backoff_factor, status_forcelist=status_forcelist)
119
  adapter = HTTPAdapter(max_retries=retry)
120
  session.mount('http://', adapter)
121
  session.mount('https://', adapter)
122
  return session
 
 
 
 
 
123
  def check_api1():
 
124
  while True:
125
  try:
126
  url = "http://127.0.0.1:8000/v1"
127
  response = requests.get(url, timeout=30)
128
-
129
  # 检查响应状态码
130
  if response.status_code == 403:
131
  print("SillyTavern已经启动")
@@ -133,15 +146,18 @@ def check_api1():
133
 
134
  # 如果不是 403,打印其他信息
135
  print("SillyTavern未启动,状态码:", response.status_code)
136
-
137
  except requests.exceptions.RequestException as e:
138
  print(f"SillyTavern未启动3: {e}") # 打印具体错误信息
139
 
140
  time.sleep(5) # 等待5秒后重试
141
 
142
  print('开始检测接口状态')
 
 
143
  while True:
144
- url = f"{st_url}/v1"
 
145
  try:
146
  response = requests_retry_session().get(url, timeout=30)
147
  response.raise_for_status() # 检查响应状态
@@ -178,13 +194,16 @@ def check_api1():
178
  break
179
 
180
  except requests.exceptions.RequestException as e:
181
- print(f"接口异常3: {e}")
182
- threading.Thread(target=Frpc, daemon=True).start()
183
- break
184
 
185
  time.sleep(5) # 等待5秒后重试
186
 
187
 
 
 
 
188
  def frp():
189
  print('-----------FRP开始-------------')
190
  '''FRP配置'''
 
113
  # ssh()
114
  clear_output()
115
 
116
+ import requests
117
+ import time
118
+ import threading
119
+ from requests.adapters import HTTPAdapter
120
+ from requests.packages.urllib3.util.retry import Retry
121
+
122
  def requests_retry_session(retries=3, backoff_factor=0.3, status_forcelist=(500, 502, 504), session=None):
123
+ """创建一个带重试机制的请求会话"""
124
  session = session or requests.Session()
125
  retry = Retry(total=retries, backoff_factor=backoff_factor, status_forcelist=status_forcelist)
126
  adapter = HTTPAdapter(max_retries=retry)
127
  session.mount('http://', adapter)
128
  session.mount('https://', adapter)
129
  return session
130
+
131
+ def Frpc():
132
+ # 在这里定义 Frpc 函数的逻辑
133
+ print("启动 Frpc...")
134
+
135
  def check_api1():
136
+ # 第一次检查 SillyTavern 是否启动
137
  while True:
138
  try:
139
  url = "http://127.0.0.1:8000/v1"
140
  response = requests.get(url, timeout=30)
141
+
142
  # 检查响应状态码
143
  if response.status_code == 403:
144
  print("SillyTavern已经启动")
 
146
 
147
  # 如果不是 403,打印其他信息
148
  print("SillyTavern未启动,状态码:", response.status_code)
149
+
150
  except requests.exceptions.RequestException as e:
151
  print(f"SillyTavern未启动3: {e}") # 打印具体错误信息
152
 
153
  time.sleep(5) # 等待5秒后重试
154
 
155
  print('开始检测接口状态')
156
+
157
+ # 第二次检查接口状态
158
  while True:
159
+ url = f"{st_url)}/v1" # 确保这个 URL 是正确的
160
+
161
  try:
162
  response = requests_retry_session().get(url, timeout=30)
163
  response.raise_for_status() # 检查响应状态
 
194
  break
195
 
196
  except requests.exceptions.RequestException as e:
197
+ .print(f"接口异常3: {e}")
198
+ .threading.Thread(target=Frpc, daemon=True).start()
199
+ .break
200
 
201
  time.sleep(5) # 等待5秒后重试
202
 
203
 
204
+
205
+
206
+
207
  def frp():
208
  print('-----------FRP开始-------------')
209
  '''FRP配置'''