Upload 10 files

app/main.py

@@ -17,18 +17,9 @@ import logging
 logging.getLogger("uvicorn").disabled = True
 logging.getLogger("uvicorn.access").disabled = True
 
-# 全局统计变量
-today_calls = 0
-total_calls = 0
-
 # 配置 logger
 logger = logging.getLogger("my_logger")
 logger.setLevel(logging.DEBUG)
-# 添加带时间戳的格式
-formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
-handler = logging.StreamHandler()
-handler.setFormatter(formatter)
-logger.addHandler(handler)
 
 def translate_error(message: str) -> str:
     if "quota exceeded" in message.lower():
@@ -111,12 +102,6 @@ key_manager = APIKeyManager() # 实例化 APIKeyManager，栈会在 __init__ 中
 current_api_key = key_manager.get_available_key()
 
 
-def reset_daily_counter():
-    global today_calls
-    today_calls = 0
-    log_msg = format_log_message('INFO', "每日调用计数器已重置")
-    logger.info(log_msg)
-
 def switch_api_key():
     global current_api_key
     key = key_manager.get_available_key() # get_available_key 会处理栈的逻辑
@@ -158,9 +143,6 @@ async def startup_event():
         # MAX_RETRIES = len(key_manager.api_keys)
         log_msg = format_log_message('INFO', f"最大重试次数设置为：{len(key_manager.api_keys)}") # 添加日志
         logger.info(log_msg)
-        # 添加每日计数器重置任务
-        scheduler.add_job(reset_daily_counter, 'cron', hour=0, minute=0)
-        
         if key_manager.api_keys:
             all_models = await GeminiClient.list_available_models(key_manager.api_keys[0])
             GeminiClient.AVAILABLE_MODELS = [model.replace(
@@ -189,24 +171,11 @@ async def verify_password(request: Request):
 
 async def process_request(chat_request: ChatCompletionRequest, http_request: Request, request_type: Literal['stream', 'non-stream']):
     global current_api_key
-    # 获取请求详细信息
-    client_ip = http_request.client.host if http_request.client else 'unknown'
-    method = http_request.method
-    path = http_request.url.path
-    
     protect_from_abuse(
         http_request, MAX_REQUESTS_PER_MINUTE, MAX_REQUESTS_PER_DAY_PER_IP)
     if chat_request.model not in GeminiClient.AVAILABLE_MODELS:
         error_msg = "无效的模型"
-        extra_log = {
-            'request_type': request_type,
-            'model': chat_request.model,
-            'status_code': 400,
-            'error_message': error_msg,
-            'client_ip': client_ip,
-            'method': method,
-            'path': path
-        }
+        extra_log = {'request_type': request_type, 'model': chat_request.model, 'status_code': 400, 'error_message': error_msg}
         log_msg = format_log_message('ERROR', error_msg, extra=extra_log)
         logger.error(log_msg)
         raise HTTPException(
@@ -223,27 +192,11 @@ async def process_request(chat_request: ChatCompletionRequest, http_request: Req
             current_api_key = key_manager.get_available_key() # 每次循环开始都获取新的 key, 栈逻辑在 get_available_key 中处理
         
         if current_api_key is None: # 检查是否获取到 API 密钥
-            log_msg_no_key = format_log_message('WARNING', "没有可用的 API 密钥，跳过本次尝试", extra={
-                'request_type': request_type,
-                'model': chat_request.model,
-                'status_code': 'N/A',
-                'client_ip': client_ip,
-                'method': method,
-                'path': path
-            })
+            log_msg_no_key = format_log_message('WARNING', "没有可用的 API 密钥，跳过本次尝试", extra={'request_type': request_type, 'model': chat_request.model, 'status_code': 'N/A'})
             logger.warning(log_msg_no_key)
             break  # 如果没有可用密钥，跳出循环
 
-        extra_log = {
-            'key': current_api_key[:8],
-            'request_type': request_type,
-            'model': chat_request.model,
-            'status_code': 'N/A',
-            'error_message': '',
-            'client_ip': client_ip,
-            'method': method,
-            'path': path
-        }
+        extra_log = {'key': current_api_key[:8], 'request_type': request_type, 'model': chat_request.model, 'status_code': 'N/A', 'error_message': ''}
         log_msg = format_log_message('INFO', f"第 {attempt}/{retry_attempts} 次尝试 ... 使用密钥: {current_api_key[:8]}...", extra=extra_log)
         logger.info(log_msg)
 
@@ -411,8 +364,6 @@ async def root():
             <p class="status">服务运行中</p>
             <p>可用API密钥数量: {len(key_manager.api_keys)}</p>
             <p>可用模型数量: {len(GeminiClient.AVAILABLE_MODELS)}</p>
-            <p>今日调用次数: {today_calls}</p>
-            <p>累计调用次数: {total_calls}</p>
         </div>
 
         <div class="info-box">

app/utils.py

@@ -34,9 +34,6 @@ def format_log_message(level, message, extra=None):
         'model': extra.get('model', 'N/A'),
         'status_code': extra.get('status_code', 'N/A'),
         'error_message': extra.get('error_message', ''),
-        'client_ip': extra.get('client_ip', 'N/A'),
-        'method': extra.get('method', 'N/A'),
-        'path': extra.get('path', 'N/A'),
         'message': message
     }
     log_format = LOG_FORMAT_DEBUG if DEBUG else LOG_FORMAT_NORMAL