yumoqing/rag
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改api

Browse Source
This commit is contained in:
wangmeihua 2025-08-07 16:23:38 +08:00
parent 4ea743a1fe
commit 12f7cee2bf
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rag/api_service.py
View File

@ -249,10 +249,10 @@ class APIService:
return await self._make_request("https://vectordb.opencomputing.net:10443/v1/deleteknowledgebase", "deleteknowledgebase",
{"userid": userid, "knowledge_base_id": knowledge_base_id})
async def milvus_search_query(self, query: str, userid: str, knowledge_base_ids: list, limit: int, offset: int) -> Dict[str, Any]:
async def milvus_search_query(self, query_vector: List[float], userid: str, knowledge_base_ids: list, limit: int, offset: int) -> Dict[str, Any]:
"""根据用户知识库检索 Milvus"""
params = {
"query": query,
"query_vector": query_vector,
"userid": userid,
"knowledge_base_ids": knowledge_base_ids,
"limit": limit,

42
rag/file.py
View File

@ -42,7 +42,7 @@ async def file_uploaded(params_kw):
realpath = params_kw.get('realpath', '')
fiid = params_kw.get('fiid', '')
id = params_kw.get('id', '')
orgid = await get_orgid_by_id(id)
orgid = await get_orgid_by_id(fiid)
db_type = ''
debug(f'Inserting document: file_path={realpath}, userid={orgid}, db_type={db_type}, knowledge_base_id={fiid}, document_id={id}')
@ -183,7 +183,7 @@ async def file_uploaded(params_kw):
timings["total"] = time.time() - start_total
debug(f"总耗时: {timings['total']:.2f} 秒")
return {"status": "success", "document_id": id, "collection_name": "ragdb", "timings": timings,
return {"status": "success", "userid": orgid, "document_id": id, "collection_name": "ragdb", "timings": timings,
"unique_triples": unique_triples, "message": f"文件 {realpath} 成功嵌入并处理三元组", "status_code": 200}
except Exception as e:
@ -198,7 +198,7 @@ async def file_deleted(params_kw):
id = params_kw.get('id', '')
realpath = params_kw.get('realpath', '')
fiid = params_kw.get('fiid', '')
orgid = await get_orgid_by_id(id)
orgid = await get_orgid_by_id(fiid)
db_type = ''
collection_name = "ragdb" if not db_type else f"ragdb_{db_type}"
try:
@ -264,27 +264,27 @@ async def main():
}
}
DBPools(dbs)
# # 测试 file_uploaded
# print("测试 file_uploaded...")
# test_file_path = "/home/wangmeihua/data/kg.txt"
# test_params_upload = {
# "realpath": test_file_path,
# "fiid": "kb1",
# "id": "1"
# }
# upload_result = await file_uploaded(test_params_upload)
# print(f"file_uploaded 结果: {upload_result}")
# 测试 file_deleted
# 测试 file_uploaded
print("测试 file_uploaded...")
test_file_path = "/home/wangmeihua/data/kg.txt"
print("测试 file_deleted...")
test_params_delete = {
test_params_upload = {
"realpath": test_file_path,
"fiid": "kb1",
"id": "1"
"fiid": "1",
"id": "doc1"
}
delete_result = await file_deleted(test_params_delete)
print(f"file_deleted 结果: {delete_result}")
upload_result = await file_uploaded(test_params_upload)
print(f"file_uploaded 结果: {upload_result}")
# # 测试 file_deleted
# test_file_path = "/home/wangmeihua/data/kg.txt"
# print("测试 file_deleted...")
# test_params_delete = {
# "realpath": test_file_path,
# "fiid": "1",
# "id": "doc1"
# }
# delete_result = await file_deleted(test_params_delete)
# print(f"file_deleted 结果: {delete_result}")
if __name__ == "__main__":