Upload 9 files

src/model_tester.py

@@ -181,51 +181,72 @@ class ModelTester:
         keyword: str,
         api_key: str
     ) -> Optional[Dict[str, Any]]:
-        # 如果没有预扫描的列表，直接从API获取
+        # 第一步：从API获取最新的free模型列表
+        print(f"[try_best] Keyword: {keyword}, Refreshing model list...")
+        try:
+            self.refresh_model_list()
+        except Exception as e:
+            print(f"[try_best] refresh_model_list failed: {e}")
+        
         available_free = self.get_available_models(free_only=True)
-        available = self.get_available_models()
+        print(f"[try_best] Found {len(available_free)} free models")
         
+        # 第二步：用关键词匹配模型
         candidates = []
         
-        # 优先 free 模型
-        if available_free:
-            if keyword:
-                matched = [m for m in available_free if keyword.lower() in m.lower()]
-                if matched:
-                    candidates.extend([(m, "free_matched") for m in matched])
-            if not candidates:
-                candidates.extend([(m, "free_random") for m in available_free[:10]])
+        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}")
+            if matched:
+                candidates.extend([(m, "matched") for m in matched[:10]])
         
-        # 如果没有 free，添加付费模型
-        if not candidates and available:
-            candidates.extend([(m, "paid") for m in available[:10]])
+        # 如果关键词没匹配或没提供关键词，随机取free模型
+        if not candidates and available_free:
+            candidates = [(m, "random") for m in available_free[:15]]
+            print(f"[try_best] Using random models: {candidates[:3]}")
         
-        # 如果还是没有候选，实时从API获取
+        # 如果列表为空，从API直接获取并测试
         if not candidates:
+            print("[try_best] No candidates, fetching from API directly...")
             try:
-                _, free_models = self.refresh_model_list()
-                if free_models:
-                    candidates.extend([(m, "free_api") for m in free_models[:20]])
-            except:
-                pass
+                all_models = self.client.get_models()
+                all_free = [m.get("id", "") for m in all_models if ":free" in m.get("id", "")]
+                print(f"[try_best] API returned {len(all_free)} free models")
+                if all_free:
+                    candidates = [(m, "api") for m in all_free[:20]]
+            except Exception as e:
+                print(f"[try_best] API fetch failed: {e}")
         
-        # 并发尝试所有候选模型
-        if candidates:
-            semaphore = asyncio.Semaphore(5)
-            
-            async def try_one(model_id, match_type):
-                async with semaphore:
-                    full_model = f"{model_id}:free" if ":free" not in model_id else model_id
-                    return await self.try_model_direct(session, full_model, api_key)
-            
-            tasks = [try_one(m, t) for m, t in candidates]
-            results = await asyncio.gather(*tasks, return_exceptions=True)
-            
-            for i, result in enumerate(results):
-                if isinstance(result, dict) and result.get("success"):
-                    result["method"] = f"list_{candidates[i][1]}"
-                    return result
+        # 第三步：并发发送请求测试这些模型
+        if not candidates:
+            return {
+                "success": False,
+                "model": None,
+                "error": "No candidates available",
+                "method": "list_empty"
+            }
+        
+        print(f"[try_best] Testing {len(candidates)} candidates...")
+        semaphore = asyncio.Semaphore(5)
+        
+        async def try_one(model_id, match_type):
+            async with semaphore:
+                full_model = f"{model_id}:free" if ":free" not in model_id else model_id
+                print(f"[try_best] Testing model: {full_model}")
+                result = await self.try_model_direct(session, full_model, api_key)
+                print(f"[try_best] Result for {full_model}: {result.get('success') if result else 'None'}")
+                return result
+        
+        tasks = [try_one(m, t) for m, t in candidates]
+        results = await asyncio.gather(*tasks, return_exceptions=True)
+        
+        for i, result in enumerate(results):
+            if isinstance(result, dict) and result.get("success"):
+                result["method"] = f"list_{candidates[i][1]}"
+                print(f"[try_best] SUCCESS with {candidates[i][0]}")
+                return result
         
+        print(f"[try_best] All candidates failed")
         return {
             "success": False,
             "model": candidates[0][0] if candidates else None,