Upload core/api_inference.py with huggingface_hub

core/api_inference.py

@@ -257,20 +257,31 @@ class APIInferenceManager:
                 executor.submit(_call, i, a, m, msgs, mtok): i
                 for i, (a, m, msgs, mtok) in enumerate(tasks)
             }
-            for future in as_completed(futures, timeout=timeout_per_model + 5):
-                try:
-                    idx, result = future.result(timeout=timeout_per_model)
-                    self._update_stats(result)
-                    results[idx] = result
-                except Exception as e:
-                    idx = futures[future]
-                    adapter, model = tasks[idx][0], tasks[idx][1]
-                    result = APIInferenceResult(
-                        success=False, answer="", model=model.model_name,
-                        provider=model.provider, latency_ms=0, error=str(e)
-                    )
-                    self._update_stats(result)
-                    results[idx] = result
+            try:
+                for future in as_completed(futures, timeout=30.0):
+                    try:
+                        idx, result = future.result(timeout=5.0)
+                        self._update_stats(result)
+                        results[idx] = result
+                    except Exception as e:
+                        idx = futures[future]
+                        adapter, model = tasks[idx][0], tasks[idx][1]
+                        result = APIInferenceResult(
+                            success=False, answer="", model=model.model_name,
+                            provider=model.provider, latency_ms=0, error=str(e)
+                        )
+                        self._update_stats(result)
+                        results[idx] = result
+            except TimeoutError:
+                # 部分future未完成，收集已完成的结果
+                for future, idx in futures.items():
+                    if results[idx] is None and future.done():
+                        try:
+                            _, result = future.result(timeout=0)
+                            self._update_stats(result)
+                            results[idx] = result
+                        except:
+                            pass
         
         return [r for r in results if r is not None]