From d0a0d3bbdf7f55be854e5153d612c56ae3c849da Mon Sep 17 00:00:00 2001 From: aries_ckt <916701291@qq.com> Date: Fri, 30 Jun 2023 10:39:47 +0800 Subject: [PATCH] fix:create document return id create document return id --- pilot/openapi/knowledge/knowledge_controller.py | 12 ++++++------ pilot/openapi/knowledge/knowledge_document_dao.py | 3 ++- pilot/openapi/knowledge/knowledge_service.py | 3 +-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pilot/openapi/knowledge/knowledge_controller.py b/pilot/openapi/knowledge/knowledge_controller.py index 26323e098..26e79609f 100644 --- a/pilot/openapi/knowledge/knowledge_controller.py +++ b/pilot/openapi/knowledge/knowledge_controller.py @@ -56,10 +56,10 @@ def space_list(request: KnowledgeSpaceRequest): def document_add(space_name: str, request: KnowledgeDocumentRequest): print(f"/document/add params: {space_name}, {request}") try: - knowledge_space_service.create_knowledge_document( + return Result.succ(knowledge_space_service.create_knowledge_document( space=space_name, request=request - ) - return Result.succ([]) + )) + # return Result.succ([]) except Exception as e: return Result.faild(code="E000X", msg=f"document add error {e}") @@ -106,10 +106,10 @@ async def document_upload( KNOWLEDGE_UPLOAD_ROOT_PATH, space_name, doc_file.filename ), ) - knowledge_space_service.create_knowledge_document( + return Result.succ(knowledge_space_service.create_knowledge_document( space=space_name, request=request - ) - return Result.succ([]) + )) + # return Result.succ([]) return Result.faild(code="E000X", msg=f"doc_file is None") except Exception as e: return Result.faild(code="E000X", msg=f"document add error {e}") diff --git a/pilot/openapi/knowledge/knowledge_document_dao.py b/pilot/openapi/knowledge/knowledge_document_dao.py index f99b81a72..bfd7a8cb7 100644 --- a/pilot/openapi/knowledge/knowledge_document_dao.py +++ b/pilot/openapi/knowledge/knowledge_document_dao.py @@ -56,8 +56,9 @@ class KnowledgeDocumentDao: ) session.add(knowledge_document) session.commit() - + doc_id = knowledge_document.id session.close() + return doc_id def get_knowledge_documents(self, query, page=1, page_size=20): session = self.Session() diff --git a/pilot/openapi/knowledge/knowledge_service.py b/pilot/openapi/knowledge/knowledge_service.py index 49e6a0fa3..54dcd5a88 100644 --- a/pilot/openapi/knowledge/knowledge_service.py +++ b/pilot/openapi/knowledge/knowledge_service.py @@ -78,8 +78,7 @@ class KnowledgeService: content=request.content, result="", ) - knowledge_document_dao.create_knowledge_document(document) - return True + return knowledge_document_dao.create_knowledge_document(document) """get knowledge space"""