RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix: rm default model in create and display builtin model (#18875)
Lynnb224f338faeb
diff --git a/api/apps/restful_apis/user_api.py b/api/apps/restful_apis/user_api.pyindex bbb3676ffc..673da23f6b 100644--- a/api/apps/restful_apis/user_api.py+++ b/api/apps/restful_apis/user_api.py@@ -429,12 +429,12 @@ def user_register(user_id, user):tenant = {"id": user_id,"name": user["nickname"] + "‘s Kingdom",- "llm_id": settings.CHAT_MDL,- "embd_id": settings.EMBEDDING_MDL,- "asr_id": settings.ASR_MDL,- "parser_ids": settings.PARSERS,- "img2txt_id": settings.VISION_MDL,- "rerank_id": settings.RERANK_MDL,+ "llm_id": "",+ "embd_id": "",+ "asr_id": "",+ "parser_ids": "",+ "img2txt_id": "",+ "rerank_id": "",}usr_tenant = {"tenant_id": user_id,diff --git a/api/apps/services/models_api_service.py b/api/apps/services/models_api_service.pyindex 1daf0b28c7..77b35d847f 100644--- a/api/apps/services/models_api_service.py+++ b/api/apps/services/models_api_service.py@@ -308,48 +308,40 @@ def list_tenant_added_models(tenant_id: str, model_type_filter: str = None):model_type_filter_bin = calculate_model_type(model_type_filter.lower()) if model_type_filter else None- providers = TenantModelProviderService.get_by_tenant_id(tenant_id)- if not providers:- return True, []-- provider_ids = [provider.id for provider in providers]- instances = TenantModelInstanceService.get_by_provider_ids(provider_ids)- if not instances:- return True, []- provider_instance_map: dict = {}- provider_info_map = {provider.id: provider for provider in providers}- instance_info_map = {instance.id: instance for instance in instances}- for provider_instance_record in instances:- provider_name = provider_info_map[provider_instance_record.provider_id].provider_name if provider_info_map.get(provider_instance_record.provider_id) else ""- if provider_instance_map.get(provider_name):- provider_instance_map[provider_name].append(provider_instance_record)- else:- provider_instance_map[provider_name] = [provider_instance_record]-- model_records = TenantModelService.get_models_by_provider_ids_and_instance_ids(provider_ids, list({instance.id for instance in instances}))- target_type_records = [record for record in model_records if record.model_type & model_type_filter_bin] if model_type_filter_bin else model_records-model_rank_map: dict = {}for factory in FACTORY_LLM_INFOS:for llm in factory.get("llm", []):model_rank_map[(factory["name"], llm["llm_name"])] = _to_int(llm.get("rank", 500))factory_rank_mapping = {factory["name"]: -_to_int(factory.get("rank", "500")) for factory in FACTORY_LLM_INFOS}- added_models = [- {- "model_id": model_record.id,- "tenant_id": provider_info_map[model_record.provider_id].tenant_id,- "tenant_name": tenant.name,- "model_type": get_model_type_human(model_record.model_type),- "name": model_record.model_name,- "provider_id": model_record.provider_id,- "provider_name": provider_info_map[model_record.provider_id].provider_name,- "instance_id": model_record.instance_id,- "instance_name": instance_info_map[model_record.instance_id].instance_name,- "rank": model_rank_map.get((provider_info_map[model_record.provider_id].provider_name, model_record.model_name), 500),- }- for model_record in target_type_records- ]+ added_models = []++ providers = TenantModelProviderService.get_by_tenant_id(tenant_id)+ if providers:+ provider_ids = [provider.id for provider in providers]+ instances = TenantModelInstanceService.get_by_provider_ids(provider_ids)+ if instances:+ provider_info_map = {provider.id: provider for provider in providers}+ instance_info_map = {instance.id: instance for instance in instances}++ model_records = TenantModelService.get_models_by_provider_ids_and_instance_ids(provider_ids, list({instance.id for instance in instances}))+ target_type_records = [record for record in model_records if record.model_type & model_type_filter_bin] if model_type_filter_bin else model_records++ added_models = [+ {+ "model_id": model_record.id,+ "tenant_id": provider_info_map[model_record.provider_id].tenant_id,+ "tenant_name": tenant.name,+ "model_type": get_model_type_human(model_record.model_type),+ "name": model_record.model_name,+ "provider_id": model_record.provider_id,+ "provider_name": provider_info_map[model_record.provider_id].provider_name,+ "instance_id": model_record.instance_id,+ "instance_name": instance_info_map[model_record.instance_id].instance_name,+ "rank": model_rank_map.get((provider_info_map[model_record.provider_id].provider_name, model_record.model_name), 500),+ }+ for model_record in target_type_records+ ]# Add TEI Builtin embedding model if configuredcompose_profiles = os.getenv("COMPOSE_PROFILES", "")diff --git a/test/unit_test/api/apps/services/test_models_api_service_list_tenant_added_models.py b/test/unit_test/api/apps/services/test_models_api_service_list_tenant_added_models.pyindex 577a5c92cf..dbcdfc2a3a 100644--- a/test/unit_test/api/apps/services/test_models_api_service_list_tenant_added_models.py+++ b/test/unit_test/api/apps/services/test_models_api_service_list_tenant_added_models.py@@ -294,6 +294,65 @@ def test_list_tenant_added_models_still_works_for_plain_model_names(monkeypatch)# it at that time.+def test_list_tenant_added_models_returns_tei_builtin_without_providers(monkeypatch):+ """A tenant with no added providers still sees the TEI Builtin model.++ When the `tei-*` compose profile is enabled, the tenant gets the default+ embedding model (TEI_MODEL) even if it has never added any model provider.+ This guards against the regression where `list_tenant_added_models` early+ returned `[]` before appending the synthesized Builtin model.+ """+ monkeypatch.setenv("COMPOSE_PROFILES", "elasticsearch,cpu,metadata-mysql,tei-cpu")+ monkeypatch.setenv("TEI_MODEL", "BAAI/bge-small-en-v1.5")+ module, stubs = _load_module(monkeypatch, tenant_model_records=[])+ monkeypatch.setattr(stubs["tenant_model_provider_service"].TenantModelProviderService, "get_by_tenant_id", lambda tenant_id: [])+ monkeypatch.setattr(stubs["tenant_model_instance_service"].TenantModelInstanceService, "get_by_provider_ids", lambda provider_ids: [])++ success, result = module.list_tenant_added_models("tenant-1", "embedding")++ assert success is True+ assert len(result) == 1+ assert result[0]["provider_name"] == "Builtin"+ assert result[0]["name"] == "BAAI/bge-small-en-v1.5"+ assert result[0]["tenant_id"] == "tenant-1"+++def test_list_tenant_added_models_returns_tei_builtin_without_type_filter(monkeypatch):+ """The TEI Builtin model is listed even when no type filter is passed."""+ monkeypatch.setenv("COMPOSE_PROFILES", "tei-gpu")+ monkeypatch.setenv("TEI_MODEL", "BAAI/bge-small-en-v1.5")+ module, stubs = _load_module(monkeypatch, tenant_model_records=[])+ monkeypatch.setattr(stubs["tenant_model_provider_service"].TenantModelProviderService, "get_by_tenant_id", lambda tenant_id: [])+ monkeypatch.setattr(stubs["tenant_model_instance_service"].TenantModelInstanceService, "get_by_provider_ids", lambda provider_ids: [])++ success, result = module.list_tenant_added_models("tenant-1")++ assert success is True+ assert len(result) == 1+ assert result[0]["provider_name"] == "Builtin"+ assert result[0]["name"] == "BAAI/bge-small-en-v1.5"+++def test_list_tenant_added_models_appends_tei_builtin_after_provider_models(monkeypatch):+ """The TEI Builtin model is appended after the tenant's own models."""+ monkeypatch.setenv("COMPOSE_PROFILES", "elasticsearch,cpu,metadata-mysql,tei-cpu")+ monkeypatch.setenv("TEI_MODEL", "BAAI/bge-small-en-v1.5")+ record = _make_model_record("text-embedding-nomic-embed-text-v1.5@q8_0")+ module, _ = _load_module(monkeypatch, tenant_model_records=[record])++ success, result = module.list_tenant_added_models("tenant-1", "embedding")++ assert success is True+ assert len(result) == 2+ names = {m["name"] for m in result}+ assert names == {"text-embedding-nomic-embed-text-v1.5@q8_0", "BAAI/bge-small-en-v1.5"}+ tei = [m for m in result if m["provider_name"] == "Builtin"][0]+ assert tei["name"] == "BAAI/bge-small-en-v1.5"++@pytest.mark.p2def test_get_model_info_two_part_embedded_at(monkeypatch):"""Two-part default_model is parsed as model@provider (suffix wins).