zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-28 11:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: align model default handling (#16782)

Browse Source
This commit is contained in:
buua436
2026-07-10 10:34:19 +08:00
committed by GitHub
parent d48a5622df
commit 74bbbba3e0
15 changed files with 169 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/apps/restful_apis/chat_api.py
View File

@@ -300,7 +300,7 @@ async def _validate_rerank_id(rerank_id, tenant_id):
await thread_pool_exec(
resolve_model_config,
tenant_id=tenant_id,
model_name=rerank_id,
model_ref=rerank_id,
model_type="rerank",
)
except Exception as e:
@@ -399,9 +399,9 @@ async def create():
# return get_data_error_result(message=err)
req.setdefault("kb_ids", [])
req.setdefault("llm_id", tenant.llm_id)
req.setdefault("llm_id", tenant.tenant_llm_id)
if req["llm_id"] is None:
req["llm_id"] = tenant.llm_id
req["llm_id"] = tenant.tenant_llm_id
req.setdefault("llm_setting", {})
req.setdefault("description", "A helpful Assistant")
req.setdefault("top_n", 6)

10
api/apps/restful_apis/models_api.py
View File

@@ -75,6 +75,8 @@ def get_added_models(tenant_id: str):
type: string
model_name:
type: string
model_id:
type: string
model_type:
type: string
enable:
@@ -139,6 +141,8 @@ def get_default_models(tenant_id: str):
type: string
model_name:
type: string
model_id:
type: string
model_type:
type: string
enable:
@@ -190,6 +194,9 @@ async def set_default_models(tenant_id: str):
model_name:
type: string
description: Model name. Required when setting a model; omit to clear.
model_id:
type: string
description: Tenant model id. If provided, it takes precedence over model_provider/model_instance/model_name.
model_type:
type: string
description: "Model type: chat, embedding, rerank, asr, vision, tts, ocr"
@@ -206,10 +213,11 @@ async def set_default_models(tenant_id: str):
model_provider = data.get("model_provider", "")
model_instance = data.get("model_instance", "")
model_name = data.get("model_name", "")
model_id = data.get("model_id", "")
model_type = data["model_type"]
try:
success, msg = models_api_service.set_tenant_default_models(tenant_id, model_provider, model_instance, model_name, model_type)
success, msg = models_api_service.set_tenant_default_models(tenant_id, model_provider, model_instance, model_name, model_type, model_id)
if success:
logging.info(f"success: {success}, msg: {msg}")
return get_result(message=msg)