zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-10 21:55:42 +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)

70
api/apps/services/models_api_service.py
View File

@@ -16,7 +16,7 @@
import logging
import os
from api.db.joint_services.tenant_model_service import ensure_mineru_from_env, ensure_opendataloader_from_env, ensure_paddleocr_from_env
from api.db.joint_services.tenant_model_service import ensure_mineru_from_env, ensure_opendataloader_from_env, ensure_paddleocr_from_env, resolve_model_id
from api.db.services.tenant_model_instance_service import TenantModelInstanceService
from api.db.services.tenant_model_provider_service import TenantModelProviderService
from api.db.services.tenant_model_service import TenantModelService
@@ -36,6 +36,16 @@ MODEL_TYPE_TO_FIELD = {
"ocr": "ocr_id",
}
MODEL_TYPE_TO_TENANT_ID_FIELD = {
"chat": "tenant_llm_id",
"embedding": "tenant_embd_id",
"rerank": "tenant_rerank_id",
"asr": "tenant_asr_id",
"vision": "tenant_img2txt_id",
"tts": "tenant_tts_id",
"ocr": "tenant_ocr_id",
}
MODEL_TAG_TO_TYPE = {
"chat": "chat",
"embedding": "embedding",
@@ -61,7 +71,7 @@ def _factory_model_types(llm: dict) -> list[str]:
return [model_type] if model_type else []
def _get_model_info(tenant_id: str, default_model: str, model_type: str):
def _get_model_info(tenant_id: str, default_model: str, model_type: str, model_id: str = ""):
"""
Parse a composite model string (modelName@instanceName@providerName or modelName@providerName)
and validate that the provider, instance, and model exist.
@@ -90,6 +100,7 @@ def _get_model_info(tenant_id: str, default_model: str, model_type: str):
# Special case: OCR with infiniflow@default@deepdoc is always enabled
if model_type == "ocr" and provider_name == "infiniflow" and instance_name == "default" and model_name == "deepdoc":
return {
"model_id": model_id,
"model_provider": provider_name,
"model_instance": instance_name,
"model_name": model_name,
@@ -102,6 +113,7 @@ def _get_model_info(tenant_id: str, default_model: str, model_type: str):
tei_model = os.getenv("TEI_MODEL", "")
if model_type == "embedding" and "tei-" in compose_profiles and tei_model and model_name == tei_model and (not provider_name or provider_name == "Builtin"):
return {
"model_id": model_id,
"model_provider": "Builtin",
"model_instance": "default",
"model_name": model_name,
@@ -130,7 +142,7 @@ def _get_model_info(tenant_id: str, default_model: str, model_type: str):
logging.warning(f"Model '{model_name}' is disabled")
return None
return {"model_provider": provider_name, "model_instance": instance_name, "model_name": model_name, "model_type": model_type, "enable": True}
return {"model_id": model_id, "model_provider": provider_name, "model_instance": instance_name, "model_name": model_name, "model_type": model_type, "enable": True}
def _check_model_available(tenant_id: str, provider_name: str, instance_name: str, model_name: str, model_type: str):
@@ -200,49 +212,81 @@ def list_tenant_default_models(tenant_id: str):
default_model = getattr(tenant, field_name, None)
if not default_model:
continue
model_info = _get_model_info(tenant_id, default_model, model_type)
tenant_model_id = getattr(tenant, MODEL_TYPE_TO_TENANT_ID_FIELD[model_type], None)
model_info = _get_model_info(tenant_id, default_model, model_type, tenant_model_id)
if model_info:
models.append(model_info)
return True, {"models": models}
def set_tenant_default_models(tenant_id: str, model_provider: str, model_instance: str, model_name: str, model_type: str):
def set_tenant_default_models(tenant_id: str, model_provider: str, model_instance: str, model_name: str, model_type: str, model_id: str = ""):
"""
Set or clear a tenant default model.
If model_provider, model_instance, and model_name are all provided,
validates the model and sets it as the default.
If all three are empty, clears the default for the given model type.
If model_id is provided, resolves it to provider/instance/name and uses it.
Otherwise falls back to the legacy model_provider/model_instance/model_name triplet.
If all model selectors are empty, clears the default for the given model type.
:param tenant_id: tenant ID
:param model_provider: provider name
:param model_instance: instance name
:param model_name: model name
:param model_type: model type (chat, embedding, rerank, asr, vision, tts, ocr)
:param model_id: tenant_model id
:return: (success, result_or_error_message)
"""
field_name = MODEL_TYPE_TO_FIELD.get(model_type)
if not field_name:
return False, f"model type '{model_type}' is invalid"
tenant_field_name = MODEL_TYPE_TO_TENANT_ID_FIELD.get(model_type)
e, tenant = TenantService.get_by_id(tenant_id)
if not e:
return False, "Tenant not found"
if not model_provider and not model_instance and not model_name:
# Clear the default model
default_model = ""
tenant_model_id = None
if model_id:
model_ok, model_obj = TenantModelService.get_by_id(model_id)
if not model_ok:
return False, f"model_id '{model_id}' not found"
provider_ok, provider_obj = TenantModelProviderService.get_by_id(model_obj.provider_id)
if not provider_ok:
return False, f"Provider id '{model_obj.provider_id}' not found for model_id '{model_id}'"
if provider_obj.tenant_id != tenant_id:
return False, "Permission denied"
instance_ok, instance_obj = TenantModelInstanceService.get_by_id(model_obj.instance_id)
if not instance_ok:
return False, f"Instance id '{model_obj.instance_id}' not found for model_id '{model_id}'"
normalized_model_type = MODEL_TAG_TO_TYPE.get(model_type, model_type)
if normalized_model_type not in get_model_type_human(model_obj.model_type):
return False, f"Model '{model_obj.model_name}' isn't a {model_type} model"
if model_obj.status != ActiveStatusEnum.ACTIVE.value:
return False, f"Model '{model_obj.model_name}' isn't available"
default_model = f"{model_obj.model_name}@{instance_obj.instance_name}@{provider_obj.provider_name}"
tenant_model_id = model_id
elif model_provider and model_instance and model_name:
# Validate and set the default model
success, msg = _check_model_available(tenant_id, model_provider, model_instance, model_name, model_type)
if not success:
return False, msg
default_model = f"{model_name}@{model_instance}@{model_provider}"
normalized_model_type = MODEL_TAG_TO_TYPE.get(model_type, model_type)
try:
tenant_model_id = resolve_model_id(tenant_id, normalized_model_type, default_model)
except LookupError as exc:
return False, str(exc)
else:
return False, "model_provider, model_instance and model_name must be specified together"
# Clear the default model
default_model = ""
tenant_model_id = None
TenantService.update_by_id(tenant_id, {field_name: default_model})
update_fields = {field_name: default_model, tenant_field_name: tenant_model_id}
TenantService.update_by_id(tenant_id, update_fields)
return True, "success"

28
api/db/services/compilation_template_service.py
View File

@@ -37,9 +37,9 @@ class CompilationTemplateService(CommonService):
from api.db.services.user_service import TenantService
ok, tenant = TenantService.get_by_id(tenant_id)
if ok and getattr(tenant, "llm_id", None):
if ok and getattr(tenant, "tenant_llm_id", None):
config = dict(config)
config["llm_id"] = tenant.llm_id
config["llm_id"] = tenant.tenant_llm_id
except Exception:
logging.exception(
"compilation_template: llm_id default-fill lookup failed for tenant=%s",
@@ -91,9 +91,9 @@ class CompilationTemplateService(CommonService):
from api.db.services.user_service import TenantService
ok, tenant = TenantService.get_by_id(tenant_id)
if ok and getattr(tenant, "llm_id", None):
if ok and getattr(tenant, "tenant_llm_id", None):
config = dict(config)
config["llm_id"] = tenant.llm_id
config["llm_id"] = tenant.tenant_llm_id
except Exception:
logging.exception(
"compilation_template: llm_id lazy-fill lookup failed for tenant=%s",
@@ -246,7 +246,11 @@ class CompilationTemplateService(CommonService):
"""
wiki_dir = os.path.join(
get_project_base_directory(),
"api", "db", "init_data", "compilation_templates", "wiki",
"api",
"db",
"init_data",
"compilation_templates",
"wiki",
)
if not os.path.exists(wiki_dir):
logging.warning("Missing wiki presets directory: %s", wiki_dir)
@@ -269,10 +273,12 @@ class CompilationTemplateService(CommonService):
continue
# Missing fields degrade to empty strings so the frontend
# doesn't have to null-check every row.
presets.append({
"id": os.path.splitext(filename)[0],
"topic": str(doc.get("topic") or "").strip(),
"instruction": str(doc.get("instruction") or ""),
"page_example": str(doc.get("page_example") or ""),
})
presets.append(
{
"id": os.path.splitext(filename)[0],
"topic": str(doc.get("topic") or "").strip(),
"instruction": str(doc.get("instruction") or ""),
"page_example": str(doc.get("page_example") or ""),
}
)
return presets

7
api/db/services/user_service.py
View File

@@ -178,12 +178,19 @@ class TenantService(CommonService):
cls.model.id.alias("tenant_id"),
cls.model.name,
cls.model.llm_id,
cls.model.tenant_llm_id,
cls.model.embd_id,
cls.model.tenant_embd_id,
cls.model.rerank_id,
cls.model.tenant_rerank_id,
cls.model.asr_id,
cls.model.tenant_asr_id,
cls.model.img2txt_id,
cls.model.tenant_img2txt_id,
cls.model.tts_id,
cls.model.tenant_tts_id,
cls.model.ocr_id,
cls.model.tenant_ocr_id,
cls.model.parser_ids,
UserTenant.role,
]