update

app/core/tools/file_search_tool.py

@@ -7,7 +7,8 @@ from app.core.tools.base_tool import BaseTool
 from app.models.run import Run
 from app.services.file.file import FileService
 from app.services.assistant.assistant import AssistantService
-import asyncio
+
+# import asyncio
 import nest_asyncio
 
 # 使得异步代码可以在已运行的事件循环中嵌套

app/libs/thread_executor.py

@@ -2,7 +2,7 @@ import atexit
 from concurrent.futures import Executor, ThreadPoolExecutor
 import concurrent
 import concurrent.futures
-
+from concurrent.futures import as_completed
 from typing import List
 
 
@@ -53,7 +53,7 @@ def run_with_executor(executor: Executor, func, tasks: List, timeout: int):
             results.append(future.result())
     return results
     """
-
+    """
     results = []
     # Iterate over tasks and execute them sequentially
     for task in tasks:
@@ -71,12 +71,11 @@ def run_with_executor(executor: Executor, func, tasks: List, timeout: int):
     futures = [executor.submit(lambda args: func(*args), task) for task in tasks]
 
     results = []
-    for future in concurrent.futures.as_completed(futures, timeout=timeout):
-        if future.exception():
-            raise future.exception()
-
-        if future.done():
-            results.append(future.result())
+    for future in as_completed(futures, timeout=timeout):
+        try:
+            result = future.result(timeout=timeout)
+            results.append(result)
+        except Exception as e:
+            print(e)
 
     return results
-    """

app/services/file/impl/r2r_file.py

@@ -11,7 +11,8 @@ from app.models import File
 from app.providers.r2r import r2r
 from app.providers.storage import storage
 from app.services.file.impl.oss_file import OSSFileService
-import asyncio
+
+# import asyncio
 from pathlib import Path
 import nest_asyncio