From a36d8090313b4e4c3f6afec103a2ab817e665b32 Mon Sep 17 00:00:00 2001 From: wangmeihua <13383952685@163.com> Date: Tue, 12 Aug 2025 19:04:27 +0800 Subject: [PATCH] uapi --- rag/uapi_service.py | 58 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/rag/uapi_service.py b/rag/uapi_service.py index 9f37bd6..0e9cf3b 100644 --- a/rag/uapi_service.py +++ b/rag/uapi_service.py @@ -13,9 +13,9 @@ class APIService: """调用嵌入服务获取文本向量""" try: uapi = UAPI(request, DictObject(**globals())) - debug(f'{uapi=}') + debug(f'{uapi=}, {type(uapi.call)}') params_kw = {"input": texts} - d = await uapi.request(upappid, apiname, user, params_kw) + d = await uapi.call(upappid, apiname, user, params_kw) if d.get("object") != "list" or not d.get("data"): error(f"嵌入服务响应格式错误: {d}") raise RuntimeError("嵌入服务响应格式错误") @@ -34,7 +34,7 @@ class APIService: raise ValueError("查询文本不能为空") uapi = UAPI(request, DictObject(**globals())) params_kw = {"query": query} - d = await uapi.request(upappid, apiname, user, params_kw) + d = await uapi.call(upappid, apiname, user, params_kw) if d.get("object") != "list" or not d.get("data"): error(f"实体识别服务响应格式错误: {d}") raise RuntimeError("实体识别服务响应格式错误") @@ -54,7 +54,7 @@ class APIService: try: uapi = UAPI(request, DictObject(**globals())) params_kw = {"text": text} - d = await uapi.request(upappid, apiname, user, params_kw) + d = await uapi.call(upappid, apiname, user, params_kw) if d.get("object") != "list": error(f"request #{request_id} invalid response format: {d}") raise RuntimeError("三元组抽取服务响应格式错误") @@ -87,7 +87,7 @@ class APIService: "documents": documents, "top_n": top_n } - d = await uapi.request(upappid, apiname, user, params_kw) + d = await uapi.call(upappid, apiname, user, params_kw) if d.get("object") != "rerank.result" or not d.get("data"): error(f"重排序服务响应格式错误: {d}") raise RuntimeError("重排序服务响应格式错误") @@ -110,7 +110,7 @@ class APIService: try: uapi = UAPI(request, DictObject(**globals())) params_kw = {} - d = await uapi.request(upappid, apiname, user, params_kw) + d = await uapi.call(upappid, apiname, user, params_kw) if d.get("status") != 200: error(f"Neo4j 文档请求失败，状态码: {d.get('status')}") raise RuntimeError(f"Neo4j 文档请求失败: {d.get('status')}") @@ -125,7 +125,7 @@ class APIService: """初始化 Neo4j 服务""" uapi = UAPI(request, DictObject(**globals())) params_kw = {} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def neo4j_insert_triples(self, request, triples: list, document_id: str, knowledge_base_id: str, userid: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """插入三元组到 Neo4j""" @@ -136,19 +136,19 @@ class APIService: "knowledge_base_id": knowledge_base_id, "userid": userid } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def neo4j_delete_document(self, request, document_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """删除指定文档""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"document_id": document_id} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def neo4j_delete_knowledgebase(self, request, userid: str, knowledge_base_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """删除用户知识库""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"userid": userid, "knowledge_base_id": knowledge_base_id} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def neo4j_match_triplets(self, request, query: str, query_entities: list, userid: str, knowledge_base_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """根据实体匹配相关三元组""" @@ -159,20 +159,20 @@ class APIService: "userid": userid, "knowledge_base_id": knowledge_base_id } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) # Milvus 服务 async def milvus_create_collection(self, request, upappid: str, apiname: str, user: str, db_type: str = "") -> Dict[str, Any]: """创建 Milvus 集合""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"db_type": db_type} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_delete_collection(self, request, upappid: str, apiname: str, user: str, db_type: str = "") -> Dict[str, Any]: """删除 Milvus 集合""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"db_type": db_type} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_insert_document(self, request, chunks: List[Dict], upappid: str, apiname: str, user: str, db_type: str = "") -> Dict[str, Any]: """添加 Milvus 记录""" @@ -185,7 +185,7 @@ class APIService: payload_bytes = payload.encode() # 编码为字节 payload_size = len(payload_bytes) # 获取字节数 debug(f"request payload size for insertdocument: {payload_size} bytes") - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_delete_document(self, request, userid: str, file_path: str, knowledge_base_id: str, document_id: str, upappid: str, apiname: str, user: str, db_type: str = "") -> Dict[str, Any]: """删除 Milvus 记录""" @@ -197,13 +197,13 @@ class APIService: "document_id": document_id, "dbtype": db_type } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_delete_knowledgebase(self, request, userid: str, knowledge_base_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """删除 Milvus 知识库""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"userid": userid, "knowledge_base_id": knowledge_base_id} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_search_query(self, request, query_vector: List[float], userid: str, knowledge_base_ids: list, limit: int, offset: int, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """根据用户知识库检索 Milvus""" @@ -215,32 +215,32 @@ class APIService: "limit": limit, "offset": offset } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_list_user_files(self, request, userid: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """列出 Milvus 用户知识库列表""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"userid": userid} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def milvus_list_all_knowledgebases(self, request, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """列出 Milvus 数据库中所有数据""" uapi = UAPI(request, DictObject(**globals())) params_kw = {} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) # RAG 服务 async def rag_create_collection(self, request, upappid: str, apiname: str, user: str, db_type: str = "") -> Dict[str, Any]: """创建 RAG 集合""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"db_type": db_type} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_delete_collection(self, request, upappid: str, apiname: str, user: str, db_type: str = "") -> Dict[str, Any]: """删除 RAG 集合""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"db_type": db_type} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_insert_file(self, request, file_path: str, userid: str, knowledge_base_id: str, document_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """添加 RAG 记录""" @@ -251,7 +251,7 @@ class APIService: "knowledge_base_id": knowledge_base_id, "document_id": document_id } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_delete_file(self, request, userid: str, file_path: str, knowledge_base_id: str, document_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """删除 RAG 记录""" @@ -262,13 +262,13 @@ class APIService: "knowledge_base_id": knowledge_base_id, "document_id": document_id } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_delete_knowledgebase(self, request, userid: str, knowledge_base_id: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """删除 RAG 知识库""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"userid": userid, "knowledge_base_id": knowledge_base_id} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_search_query(self, request, query: str, userid: str, knowledge_base_ids: list, limit: int, offset: int, use_rerank: bool, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """根据用户知识库检索 RAG""" @@ -281,7 +281,7 @@ class APIService: "offset": offset, "use_rerank": use_rerank } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_fused_search_query(self, request, query: str, userid: str, knowledge_base_ids: list, limit: int, offset: int, use_rerank: bool, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """根据用户知识库+知识图谱检索 RAG""" @@ -294,22 +294,22 @@ class APIService: "offset": offset, "use_rerank": use_rerank } - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_list_user_files(self, request, userid: str, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """列出 RAG 用户知识库列表""" uapi = UAPI(request, DictObject(**globals())) params_kw = {"userid": userid} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_list_all_knowledgebases(self, request, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """列出 RAG 数据库中所有数据""" uapi = UAPI(request, DictObject(**globals())) params_kw = {} - return await uapi.request(upappid, apiname, user, params_kw) + return await uapi.call(upappid, apiname, user, params_kw) async def rag_docs(self, request, upappid: str, apiname: str, user: str) -> Dict[str, Any]: """获取 RAG 帮助文档""" uapi = UAPI(request, DictObject(**globals())) params_kw = {} - return await uapi.request(upappid, apiname, user, params_kw) \ No newline at end of file + return await uapi.call(upappid, apiname, user, params_kw) \ No newline at end of file