AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-08-13 20:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

refine API request data processing (#1031)

Browse Source 
### What problem does this PR solve?

#1024 

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
KevinHuSh 2024-06-03 09:02:25 +08:00 committed by GitHub
parent cdea1d0a85
commit cc064040a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/apps/api_app.py
View File

@ -375,19 +375,19 @@ def list_chunks():
return get_json_result( return get_json_result(
data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR) data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR)
form_data = request.form req = request.json
try: try:
if "doc_name" in form_data.keys(): if "doc_name" in req.keys():
tenant_id = DocumentService.get_tenant_id_by_name(form_data['doc_name']) tenant_id = DocumentService.get_tenant_id_by_name(req['doc_name'])
doc_id = DocumentService.get_doc_id_by_doc_name(form_data['doc_name']) doc_id = DocumentService.get_doc_id_by_doc_name(req['doc_name'])
elif "doc_id" in form_data.keys(): elif "doc_id" in req.keys():
tenant_id = DocumentService.get_tenant_id(form_data['doc_id']) tenant_id = DocumentService.get_tenant_id(req['doc_id'])
doc_id = form_data['doc_id'] doc_id = req['doc_id']
else: else:
return get_json_result( return get_json_result(
data=False,retmsg="Can't find doc_name or doc_id" data=False, retmsg="Can't find doc_name or doc_id"
) )
res = retrievaler.chunk_list(doc_id=doc_id, tenant_id=tenant_id) res = retrievaler.chunk_list(doc_id=doc_id, tenant_id=tenant_id)
@ -414,8 +414,9 @@ def list_kb_docs():
return get_json_result( return get_json_result(
data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR) data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR)
req = request.json
tenant_id = objs[0].tenant_id tenant_id = objs[0].tenant_id
kb_name = request.form.get("kb_name").strip() kb_name = req.get("kb_name", "").strip()
try: try:
e, kb = KnowledgebaseService.get_by_name(kb_name, tenant_id) e, kb = KnowledgebaseService.get_by_name(kb_name, tenant_id)
@ -427,11 +428,11 @@ def list_kb_docs():
except Exception as e: except Exception as e:
return server_error_response(e) return server_error_response(e)
page_number = int(request.form.get("page", 1)) page_number = int(req.get("page", 1))
items_per_page = int(request.form.get("page_size", 15)) items_per_page = int(req.get("page_size", 15))
orderby = request.form.get("orderby", "create_time") orderby = req.get("orderby", "create_time")
desc = request.form.get("desc", True) desc = req.get("desc", True)
keywords = request.form.get("keywords", "") keywords = req.get("keywords", "")
try: try:
docs, tol = DocumentService.get_by_kb_id( docs, tol = DocumentService.get_by_kb_id(

2
rag/llm/rerank_model.py
View File

@ -115,7 +115,7 @@ class YoudaoRerank(DefaultRerank):
"maidalun1020", "InfiniFlow")) "maidalun1020", "InfiniFlow"))
def similarity(self, query: str, texts: list): def similarity(self, query: str, texts: list):
pairs = [(query,truncate(t, self._model.max_length)) for t in texts] pairs = [(query, truncate(t, self._model.max_length)) for t in texts]
token_count = 0 token_count = 0
for _, t in pairs: for _, t in pairs:
token_count += num_tokens_from_string(t) token_count += num_tokens_from_string(t)