KevinHuSh
commited on
Commit
·
7e0ad60
1
Parent(s):
9cba22c
refine API request data processing (#1031)
Browse files### What problem does this PR solve?
#1024
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
- api/apps/api_app.py +15 -14
- rag/llm/rerank_model.py +1 -1
api/apps/api_app.py
CHANGED
@@ -375,19 +375,19 @@ def list_chunks():
|
|
375 |
return get_json_result(
|
376 |
data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR)
|
377 |
|
378 |
-
|
379 |
|
380 |
try:
|
381 |
-
if "doc_name" in
|
382 |
-
tenant_id = DocumentService.get_tenant_id_by_name(
|
383 |
-
doc_id = DocumentService.get_doc_id_by_doc_name(
|
384 |
|
385 |
-
elif "doc_id" in
|
386 |
-
tenant_id = DocumentService.get_tenant_id(
|
387 |
-
doc_id =
|
388 |
else:
|
389 |
return get_json_result(
|
390 |
-
data=False,retmsg="Can't find doc_name or doc_id"
|
391 |
)
|
392 |
|
393 |
res = retrievaler.chunk_list(doc_id=doc_id, tenant_id=tenant_id)
|
@@ -414,8 +414,9 @@ def list_kb_docs():
|
|
414 |
return get_json_result(
|
415 |
data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR)
|
416 |
|
|
|
417 |
tenant_id = objs[0].tenant_id
|
418 |
-
kb_name =
|
419 |
|
420 |
try:
|
421 |
e, kb = KnowledgebaseService.get_by_name(kb_name, tenant_id)
|
@@ -427,11 +428,11 @@ def list_kb_docs():
|
|
427 |
except Exception as e:
|
428 |
return server_error_response(e)
|
429 |
|
430 |
-
page_number = int(
|
431 |
-
items_per_page = int(
|
432 |
-
orderby =
|
433 |
-
desc =
|
434 |
-
keywords =
|
435 |
|
436 |
try:
|
437 |
docs, tol = DocumentService.get_by_kb_id(
|
|
|
375 |
return get_json_result(
|
376 |
data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR)
|
377 |
|
378 |
+
req = request.json
|
379 |
|
380 |
try:
|
381 |
+
if "doc_name" in req.keys():
|
382 |
+
tenant_id = DocumentService.get_tenant_id_by_name(req['doc_name'])
|
383 |
+
doc_id = DocumentService.get_doc_id_by_doc_name(req['doc_name'])
|
384 |
|
385 |
+
elif "doc_id" in req.keys():
|
386 |
+
tenant_id = DocumentService.get_tenant_id(req['doc_id'])
|
387 |
+
doc_id = req['doc_id']
|
388 |
else:
|
389 |
return get_json_result(
|
390 |
+
data=False, retmsg="Can't find doc_name or doc_id"
|
391 |
)
|
392 |
|
393 |
res = retrievaler.chunk_list(doc_id=doc_id, tenant_id=tenant_id)
|
|
|
414 |
return get_json_result(
|
415 |
data=False, retmsg='Token is not valid!"', retcode=RetCode.AUTHENTICATION_ERROR)
|
416 |
|
417 |
+
req = request.json
|
418 |
tenant_id = objs[0].tenant_id
|
419 |
+
kb_name = req.get("kb_name", "").strip()
|
420 |
|
421 |
try:
|
422 |
e, kb = KnowledgebaseService.get_by_name(kb_name, tenant_id)
|
|
|
428 |
except Exception as e:
|
429 |
return server_error_response(e)
|
430 |
|
431 |
+
page_number = int(req.get("page", 1))
|
432 |
+
items_per_page = int(req.get("page_size", 15))
|
433 |
+
orderby = req.get("orderby", "create_time")
|
434 |
+
desc = req.get("desc", True)
|
435 |
+
keywords = req.get("keywords", "")
|
436 |
|
437 |
try:
|
438 |
docs, tol = DocumentService.get_by_kb_id(
|
rag/llm/rerank_model.py
CHANGED
@@ -115,7 +115,7 @@ class YoudaoRerank(DefaultRerank):
|
|
115 |
"maidalun1020", "InfiniFlow"))
|
116 |
|
117 |
def similarity(self, query: str, texts: list):
|
118 |
-
pairs = [(query,truncate(t, self._model.max_length)) for t in texts]
|
119 |
token_count = 0
|
120 |
for _, t in pairs:
|
121 |
token_count += num_tokens_from_string(t)
|
|
|
115 |
"maidalun1020", "InfiniFlow"))
|
116 |
|
117 |
def similarity(self, query: str, texts: list):
|
118 |
+
pairs = [(query, truncate(t, self._model.max_length)) for t in texts]
|
119 |
token_count = 0
|
120 |
for _, t in pairs:
|
121 |
token_count += num_tokens_from_string(t)
|