Upload 9 files

src/model_tester.py

@@ -198,12 +198,18 @@ class ModelTester:
         available_free = self.get_all_free_models()
         print(f"[try_best] Found {len(available_free)} free models")
         
-        # 第二步：用关键词匹配模型
+        # 第二步：用关键词匹配模型（避免匹配到不完整的ID）
         candidates = []
         
         if keyword and available_free:
-            matched = [m for m in available_free if keyword.lower() in m.lower()]
-            print(f"[try_best] Keyword '{keyword}' matched: {matched}")
+            # 只匹配模型名部分，不匹配作者前缀
+            matched = []
+            for m in available_free:
+                model_name = m.replace(":free", "").split("/")[-1]
+                if keyword.lower() in model_name.lower():
+                    matched.append(m)
+            
+            print(f"[try_best] Keyword '{keyword}' matched: {matched[:5]}")
             if matched:
                 candidates.extend([(m, "matched") for m in matched[:10]])
         
@@ -264,6 +270,23 @@ class ModelTester:
             "method": "list_fallback"
         }
 
+    def find_model_in_list(self, keyword: str) -> Optional[str]:
+        """Find full model ID from keyword"""
+        available_free = self.get_all_free_models()
+        
+        # 先精确匹配
+        for model in available_free:
+            model_name = model.replace(":free", "").split("/")[-1]
+            if model_name.lower() == keyword.lower():
+                return model
+        
+        # 然后模糊匹配
+        for model in available_free:
+            if keyword.lower() in model.lower():
+                return model
+        
+        return None
+
     async def chat_completion(self, prompt: str, model_hint: Optional[str] = None) -> Dict[str, Any]:
         api_keys = config.get_api_keys()
         api_key = random.choice(api_keys)
@@ -271,54 +294,55 @@ class ModelTester:
         async with aiohttp.ClientSession() as session:
             tasks = []
 
+            # 方案1：用户指定模型，需要先找到完整的模型ID
             if model_hint:
-                full_model = f"{model_hint}:free" if ":free" not in model_hint else model_hint
-                tasks.append(asyncio.create_task(
-                    self.try_model_direct(session, full_model, api_key)
-                ))
+                # 尝试在模型列表中找到匹配的完整模型ID
+                full_model_id = self.find_model_in_list(model_hint)
+                
+                if full_model_id:
+                    # 找到完整ID，直接使用
+                    tasks.append(asyncio.create_task(
+                        self.try_model_direct(session, full_model_id, api_key)
+                    ))
+                else:
+                    # 没找到，尝试用原始输入（可能是完整ID）
+                    full_model = f"{model_hint}:free" if ":free" not in model_hint else model_hint
+                    tasks.append(asyncio.create_task(
+                        self.try_model_direct(session, full_model, api_key)
+                    ))
 
             tasks.append(asyncio.create_task(
                 self.try_best_available_model(session, model_hint or "", api_key)
             ))
 
-            done, pending = await asyncio.wait(
-                tasks,
-                return_when=asyncio.FIRST_COMPLETED
-            )
+            # 等待所有任务完成
+            results = await asyncio.gather(*tasks, return_exceptions=True)
 
-            for task in pending:
-                task.cancel()
+            # 先检查方案1
+            result1 = results[0]
+            if isinstance(result1, dict) and result1.get("success"):
+                return {
+                    "success": True,
+                    "response": result1.get("response"),
+                    "method": result1.get("method"),
+                    "model": result1.get("model")
+                }
 
-            if tasks[0] in done:
-                result = tasks[0].result()
-                if result and result.get("success"):
-                    return {
-                        "success": True,
-                        "response": result.get("response"),
-                        "method": result.get("method"),
-                        "model": result.get("model")
-                    }
-
-            if tasks[1] in done:
-                result = tasks[1].result()
-                if result and result.get("success"):
-                    return {
-                        "success": True,
-                        "response": result.get("response"),
-                        "method": result.get("method"),
-                        "model": result.get("model")
-                    }
-                else:
-                    return {
-                        "success": False,
-                        "error": result.get("error", "Unknown error"),
-                        "method": result.get("method")
-                    }
+            # 方案1失败，检查方案2
+            result2 = results[1]
+            if isinstance(result2, dict) and result2.get("success"):
+                return {
+                    "success": True,
+                    "response": result2.get("response"),
+                    "method": result2.get("method"),
+                    "model": result2.get("model")
+                }
 
+            # 都失败了，返回方案2的错误（更详细）
             return {
                 "success": False,
-                "error": "Both methods failed",
-                "method": "both_failed"
+                "error": result2.get("error", "Unknown error") if isinstance(result2, dict) else "Request failed",
+                "method": result2.get("method", "both_failed") if isinstance(result2, dict) else "both_failed"
             }
 
     def chat_completion_sync(self, prompt: str, model_hint: Optional[str] = None) -> Dict[str, Any]: