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 llm.py (#19037)
qinling0210cb158785a9de
diff --git a/agent/component/llm.py b/agent/component/llm.pyindex e3e56c0300..a25a2c476c 100644--- a/agent/component/llm.py+++ b/agent/component/llm.py@@ -18,22 +18,23 @@ import jsonimport loggingimport osimport re+from collections.abc import AsyncGeneratorfrom copy import deepcopy-from typing import Any, AsyncGenerator-import json_repairfrom functools import partial-from common.constants import LLMType-from api.db.services.dialog_service import _stream_with_think_delta-from api.db.services.llm_service import LLMBundle+from typing import Any++import json_repair++from agent.component.base import ComponentBase, ComponentParamBasefrom api.db.joint_services.tenant_model_service import (- get_model_config_from_provider_instance,- get_model_type_by_name,resolve_model_config,resolve_model_type,)-from agent.component.base import ComponentBase, ComponentParamBase+from api.db.services.dialog_service import _stream_with_think_delta+from api.db.services.llm_service import LLMBundlefrom common.connection_utils import timeout-from rag.prompts.generator import tool_call_summary, message_fit_in, citation_prompt, structured_output_prompt+from common.constants import LLMType+from rag.prompts.generator import citation_prompt, message_fit_in, structured_output_prompt, tool_call_summaryclass LLMParam(ComponentParamBase):@@ -97,9 +98,9 @@ class LLM(ComponentBase):def __init__(self, canvas, component_id, param: ComponentParamBase):super().__init__(canvas, component_id, param)- model_types = get_model_type_by_name(self._canvas.get_tenant_id(), self._param.llm_id)+ model_types = resolve_model_type(self._canvas.get_tenant_id(), self._param.llm_id)model_type = "chat" if "chat" in model_types else model_types[0]- chat_model_config = get_model_config_from_provider_instance(self._canvas.get_tenant_id(), model_type, self._param.llm_id)+ chat_model_config = resolve_model_config(self._canvas.get_tenant_id(), model_type, self._param.llm_id)self.chat_mdl = LLMBundle(self._canvas.get_tenant_id(), chat_model_config, max_retries=self._param.max_retries, retry_interval=self._param.delay_after_error)self.imgs = []@@ -380,7 +381,7 @@ class LLM(ComponentBase):return await self.chat_mdl.async_chat(msg[0]["content"], msg[1:], self._param.gen_conf(), **kwargs)return await self.chat_mdl.async_chat(msg[0]["content"], msg[1:], self._param.gen_conf(), images=self.imgs, **kwargs)- async def _generate_streamly(self, msg: list[dict], **kwargs) -> AsyncGenerator[str, None]:+ async def _generate_streamly(self, msg: list[dict], **kwargs) -> AsyncGenerator[str]:stream_kwargs = {"images": self.imgs} if self.imgs else {}stream_kwargs.update(kwargs)stream = self.chat_mdl.async_chat_streamly_delta(msg[0]["content"], msg[1:], self._param.gen_conf(), **stream_kwargs)