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(task): refresh stale embedding model config (#18089)
ump45nose27faeae98388
diff --git a/rag/svr/task_executor_refactor/task_handler.py b/rag/svr/task_executor_refactor/task_handler.pyindex 7d83c1cb8c..de65c52f49 100644--- a/rag/svr/task_executor_refactor/task_handler.py+++ b/rag/svr/task_executor_refactor/task_handler.py@@ -67,6 +67,22 @@ from rag.prompts.generator import run_toc_from_textfrom common import settings+_EMBEDDING_FACTORIES_REQUIRING_API_KEY = frozenset(+ {+ "Azure-OpenAI",+ "OpenAI",+ "OpenAI-API-Compatible",+ }+)+++def _embedding_config_has_missing_credentials(model_config: dict) -> bool:+ """Return whether a credentialed embedding factory has no usable credential."""+ factory = model_config.get("llm_factory")+ has_credential = bool(model_config.get("api_key") or model_config.get("api_key_payload"))+ return factory in _EMBEDDING_FACTORIES_REQUIRING_API_KEY and not has_credential++def _parser_config_compilation_template_ids(parser_config, tenant_id: str) -> list[str]:"""Resolve a doc's parser_config to compile-template ids bylooking up configured groups. Returns ``[]`` if the doc has no@@ -336,11 +352,35 @@ class TaskHandler:try:embd_model_config = get_model_config_by_id(task_tenant_id, LLMType.EMBEDDING, ctx.tenant_embd_id)except LookupError:- embd_model_config = resolve_model_config(task_tenant_id, LLMType.EMBEDDING, task_embedding_id)+ # The cached tenant-model binding may disappear after a task is queued; record the recovery context.+ logging.info(+ "Recovering stale embedding model binding for task %s in tenant %s with model %s",+ ctx.id,+ task_tenant_id,+ task_embedding_id or "tenant-default",+ )+ if task_embedding_id:+ embd_model_config = resolve_model_config(task_tenant_id, LLMType.EMBEDDING, task_embedding_id)+ else:+ embd_model_config = get_tenant_default_model_by_type(task_tenant_id, LLMType.EMBEDDING)+ else:+ if _embedding_config_has_missing_credentials(embd_model_config):+ logging.info(+ "Refreshing embedding model credentials for tenant %s with model %s",+ task_tenant_id,+ task_embedding_id or "tenant-default",+ )+ if task_embedding_id:+ embd_model_config = resolve_model_config(task_tenant_id, LLMType.EMBEDDING, task_embedding_id)+ else:+ # Queued tasks without a model name must follow the current tenant default.+ embd_model_config = get_tenant_default_model_by_type(task_tenant_id, LLMType.EMBEDDING)elif task_embedding_id:embd_model_config = resolve_model_config(task_tenant_id, LLMType.EMBEDDING, task_embedding_id)else:embd_model_config = get_tenant_default_model_by_type(task_tenant_id, LLMType.EMBEDDING)+ if _embedding_config_has_missing_credentials(embd_model_config):+ raise LookupError("Embedding model credentials are missing after resolving the current configuration")embedding_model = LLMBundle(task_tenant_id, embd_model_config, lang=task_language)vts, _ = embedding_model.encode(["ok"])return embedding_model, len(vts[0])diff --git a/test/unit_test/rag/svr/task_executor_refactor/test_task_handler_embedding_model.py b/test/unit_test/rag/svr/task_executor_refactor/test_task_handler_embedding_model.pynew file mode 100644index 0000000000..3e6b64a0e1--- /dev/null+++ b/test/unit_test/rag/svr/task_executor_refactor/test_task_handler_embedding_model.py@@ -0,0 +1,205 @@+#+# Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+#+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.++import logging+from unittest.mock import MagicMock, patch++import pytest++from rag.svr.task_executor_refactor.task_handler import TaskHandler+++async def test_bind_embedding_model_reresolves_empty_stale_tenant_model(task_context):+ task_context.raw_task["tenant_embd_id"] = "stale-instance"+ task_context.raw_task["embd_id"] = "current-embedding@provider"+ handler = TaskHandler(task_context)+ embedding_model = MagicMock()+ embedding_model.encode.return_value = ([[1.0, 2.0]], 1)++ with (+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_model_config_by_id",+ return_value={"llm_factory": "OpenAI-API-Compatible", "api_key": ""},+ ) as get_model_config_by_id,+ patch(+ "rag.svr.task_executor_refactor.task_handler.resolve_model_config",+ return_value={"llm_factory": "OpenAI-API-Compatible", "api_key": "current-key"},+ ) as resolve_model_config,+ patch(+ "rag.svr.task_executor_refactor.task_handler.LLMBundle",+ return_value=embedding_model,+ ) as llm_bundle,+ ):+ result = await handler._bind_embedding_model()++ get_model_config_by_id.assert_called_once_with(+ task_context.tenant_id,+ "embedding",+ "stale-instance",+ )+ resolve_model_config.assert_called_once_with(+ task_context.tenant_id,+ "embedding",+ "current-embedding@provider",+ )+ llm_bundle.assert_called_once_with(+ task_context.tenant_id,+ {"llm_factory": "OpenAI-API-Compatible", "api_key": "current-key"},+ lang=task_context.language,+ )+ assert result == (embedding_model, 2)+++async def test_bind_embedding_model_keeps_nonempty_tenant_model(task_context):+ task_context.raw_task["tenant_embd_id"] = "current-instance"+ handler = TaskHandler(task_context)+ embedding_model = MagicMock()+ embedding_model.encode.return_value = ([[1.0]], 1)++ with (+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_model_config_by_id",+ return_value={"llm_factory": "OpenAI", "api_key": "current-key"},+ ),+ patch("rag.svr.task_executor_refactor.task_handler.resolve_model_config") as resolve_model_config,+ patch(+ "rag.svr.task_executor_refactor.task_handler.LLMBundle",+ return_value=embedding_model,+ ),+ ):+ result = await handler._bind_embedding_model()++ resolve_model_config.assert_not_called()+ assert result == (embedding_model, 1)+++async def test_bind_embedding_model_does_not_retry_failed_stale_model_fallback(task_context):+ task_context.raw_task["tenant_embd_id"] = "stale-instance"+ task_context.raw_task["embd_id"] = "current-embedding@provider"+ handler = TaskHandler(task_context)++ with (+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_model_config_by_id",+ return_value={"llm_factory": "OpenAI-API-Compatible", "api_key": ""},+ ) as get_model_config_by_id,+ patch(+ "rag.svr.task_executor_refactor.task_handler.resolve_model_config",+ side_effect=LookupError("model unavailable"),+ ) as resolve_model_config,+ pytest.raises(LookupError, match="model unavailable"),+ ):+ await handler._bind_embedding_model()++ get_model_config_by_id.assert_called_once_with(+ task_context.tenant_id,+ "embedding",+ "stale-instance",+ )+ resolve_model_config.assert_called_once_with(+ task_context.tenant_id,+ "embedding",+ "current-embedding@provider",+ )+++async def test_bind_embedding_model_keeps_keyless_local_model(task_context):+ """A keyless local embedding model must not be mistaken for stale credentials."""+ task_context.raw_task["tenant_embd_id"] = "local-instance"+ task_context.raw_task["embd_id"] = "other-embedding@provider"+ handler = TaskHandler(task_context)+ embedding_model = MagicMock()+ embedding_model.encode.return_value = ([[1.0, 2.0, 3.0]], 1)+ local_config = {"llm_factory": "Builtin", "api_key": "", "api_base": "http://tei:8080"}++ with (+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_model_config_by_id",+ return_value=local_config,+ ),+ patch("rag.svr.task_executor_refactor.task_handler.resolve_model_config") as resolve_model_config,+ patch("rag.svr.task_executor_refactor.task_handler.get_tenant_default_model_by_type") as get_default_model,+ patch(+ "rag.svr.task_executor_refactor.task_handler.LLMBundle",+ return_value=embedding_model,+ ) as llm_bundle,+ ):+ result = await handler._bind_embedding_model()++ resolve_model_config.assert_not_called()+ get_default_model.assert_not_called()+ llm_bundle.assert_called_once_with(task_context.tenant_id, local_config, lang=task_context.language)+ assert result == (embedding_model, 3)+++async def test_bind_embedding_model_uses_default_for_stale_model_without_name(task_context, caplog):+ """A stale cached model without embd_id must resolve the current tenant default."""+ task_context.raw_task["tenant_embd_id"] = "stale-instance"+ task_context.raw_task["embd_id"] = ""+ handler = TaskHandler(task_context)+ embedding_model = MagicMock()+ embedding_model.encode.return_value = ([[1.0, 2.0]], 1)+ default_config = {"llm_factory": "OpenAI", "api_key": "current-key"}++ with (+ caplog.at_level(logging.INFO),+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_model_config_by_id",+ side_effect=LookupError("stale model binding"),+ ),+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_tenant_default_model_by_type",+ return_value=default_config,+ ) as get_default_model,+ patch(+ "rag.svr.task_executor_refactor.task_handler.LLMBundle",+ return_value=embedding_model,+ ) as llm_bundle,+ ):+ result = await handler._bind_embedding_model()++ get_default_model.assert_called_once_with(task_context.tenant_id, "embedding")+ llm_bundle.assert_called_once_with(task_context.tenant_id, default_config, lang=task_context.language)+ assert (f"Recovering stale embedding model binding for task {task_context.id} in tenant {task_context.tenant_id} with model tenant-default") in caplog.messages+ assert result == (embedding_model, 2)+++async def test_bind_embedding_model_rejects_fallback_with_missing_credentials(task_context):+ """A fallback that still lacks required credentials must fail before model construction."""+ task_context.raw_task["tenant_embd_id"] = "stale-instance"+ task_context.raw_task["embd_id"] = "current-embedding@provider"+ handler = TaskHandler(task_context)++ with (+ patch(+ "rag.svr.task_executor_refactor.task_handler.get_model_config_by_id",+ return_value={"llm_factory": "OpenAI-API-Compatible", "api_key": ""},+ ),+ patch(+ "rag.svr.task_executor_refactor.task_handler.resolve_model_config",+ return_value={"llm_factory": "OpenAI-API-Compatible", "api_key": ""},+ ),+ patch("rag.svr.task_executor_refactor.task_handler.LLMBundle") as llm_bundle,+ pytest.raises(LookupError, match="credentials are missing"),+ ):+ await handler._bind_embedding_model()++ llm_bundle.assert_not_called()