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

Fix chat listing error. (#4270)

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

#4220
### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
Kevin Hu 2024-12-27 16:03:59 +08:00 committed by GitHub
parent 2d17e5aa04
commit 798eb3647c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/apps/sdk/chat.py
View File

@ -25,7 +25,6 @@ from api.utils.api_utils import get_error_data_result, token_required
from api.utils.api_utils import get_result from api.utils.api_utils import get_result
@manager.route('/chats', methods=['POST']) # noqa: F821 @manager.route('/chats', methods=['POST']) # noqa: F821
@token_required @token_required
def create(tenant_id): def create(tenant_id):
@ -44,7 +43,8 @@ def create(tenant_id):
kbs = KnowledgebaseService.get_by_ids(ids) kbs = KnowledgebaseService.get_by_ids(ids)
embd_count = list(set([kb.embd_id for kb in kbs])) embd_count = list(set([kb.embd_id for kb in kbs]))
if len(embd_count) != 1: if len(embd_count) != 1:
return get_result(message='Datasets use different embedding models."',code=settings.RetCode.AUTHENTICATION_ERROR) return get_result(message='Datasets use different embedding models."',
code=settings.RetCode.AUTHENTICATION_ERROR)
req["kb_ids"] = ids req["kb_ids"] = ids
# llm # llm
llm = req.get("llm") llm = req.get("llm")
@ -83,7 +83,9 @@ def create(tenant_id):
req["rerank_id"] = req.get("rerank_id", "") req["rerank_id"] = req.get("rerank_id", "")
if req.get("rerank_id"): if req.get("rerank_id"):
value_rerank_model = ["BAAI/bge-reranker-v2-m3", "maidalun1020/bce-reranker-base_v1"] value_rerank_model = ["BAAI/bge-reranker-v2-m3", "maidalun1020/bce-reranker-base_v1"]
if req["rerank_id"] not in value_rerank_model and not TenantLLMService.query(tenant_id=tenant_id,llm_name=req.get("rerank_id"),model_type="rerank"): if req["rerank_id"] not in value_rerank_model and not TenantLLMService.query(tenant_id=tenant_id,
llm_name=req.get("rerank_id"),
model_type="rerank"):
return get_error_data_result(f"`rerank_model` {req.get('rerank_id')} doesn't exist") return get_error_data_result(f"`rerank_model` {req.get('rerank_id')} doesn't exist")
if not req.get("llm_id"): if not req.get("llm_id"):
req["llm_id"] = tenant.llm_id req["llm_id"] = tenant.llm_id
@ -151,6 +153,7 @@ def create(tenant_id):
res["avatar"] = res.pop("icon") res["avatar"] = res.pop("icon")
return get_result(data=res) return get_result(data=res)
@manager.route('/chats/<chat_id>', methods=['PUT']) # noqa: F821 @manager.route('/chats/<chat_id>', methods=['PUT']) # noqa: F821
@token_required @token_required
def update(tenant_id, chat_id): def update(tenant_id, chat_id):
@ -210,7 +213,9 @@ def update(tenant_id,chat_id):
res = res.to_json() res = res.to_json()
if req.get("rerank_id"): if req.get("rerank_id"):
value_rerank_model = ["BAAI/bge-reranker-v2-m3", "maidalun1020/bce-reranker-base_v1"] value_rerank_model = ["BAAI/bge-reranker-v2-m3", "maidalun1020/bce-reranker-base_v1"]
if req["rerank_id"] not in value_rerank_model and not TenantLLMService.query(tenant_id=tenant_id,llm_name=req.get("rerank_id"),model_type="rerank"): if req["rerank_id"] not in value_rerank_model and not TenantLLMService.query(tenant_id=tenant_id,
llm_name=req.get("rerank_id"),
model_type="rerank"):
return get_error_data_result(f"`rerank_model` {req.get('rerank_id')} doesn't exist") return get_error_data_result(f"`rerank_model` {req.get('rerank_id')} doesn't exist")
if "name" in req: if "name" in req:
if not req.get("name"): if not req.get("name"):
@ -262,6 +267,7 @@ def delete(tenant_id):
DialogService.update_by_id(id, temp_dict) DialogService.update_by_id(id, temp_dict)
return get_result() return get_result()
@manager.route('/chats', methods=['GET']) # noqa: F821 @manager.route('/chats', methods=['GET']) # noqa: F821
@token_required @token_required
def list_chat(tenant_id): def list_chat(tenant_id):
@ -282,7 +288,6 @@ def list_chat(tenant_id):
if not chats: if not chats:
return get_result(data=[]) return get_result(data=[])
list_assts = [] list_assts = []
renamed_dict = {}
key_mapping = {"parameters": "variables", key_mapping = {"parameters": "variables",
"prologue": "opener", "prologue": "opener",
"quote": "show_quote", "quote": "show_quote",
@ -292,6 +297,7 @@ def list_chat(tenant_id):
"do_refer": "show_quotation"} "do_refer": "show_quotation"}
key_list = ["similarity_threshold", "vector_similarity_weight", "top_n", "rerank_id"] key_list = ["similarity_threshold", "vector_similarity_weight", "top_n", "rerank_id"]
for res in chats: for res in chats:
renamed_dict = {}
for key, value in res["prompt_config"].items(): for key, value in res["prompt_config"].items():
new_key = key_mapping.get(key, key) new_key = key_mapping.get(key, key)
renamed_dict[new_key] = value renamed_dict[new_key] = value