Upload 2 files

app.py

@@ -190,10 +190,10 @@ class APIKeyManager:
     def show_all_keys(self):
         logger.info(f"当前可用API key个数: {len(self.api_keys)} ")
         for i, api_key in enumerate(self.api_keys):
-            logger.info(f"API Key{i}: {api_key[:11]}...{api_key[-3:]}")
+            logger.info(f"API Key{i}: {api_key[:8]}...{api_key[-3:]}")
 
     def blacklist_key(self, key):
-        logger.warning(f"{key[:11]} → 暂时禁用 {api_key_blacklist_duration} 秒")
+        logger.warning(f"{key[:8]} → 暂时禁用 {api_key_blacklist_duration} 秒")
         api_key_blacklist.add(key)
 
         scheduler.add_job(lambda: api_key_blacklist.discard(key), 'date', run_date=datetime.now() + timedelta(seconds=api_key_blacklist_duration))
@@ -207,11 +207,11 @@ def switch_api_key():
     key = key_manager.get_available_key()
     if key:
       current_api_key = key
-      logger.info(f"API key 替换为 → {current_api_key[:11]}...{current_api_key[-3:]}")
+      logger.info(f"API key 替换为 → {current_api_key[:8]}...{current_api_key[-3:]}")
     else:
       logger.error("API key 替换失败，所有API key都已耗尽或被暂时禁用，请重新配置或稍后重试")
 
-logger.info(f"当前 API key: {current_api_key[:11]}...{current_api_key[-3:]}")
+logger.info(f"当前 API key: {current_api_key[:8]}...{current_api_key[-3:]}")
 
 GEMINI_MODELS = [
     {"id": "text-embedding-004"},
@@ -302,14 +302,14 @@ def handle_api_error(error, attempt):
         })
 
     if isinstance(error, InvalidArgument):
-        logger.error(f"{current_api_key[:11]} → 无效，可能已过期或被删除")
+        logger.error(f"{current_api_key[:8]} → 无效，可能已过期或被删除")
         key_manager.blacklist_key(current_api_key)
         switch_api_key()
         return 0, None
 
     elif isinstance(error, ResourceExhausted):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
-        logger.warning(f"{current_api_key[:11]} → 429 官方资源耗尽 → {delay} 秒后重试...")
+        logger.warning(f"{current_api_key[:8]} ... {current_api_key[-3:]} → 429 官方资源耗尽 → {delay} 秒后重试...")
         key_manager.blacklist_key(current_api_key)
         switch_api_key()
         time.sleep(delay)
@@ -317,27 +317,27 @@ def handle_api_error(error, attempt):
 
     elif isinstance(error, Aborted):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
-        logger.warning(f"{current_api_key[:11]} → 操作被中止 → {delay} 秒后重试...")
+        logger.warning(f"{current_api_key[:8]} ... {current_api_key[-3:]} → 操作被中止 → {delay} 秒后重试...")
         switch_api_key()
         time.sleep(delay)
         return 0, None
 
     elif isinstance(error, InternalServerError):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
-        logger.warning(f"{current_api_key[:11]} → 500 服务器内部错误 → {delay} 秒后重试...")
+        logger.warning(f"{current_api_key[:8]} ... {current_api_key[-3:]} → 500 服务器内部错误 → {delay} 秒后重试...")
         switch_api_key()
         time.sleep(delay)
         return 0, None
 
     elif isinstance(error, ServiceUnavailable):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
-        logger.warning(f"{current_api_key[:11]} → 503 服务不可用 → {delay} 秒后重试...")
+        logger.warning(f"{current_api_key[:8]} ... {current_api_key[-3:]} → 503 服务不可用 → {delay} 秒后重试...")
         switch_api_key()
         time.sleep(delay)
         return 0, None
 
     elif isinstance(error, PermissionDenied):
-        logger.error(f"{current_api_key[:11]} → 403 权限被拒绝，该 API KEY 可能已经被官方封禁")
+        logger.error(f"{current_api_key[:8]} ... {current_api_key[-3:]} → 403 权限被拒绝，该 API KEY 可能已经被官方封禁")
         key_manager.blacklist_key(current_api_key)
         switch_api_key()
         return 0, None
@@ -398,7 +398,7 @@ def chat_completions():
     show_thoughts = request_data.get('show_thoughts', False)
     stream = request_data.get('stream', False)
     hint = "流式" if stream else "非流"
-    logger.info(f"\n{model} [{hint}] → {current_api_key[:11]}...{current_api_key[-3:]}")
+    logger.info(f"\n{model} [{hint}] → {current_api_key[:8]}...{current_api_key[-3:]}")
     is_thinking = 'thinking' in model
     api_version = 'v1alpha' if is_thinking else 'v1beta'
     response_type = 'streamGenerateContent' if stream else 'generateContent'