Upload app.py

app.py

@@ -107,7 +107,7 @@ def create_custom_session():
     return session
 
 # 添加速率限制相关的常量
-AUTH_RETRY_DELAY = 60  # 认证重试延迟（秒）
+AUTH_RETRY_DELAY = 60  # 认证���试延迟（秒）
 AUTH_BACKOFF_FACTOR = 2  # 退避因子
 AUTH_MAX_RETRIES = 3  # 最大重试次数
 AUTH_CHECK_INTERVAL = 300  # 健康检查间隔（秒）
@@ -450,7 +450,7 @@ def create_openai_chunk(content, model, finish_reason=None, usage=None):
                 "delta": {"content": content} if content else {},
                 "logprobs": None,
                 "finish_reason": finish_reason,
-                # 添加上下文��关信息
+                # 添加上下文关信息
                 "context_preserved": True
             }
         ]
@@ -847,12 +847,24 @@ def make_request(payload, auth_manager, model_id):
     # 记录已尝试的账号
     tried_accounts = set()
     
-    while len(tried_accounts) < len(multi_auth_manager.auth_managers):
+    while True:  # 持续尝试，直到成功或确定所有账号都不可用
         auth_manager = multi_auth_manager.get_next_auth_manager(model_id)
         if not auth_manager:
-            break
+            # 检查是否所有账号都已尝试
+            if len(tried_accounts) >= len(multi_auth_manager.auth_managers):
+                logger.error("所有账号都已尝试且不可用")
+                # 尝试注册新账号
+                successful_accounts = register_bot.register_and_verify(5)
+                if successful_accounts:
+                    credentials = [(account['email'], account['password']) for account in successful_accounts]
+                    multi_auth_manager = MultiAuthManager(credentials)
+                    tried_accounts.clear()  # 清空已尝试账号列表
+                    continue  # 继续尝试新注册的账号
+                else:
+                    raise Exception("所有账号均不可用，且注册新账号失败")
+            continue  # 如果还有未尝试的账号，继续循环
             
-        # 如果这个账号已经尝试过，继续下一个
+        # 如果这个账号已经尝试过，跳过
         if auth_manager._email in tried_accounts:
             continue
             
@@ -863,49 +875,52 @@ def make_request(payload, auth_manager, model_id):
             try:
                 url = get_notdiamond_url()
                 headers = get_notdiamond_headers(auth_manager)
-                response = executor.submit(
-                    requests.post, 
-                    url, 
-                    headers=headers, 
-                    json=payload, 
-                    stream=True
-                ).result()
                 
-                if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
+                # 使用 session 发送请求
+                session = create_custom_session()
+                response = session.post(
+                    url,
+                    headers=headers,
+                    json=payload,
+                    stream=True,
+                    timeout=30  # 添加超时设置
+                )
+                
+                if response.status_code == 200:
                     logger.info(f"请求成功，使用账号 {auth_manager._email}")
                     return response
                 
-                headers_cache.clear()
-                
+                # 处理不同的错误状态码
                 if response.status_code == 401:  # Unauthorized
-                    logger.info(f"Token expired for account {auth_manager._email}, attempting refresh")
+                    logger.warning(f"Token expired for account {auth_manager._email}")
                     if auth_manager.ensure_valid_token():
                         continue
+                    break
                 
-                if response.status_code == 403:  # Forbidden, 模型使用限制
+                if response.status_code == 403:  # Forbidden
                     logger.warning(f"Model {model_id} usage limit reached for account {auth_manager._email}")
                     auth_manager.set_model_unavailable(model_id)
-                    break  # 跳出重试循环，尝试下一个账号
+                    break
+                
+                if response.status_code >= 500:  # Server error
+                    if attempt < max_retries - 1:
+                        time.sleep(retry_delay * (attempt + 1))
+                        continue
                 
-                logger.error(f"Request failed with status {response.status_code} for account {auth_manager._email}")
+                logger.error(f"Request failed with status {response.status_code}")
                 
+            except requests.RequestException as e:
+                logger.error(f"Request error: {str(e)}")
+                if attempt < max_retries - 1:
+                    time.sleep(retry_delay * (attempt + 1))
+                continue
             except Exception as e:
-                logger.error(f"Request attempt {attempt + 1} failed for account {auth_manager._email}: {e}")
+                logger.error(f"Unexpected error: {str(e)}")
                 if attempt < max_retries - 1:
-                    time.sleep(retry_delay)
+                    time.sleep(retry_delay * (attempt + 1))
                 continue
-
-    # 所有账号都尝试过且失败后，才进行注册
-    if len(tried_accounts) == len(multi_auth_manager.auth_managers):
-        logger.info("所有现有账号都已尝试，开始注册新账号")
-        successful_accounts = register_bot.register_and_verify(5)
-        if successful_accounts:
-            credentials = [(account['email'], account['password']) for account in successful_accounts]
-            multi_auth_manager = MultiAuthManager(credentials)
-            # 使用新注册的账号重试请求
-            return make_request(payload, None, model_id)
     
-    raise Exception("所有账号均不可用，且注册新账号失败")
+    raise Exception("无法完成请求，所有可用账号都已尝试")
 
 # 删除 health_check 函数和相关的线程启动代码
 if __name__ == "__main__":