Upload 9 files

app.py

@@ -1,14 +1,9 @@
 import gradio as gr
 from fastapi import FastAPI, Request, HTTPException
-from fastapi.responses import JSONResponse, StreamingResponse
-from pydantic import BaseModel
-from typing import List, Optional, Union
-import asyncio
+from fastapi.responses import StreamingResponse
 import random
-from datetime import datetime
 import threading
 import uvicorn
-import json
 import aiohttp
 
 from src.config import get_api_keys
@@ -46,26 +41,22 @@ async def list_models():
     return {"object": "list", "data": models}
 
 
-async def proxy_request(model_hint: Optional[str], messages: list, stream: bool):
-    """透传请求到OpenRouter，只修改model"""
-    api_keys = get_api_keys()
-    api_key = random.choice(api_keys)
+async def proxy_request(body: dict):
+    """透传请求，只替换 model 和 key"""
+    api_key = random.choice(get_api_keys())
     
-    # 找到可用的模型ID
     model_tester.refresh_model_list()
     available_free = model_tester.get_all_free_models()
     
+    model_hint = body.get("model")
     target_model = None
     
-    if model_hint:
-        # 尝试匹配用户指定的模型
+    if model_hint and available_free:
         for m in available_free:
             model_name = m.replace(":free", "").split("/")[-1]
             if model_hint.lower() in model_name.lower():
                 target_model = m
                 break
-        if not target_model:
-            target_model = f"{model_hint}:free" if ":free" not in model_hint else model_hint
     
     if not target_model and available_free:
         target_model = random.choice(available_free[:5])
@@ -73,42 +64,35 @@ async def proxy_request(model_hint: Optional[str], messages: list, stream: bool)
     if not target_model:
         raise HTTPException(status_code=400, detail="No available model")
     
-    # 构建请求
+    body["model"] = target_model
+    
     url = "https://openrouter.ai/api/v1/chat/completions"
     headers = {
         "Authorization": f"Bearer {api_key}",
         "Content-Type": "application/json"
     }
-    payload = {
-        "model": target_model,
-        "messages": messages,
-        "stream": stream
-    }
     
     async with aiohttp.ClientSession() as session:
-        async with session.post(url, json=payload, headers=headers, timeout=aiohttp.ClientTimeout(total=120)) as response:
-            if stream:
+        async with session.post(url, json=body, headers=headers, timeout=aiohttp.ClientTimeout(total=120)) as response:
+            if body.get("stream"):
                 async for chunk in response.content:
                     yield chunk
             else:
-                data = await response.json()
-                yield data
+                yield await response.json()
 
 
 @fastapi_app.post("/v1/chat/completions")
 async def chat_completions(request: Request):
     body = await request.json()
-    stream = body.get("stream", False)
-    messages = body.get("messages", [])
     
-    if stream:
+    if body.get("stream"):
         return StreamingResponse(
-            proxy_request(body.get("model"), messages, stream),
+            proxy_request(body),
             media_type="text/event-stream"
         )
     
     result = None
-    async for data in proxy_request(body.get("model"), messages, stream):
+    async for data in proxy_request(body):
         result = data
         break
     
@@ -126,14 +110,6 @@ async def health():
     return {"status": "ok"}
 
 
-def get_available_models():
-    return model_tester.get_available_models(free_only=False)
-
-
-def get_available_free_models():
-    return model_tester.get_available_models(free_only=True)
-
-
 def get_scan_status():
     scan_result = model_tester.scan_result
     total = scan_result.get("total_available", 0)
@@ -148,12 +124,9 @@ def format_model_list(models):
 with gr.Blocks(title="OpenRouter Free API") as demo:
     gr.Markdown("# OpenRouter Free API")
     gr.Markdown("Standard OpenAI-compatible API with free model support")
-    
-    gr.Markdown("## Status")
-    gr.Markdown(f"**{get_scan_status()}**")
-    
+    gr.Markdown(f"**Status: {get_scan_status()}**")
     gr.Markdown("## Available Free Models")
-    gr.Textbox(value=format_model_list(get_available_free_models()), lines=15, interactive=False)
+    gr.Textbox(value=format_model_list(model_tester.get_available_models(free_only=True)), lines=15, interactive=False)
 
 
 app = gr.mount_gradio_app(fastapi_app, demo, path="/")