diff --git a/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py b/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py index 21fe39d..439666a 100644 --- a/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py +++ b/ruoyi-fastapi-backend/module_admin/controller/ragflow_controller.py @@ -35,10 +35,8 @@ async def get_system_ragflow_list( result = await RAGFlowService.get_ragflow_dataset_list_services(None, rage_flow_dastset_query) - return ResponseUtil.success(data = result) + return parse_result(result) - # 获取分页数据 - # ragflow_list, total = await RagflowService.get_ragflow_list(query_db, ragflow_page_query) # 列出数据集中文档列表 @ragflowController.get("/list_documents/{dataset_id}") @@ -55,7 +53,8 @@ async def list_documents_by_dataset_id( print(list_documents_query) result = await RAGFlowService.list_documents_services(None, dataset_id, list_documents_query) - return ResponseUtil.success(data = result) + return parse_result(result) + # 上传文件到数据集 @ragflowController.post("/upload_file/{dataset_id}") @@ -70,8 +69,8 @@ async def upload_file_dataset( # print(file) result = await RAGFlowService.upload_file_dataset_services(None, dataset_id ,files) - return ResponseUtil.success(data = result) - + return parse_result(result) + # 更新文档 @ragflowController.post("/update_file/{dataset_id}/{document_id}") async def update_file_dataset( @@ -86,4 +85,14 @@ async def update_file_dataset( # print(file) result = await RAGFlowService.update_file_dataset_services(dataset_id ,document_id, update_params) - return ResponseUtil.success(result) \ No newline at end of file + return parse_result(result) + + + + + +def parse_result(result): + code = result.get('code', 0) + if code != 0: + return ResponseUtil.error(result.get('data', None)) + return ResponseUtil.success(result.get('data', None)) \ No newline at end of file diff --git a/ruoyi-fastapi-backend/module_admin/service/ragflow_service.py b/ruoyi-fastapi-backend/module_admin/service/ragflow_service.py index df48f11..5ef00b4 100644 --- a/ruoyi-fastapi-backend/module_admin/service/ragflow_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/ragflow_service.py @@ -19,7 +19,7 @@ class RAGFlowService: result = await client.list_datasets(**(rage_flow_query.model_dump())) # 获取分页数据 - return result.get('data', None) + return result # 获取数据集中文档列表 @classmethod @@ -32,7 +32,7 @@ class RAGFlowService: async with AsyncRAGFlowClient(RAGFlowConfig.RAGFLOW_BASE_URL, RAGFlowConfig.RAGFLOW_API_KEY) as client: result = await client.list_documents(dataset_id=dataset_id, **(list_documents_query.model_dump())) - return result.get('data', None) + return result # 上传文档到数据集 async def upload_file_dataset_services( @@ -43,7 +43,7 @@ class RAGFlowService: async with AsyncRAGFlowClient(RAGFlowConfig.RAGFLOW_BASE_URL, RAGFlowConfig.RAGFLOW_API_KEY) as client: result = await client.upload_documents_bytes(dataset_id=dataset_id, file_bytes=files) - return result.get('data', None) + return result # 更新文档内容 @classmethod @@ -56,4 +56,4 @@ class RAGFlowService: async with AsyncRAGFlowClient(RAGFlowConfig.RAGFLOW_BASE_URL, RAGFlowConfig.RAGFLOW_API_KEY) as client: result = await client.update_document(dataset_id=dataset_id, document_id=document_id, **(update_params.model_dump())) - return result.get('data', None) \ No newline at end of file + return result \ No newline at end of file