Upload 9 files

app.py

@@ -88,18 +88,12 @@ async def chat_completions(request: ChatCompletionRequest):
 
 async def stream_chat(model_hint: Optional[str], messages: list):
     # 直接代理OpenRouter的流式响应
-    stream, used_model = await model_tester.chat_completion_stream(model_hint, messages)
-    
-    if not stream:
-        yield f'data: {{"error": "No available model found"}}\n\n'
+    try:
+        async for chunk in model_tester.chat_completion_stream(model_hint, messages):
+            yield chunk.decode() if isinstance(chunk, bytes) else chunk
+    except Exception as e:
+        yield f'data: {{"error": "{str(e)}"}}\n\n'
         yield "data: [DONE]\n\n"
-        return
-    
-    # 直接转发流式数据
-    async for chunk in stream:
-        yield chunk.decode() if isinstance(chunk, bytes) else chunk
-    
-    yield "data: [DONE]\n\n"
 
 
 @fastapi_app.get("/health")

src/model_tester.py

@@ -145,8 +145,8 @@ class ModelTester:
         model_id: str,
         api_key: str,
         messages: List[Dict[str, str]]
-    ) -> Optional[Dict[str, Any]]:
-        """发送流式请求到OpenRouter"""
+    ):
+        """发送流式请求到OpenRouter，返回流式迭代器"""
         url = "https://openrouter.ai/api/v1/chat/completions"
         payload = {
             "model": model_id,
@@ -159,26 +159,9 @@ class ModelTester:
             "Content-Type": "application/json"
         }
 
-        try:
-            timeout = aiohttp.ClientTimeout(total=config.get_request_timeout())
-            async with session.post(url, json=payload, headers=headers, timeout=timeout) as response:
-                if response.status == 200:
-                    return {
-                        "success": True,
-                        "model": model_id,
-                        "stream": response.content,
-                        "method": "direct"
-                    }
-                else:
-                    body = await response.text()
-                    return {
-                        "success": False,
-                        "model": model_id,
-                        "error": f"HTTP {response.status}: {body[:100]}",
-                        "method": "direct"
-                    }
-        except Exception as e:
-            return {"success": False, "model": model_id, "error": str(e), "method": "direct"}
+        async with session.post(url, json=payload, headers=headers, timeout=aiohttp.ClientTimeout(total=120)) as response:
+            async for line in response.content:
+                yield line
 
     async def try_model_direct(
         self, 
@@ -399,7 +382,7 @@ class ModelTester:
         return self.scan_all_models()
 
     async def chat_completion_stream(self, model_hint: Optional[str], messages: List[Dict[str, str]]):
-        """流式聊天 - 返回流式响应对象"""
+        """流式聊天 - 返回生成器"""
         api_keys = config.get_api_keys()
         api_key = random.choice(api_keys)
 
@@ -408,9 +391,9 @@ class ModelTester:
             full_model_id = self.find_model_in_list(model_hint)
             if full_model_id:
                 async with aiohttp.ClientSession() as session:
-                    result = await self.try_model_direct_stream(session, full_model_id, api_key, messages)
-                    if result and result.get("success"):
-                        return result.get("stream"), result.get("model")
+                    async for chunk in self.try_model_direct_stream(session, full_model_id, api_key, messages):
+                        yield chunk
+                    return
 
         # 方案2：从列表中找到可用模型
         self.refresh_model_list()
@@ -428,8 +411,6 @@ class ModelTester:
 
         async with aiohttp.ClientSession() as session:
             for model_id in candidates:
-                result = await self.try_model_direct_stream(session, model_id, api_key, messages)
-                if result and result.get("success"):
-                    return result.get("stream"), result.get("model")
-
-        return None, None
+                async for chunk in self.try_model_direct_stream(session, model_id, api_key, messages):
+                    yield chunk
+                return