rag

rag/uapi_service.py

@@ -159,7 +159,7 @@ class APIService:
             "knowledge_base_id": knowledge_base_id,
             "userid": userid
         }
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -167,7 +167,7 @@ class APIService:
         """删除指定文档"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {"document_id": document_id}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -175,7 +175,7 @@ class APIService:
         """删除用户知识库"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {"userid": userid, "knowledge_base_id": knowledge_base_id}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -188,7 +188,7 @@ class APIService:
             "userid": userid,
             "knowledge_base_id": knowledge_base_id
         }
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -197,7 +197,7 @@ class APIService:
         """创建 Milvus 集合"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {"db_type": db_type}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -205,7 +205,7 @@ class APIService:
         """删除 Milvus 集合"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {"db_type": db_type}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -216,7 +216,7 @@ class APIService:
             "chunks": chunks,
             "dbtype": db_type
         }
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -230,7 +230,7 @@ class APIService:
             "document_id": document_id,
             "dbtype": db_type
         }
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -238,7 +238,7 @@ class APIService:
         """删除 Milvus 知识库"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {"userid": userid, "knowledge_base_id": knowledge_base_id}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -252,7 +252,7 @@ class APIService:
             "limit": limit,
             "offset": offset
         }
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -260,7 +260,7 @@ class APIService:
         """列出 Milvus 用户知识库列表"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {"userid": userid}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
         return d
 
@@ -268,91 +268,6 @@ class APIService:
         """列出 Milvus 数据库中所有数据"""
         uapi = UAPI(request, DictObject(**globals()))
         params_kw = {}
-        b = uapi.call(upappid, apiname, user, params_kw)
+        b = await uapi.call(upappid, apiname, user, params_kw)
         d = json.loads(b.decode('utf-8'))
-        return d
-
-    # 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.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.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 记录"""
-        uapi = UAPI(request, DictObject(**globals()))
-        params_kw = {
-            "file_path": file_path,
-            "userid": userid,
-            "knowledge_base_id": knowledge_base_id,
-            "document_id": document_id
-        }
-        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 记录"""
-        uapi = UAPI(request, DictObject(**globals()))
-        params_kw = {
-            "userid": userid,
-            "file_path": file_path,
-            "knowledge_base_id": knowledge_base_id,
-            "document_id": document_id
-        }
-        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.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"""
-        uapi = UAPI(request, DictObject(**globals()))
-        params_kw = {
-            "query": query,
-            "userid": userid,
-            "knowledge_base_ids": knowledge_base_ids,
-            "limit": limit,
-            "offset": offset,
-            "use_rerank": use_rerank
-        }
-        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"""
-        uapi = UAPI(request, DictObject(**globals()))
-        params_kw = {
-            "query": query,
-            "userid": userid,
-            "knowledge_base_ids": knowledge_base_ids,
-            "limit": limit,
-            "offset": offset,
-            "use_rerank": use_rerank
-        }
-        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.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.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.call(upappid, apiname, user, params_kw)
+        return d