Upload 4 files

app.py

@@ -38,6 +38,26 @@ request_counts = {}
 api_key_blacklist = set()
 api_key_blacklist_duration = 60
 
+# 核心优势
+safety_settings = [
+    {
+        "category": "HARM_CATEGORY_HARASSMENT",
+        "threshold": "BLOCK_NONE"
+    },
+    {
+        "category": "HARM_CATEGORY_HATE_SPEECH",
+        "threshold": "BLOCK_NONE"
+    },
+    {
+        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+        "threshold": "BLOCK_NONE"
+    },
+    {
+        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
+        "threshold": "BLOCK_NONE"
+    },
+]
+
 class APIKeyManager:
     def __init__(self):
         self.api_keys = os.environ.get('KeyArray').split(',')
@@ -179,10 +199,9 @@ def handle_api_error(error, attempt, stream=False):
             logger.warning(f"{current_api_key[:11]} → 429 官方资源耗尽 → {delay} 秒后重试...")
         else:
             logger.warning(f"{current_api_key[:11]} → 未知错误↙ {delay} 秒后重试...\n{type(error).__name__}\n")
+        key_manager.blacklist_key(current_api_key)
+        switch_api_key()
         time.sleep(delay)
-        if isinstance(error, (ResourceExhausted)):
-            key_manager.blacklist_key(current_api_key)
-            switch_api_key()
         return False, None
 
     elif isinstance(error, generation_types.StopCandidateException):
@@ -212,8 +231,8 @@ def chat_completions():
     gemini_history, user_message, error_response = func.process_messages_for_gemini(messages)
 
     if error_response:
-      logger.error(f"处理输入消息时出错↙\n {error_response}")
-      return jsonify(error_response), 400
+        logger.error(f"处理输入消息时出错↙\n {error_response}")
+        return jsonify(error_response), 400
 
     def do_request(current_api_key, attempt):
         isok, time = is_within_rate_limit(current_api_key)
@@ -224,7 +243,18 @@ def chat_completions():
 
         increment_request_count(current_api_key)
 
-        gen_model = func.get_gen_model(current_api_key, model, temperature, max_tokens)
+        genai.configure(api_key=current_api_key)
+
+        generation_config = {
+            "temperature": temperature,
+            "max_output_tokens": max_tokens
+        }
+
+        gen_model = genai.GenerativeModel(
+            model_name=model,
+            generation_config=generation_config,
+            safety_settings=safety_settings
+        )
 
         try:
             if gemini_history:
@@ -268,7 +298,7 @@ def chat_completions():
             yield f"data: {json.dumps(data)}\n\n"
             logger.info(f"200!")
 
-        except Exception as e:
+        except Exception:
             logger.error(f"流式输出时截断，请关闭流式输出或修改你的输入")
             error_data = {
                 'error': {
@@ -300,10 +330,10 @@ def chat_completions():
         success, response = do_request(current_api_key, attempt)
 
     if not success:
-        logger.error(f" {MAX_RETRIES} 次尝试均失败，请调整配置或向Moonfanz反馈")
+        logger.error(f"{MAX_RETRIES} 次尝试均失败，请调整配置或向Moonfanz反馈")
         response = {
             'error': {
-                'message': f' {MAX_RETRIES} 次尝试均失败，请调整配置或向Moonfanz反馈',
+                'message': f'{MAX_RETRIES} 次尝试均失败，请调整配置或向Moonfanz反馈',
                 'type': 'internal_server_error'
             }
         }
@@ -337,7 +367,7 @@ def chat_completions():
                 'finish_reason': 'stop'
             }],
             'usage': {
-                'prompt_tokens': 0,  
+                'prompt_tokens': 0,
                 'completion_tokens': 0,
                 'total_tokens': 0
             }

func.py

@@ -13,26 +13,6 @@ logger = logging.getLogger(__name__)
 
 request_counts = {}
 
-# 核心优势
-safety_settings = [
-    {
-        "category": "HARM_CATEGORY_HARASSMENT",
-        "threshold": "BLOCK_NONE"
-    },
-    {
-        "category": "HARM_CATEGORY_HATE_SPEECH",
-        "threshold": "BLOCK_NONE"
-    },
-    {
-        "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT",
-        "threshold": "BLOCK_NONE"
-    },
-    {
-        "category": "HARM_CATEGORY_DANGEROUS_CONTENT",
-        "threshold": "BLOCK_NONE"
-    },
-]
-
 password = os.environ['password']
 
 def authenticate_request(request):
@@ -54,21 +34,6 @@ def authenticate_request(request):
 
     return True, None, None
 
-def get_gen_model(api_key, model, temperature, max_tokens):
-    genai.configure(api_key=api_key)
-
-    generation_config = {
-        "temperature": temperature,
-        "max_output_tokens": max_tokens
-        }
-
-    gen_model = genai.GenerativeModel(
-        model_name=model,
-        generation_config=generation_config,
-        safety_settings=safety_settings
-    )
-    return gen_model
-
 def process_messages_for_gemini(messages):
     gemini_history = []
     errors = []