jack vor 6 Tagen
Ursprung
Commit
2ea89dd6e8

+ 1 - 1
app/core/runner/llm_backend.py

@@ -68,7 +68,7 @@ class LLMBackend:
         for message in chat_params["messages"]:
             if "content" not in message:
                 message["content"] = ""
-        chat_params["timeout"] = 120
+        chat_params["timeout"] = 300
         logging.info("chat_params: %s", chat_params)
         response = self.client.chat.completions.create(**chat_params)
         logging.info("chat_response: %s", response)

+ 1 - 1
app/core/tools/file_search_tool.py

@@ -108,7 +108,7 @@ class FileSearchTool(BaseTool):
                 query=query, file_keys=self.__keys, folder_keys=self.__dirkeys
             )
             self.index = 1
-        print(files)
+        # print(files)
         return files
 
     def instruction_supplement(self) -> str:

+ 2 - 2
app/providers/r2r.py

@@ -10,8 +10,8 @@ from config.llm import tool_settings
 # 使得异步代码可以在已运行的事件循环中嵌套
 # nest_asyncio.apply()
 
-client = R2RAsyncClient(tool_settings.R2R_BASE_URL)
-client_sync = R2RClient(tool_settings.R2R_BASE_URL)
+client = R2RAsyncClient(tool_settings.R2R_BASE_URL, 300)
+client_sync = R2RClient(tool_settings.R2R_BASE_URL, 300)
 
 
 class R2R:

+ 2 - 2
app/services/file/impl/r2r_file.py

@@ -137,8 +137,8 @@ class R2RFileService(OSSFileService):
                 files["text"] += f"\n\n{text}"
             else:
                 files["text"] = text
-        print("aaaaaaaaaaaaaa")
-        print(files)
+        # print("aaaaaaaaaaaaaa")
+        # print(files)
         return files
 
     @staticmethod

+ 7 - 0
app/tasks/run_task.py

@@ -23,3 +23,10 @@ def run_task(self, run_id: str, token_id: str, stream: bool = False):
     finally:
         session.close()
     return None
+
+
+##统一的错误处理,最后集中到最后无法处理的错误的时候处理
+@celery_app.exception_handler(Exception)
+async def global_exception_handler(exc):
+    print(f"An error occurred: {exc}")
+    return {"message": "Internal server error, please check logs."}

+ 9 - 9
main.py

@@ -37,15 +37,6 @@ def boot(_app, provider):
     logging.info(provider.__name__ + " booted")
 
 
-# 添加全局异常处理器
-@app.exception_handler(HTTPException)
-async def http_exception_handler(request, exc: HTTPException):
-    return JSONResponse(
-        status_code=exc.status_code,
-        content={"detail": exc.detail, "message": "Resource not found."},
-    )
-
-
 app = create_app()
 
 
@@ -63,3 +54,12 @@ if __name__ == "__main__":
         # workers=settings.SERVER_WORKERS,
         reload=settings.ENV == "local",
     )
+
+
+# 添加全局异常处理器
+@app.exception_handler(HTTPException)
+async def http_exception_handler(request, exc: HTTPException):
+    return JSONResponse(
+        status_code=exc.status_code,
+        content={"detail": exc.detail, "message": "Resource not found."},
+    )

+ 1 - 1
worker.py

@@ -10,7 +10,7 @@ def setup_loggers(logger, *args, **kwargs):
     logging_provider.register()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     # 方便用代码启动调试
     cmd_argv = ["-A", "worker.celery_app", "worker", "-c", "1"]
     celery_app.start(argv=cmd_argv)