Upload 4 files

app.py

@@ -168,7 +168,7 @@ def handle_api_error(error, attempt, stream=False):
         })
 
     if isinstance(error, InvalidArgument):
-        logger.error(f"{current_api_key[:11]} → 无效，可能被删除或过期")
+        logger.error(f"{current_api_key[:11]} → 无效，可能已过期或被删除")
         key_manager.blacklist_key(current_api_key)
         switch_api_key()
         return False, None
@@ -176,9 +176,9 @@ def handle_api_error(error, attempt, stream=False):
     elif isinstance(error, (ResourceExhausted, Aborted, InternalServerError, ServiceUnavailable)):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
         if isinstance(error, ResourceExhausted):
-            logger.warning(f"{current_api_key[:11]} → 429 官方资源耗尽；{delay} 秒后重试...")
+            logger.warning(f"{current_api_key[:11]} → 429 官方资源耗尽 → {delay} 秒后重试...")
         else:
-            logger.warning(f"{current_api_key[:11]} → 未知错误↙ \n{type(error).__name__}\n{delay} 秒后重试...")
+            logger.warning(f"{current_api_key[:11]} → 未知错误↙ {delay} 秒后重试...\n{type(error).__name__}\n")
         time.sleep(delay)
         if isinstance(error, (ResourceExhausted)):
             key_manager.blacklist_key(current_api_key)
@@ -186,7 +186,7 @@ def handle_api_error(error, attempt, stream=False):
         return False, None
 
     elif isinstance(error, generation_types.StopCandidateException):
-        logger.warning(f"输出被截断")
+        logger.warning(f"AI输出内容被Gemini官方阻挡，代理没有得到有效回复")
         switch_api_key()
         return False, None
 
@@ -212,7 +212,7 @@ def chat_completions():
     gemini_history, user_message, error_response = func.process_messages_for_gemini(messages)
 
     if error_response:
-      logger.error(f"处理消息时出错↙\n {error_response}")
+      logger.error(f"处理输入消息时出错↙\n {error_response}")
       return jsonify(error_response), 400
 
     def do_request(current_api_key, attempt):
@@ -254,13 +254,12 @@ def chat_completions():
                     }
                     yield f"data: {json.dumps(data)}\n\n"
 
-            
             yield "data: [DONE]\n\n"
             logger.info(f"200!")
 
         except Exception as e:
             switch_api_key()
-            logger.error(f"流式输出时截断")
+            logger.error(f"流式输出时截断，请关闭流式输出或修改你的输入")
             error_data = {
                 'error': {
                     'message': '流式输出时截断，请关闭流式输出或修改你的输入',
@@ -276,7 +275,7 @@ def chat_completions():
 
     while attempt < MAX_RETRIES and not success:
         attempt += 1
-        logger.info(f"尝试中... 第 {attempt}/{MAX_RETRIES} 次尝试")
+        logger.info(f"第 {attempt}/{MAX_RETRIES} 次尝试 ...")
         success, response = do_request(current_api_key, attempt)
 
     if not success:
@@ -295,10 +294,10 @@ def chat_completions():
         try:
             text_content = response.text
         except (AttributeError, IndexError, TypeError) as e:
-              logger.error(f"处理响应时出错↙\n{e}")
+              logger.error(f"处理AI返回消息时出错↙\n{e}")
               return jsonify({
                   'error': {
-                      'message': '处理响应时出错',
+                      'message': '处理AI返回消息时出错',
                       'type': 'response_processing_error'
                   }
               }), 500
@@ -344,8 +343,8 @@ if __name__ == '__main__':
     scheduler.add_job(keep_alive, 'interval', hours=12)
     scheduler.start()
 
-    logger.info(f"最大尝试次数/Max retries: {MAX_RETRIES}")
-    logger.info(f"最大请求次数/Max requests: {MAX_REQUESTS}")
-    logger.info(f"请求限额窗口/Limit window: {LIMIT_WINDOW} 秒")
+    logger.info(f"最大尝试次数/MaxRetries: {MAX_RETRIES}")
+    logger.info(f"最大请求次数/MaxRequests: {MAX_REQUESTS}")
+    logger.info(f"请求限额窗口/LimitWindow: {LIMIT_WINDOW} 秒")
 
     app.run(debug=True, host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))