update

app.py

@@ -7,6 +7,7 @@ import httpx # 使用httpx替代requests，因为requests是同步的，而FastA
 import os, json
 from dotenv import load_dotenv
 from enum import Enum
+from proxy import do_proxy
 
 # 加载环境变量
 load_dotenv()
@@ -59,54 +60,26 @@ keys_count = len(gemini_api_keys_arr)
 @app.api_route("/v1/{protocol}/{host}/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 # @app.api_route("/v1/{protocol}/{host}/{path:path}", methods=["POST"])
 async def proxy_gemini(request: Request, protocol: ProtocolType, host:str, path: str, proxy_api_key: str = Depends(verify_proxy_api_key)): # 添加代理认证依赖
-    global key_index # 声明使用全局变量
     real_url = f"{protocol.value}://{host}/{path}"
-    
-    # 提取客户端请求的headers和body，透传给Gemini
+    # 提取客户端请求的headers和body
     client_headers = dict(request.headers)
-    
+    client_body = await request.body()
+
     # 移除FastAPI自带的Host头，避免Gemini校验报错
     client_headers.pop("host", None)
-    
     # 将User-Agent改为curl/8.7.1，以模拟curl请求
     client_headers["User-Agent"] = "curl/8.7.1"
-    
-    # 添加Authorization头，用于Gemini的OpenAI兼容API
-    if gemini_api_keys_arr: # 确保有可用的API密钥
-        print(f"key_index: {key_index}")
+
+    # 处理Gemini API密钥轮换和Authorization头
+    global key_index # 声明使用全局变量
+    if gemini_api_keys_arr:
         gemini_api_key = gemini_api_keys_arr[key_index]
         key_index = (key_index + 1) % keys_count
-        print(f"next_key_index: {key_index}")
-        client_headers["Authorization"] = f"Bearer {gemini_api_key}"
-    elif gemini_api_key: # 如果没有API密钥列表，使用单个API密钥
         client_headers["Authorization"] = f"Bearer {gemini_api_key}"
+    elif os.getenv("GEMINI_API_KEY"): # 如果没有API密钥列表，使用单个API密钥
+        client_headers["Authorization"] = f"Bearer {os.getenv('GEMINI_API_KEY')}"
     else:
         raise HTTPException(status_code=500, detail="No Gemini API keys configured.")
-    
-    try:
-        # 读取客户端请求体
-        client_body = await request.body()
-        
-        # 使用httpx异步客户端发起请求
-        async with httpx.AsyncClient() as client:
-            response = await client.request(
-                method=request.method,
-                url=real_url,
-                headers=client_headers,
-                content=client_body, # httpx使用content参数传递请求体
-                timeout=30  # 超时时间，可调整
-            )
-        
-        # 将Gemini的响应透传给客户端
-        return Response(
-            content=response.content,
-            status_code=response.status_code,
-            headers=dict(response.headers)
-        )
-    
-    except httpx.RequestError as e:
-        raise HTTPException(status_code=500, detail=f"转发请求失败：{str(e)}")
-    except httpx.HTTPStatusError as e:
-        raise HTTPException(status_code=e.response.status_code, detail=f"目标API返回错误：{e.response.text}")
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"转发失败：{str(e)}")
+
+    # 调用 do_proxy 并返回其结果
+    return await do_proxy(real_url, request.method, client_headers, client_body)

proxy.py

@@ -0,0 +1,21 @@
+from fastapi.responses import Response # 导入Response
+import httpx # 使用httpx替代requests，因为requests是同步的，而FastAPI是异步的
+
+async def do_proxy(url:str, method:str, headers:dict, content:str):
+    print("Proxy service started.", url)
+    # 使用httpx异步客户端发起请求
+    async with httpx.AsyncClient() as client:
+        response = await client.request(
+        method=method,
+        url=url,
+        headers=headers,
+        content=content, # httpx使用content参数传递请求体
+        timeout=30  # 超时时间，可调整
+    )
+        
+    # 将Gemini的响应透传给客户端
+    return Response(
+        content=response.content,
+        status_code=response.status_code,
+        headers=dict(response.headers)
+    )