Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test: use real agent runtime dependencies (#43171)

Asuka Minato723aeb8b1015
diff --git a/api/tests/unit_tests/core/agent/test_base_agent_runner.py b/api/tests/unit_tests/core/agent/test_base_agent_runner.py
index c6808ed39f6..71ad572cce1 100644
--- a/api/tests/unit_tests/core/agent/test_base_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_base_agent_runner.py
@@ -18,11 +18,10 @@ from core.app.app_config.entities import (
PromptTemplateEntity,
)
from core.app.apps.agent_chat.app_config_manager import AgentChatAppConfig
-from core.app.apps.base_app_queue_manager import AppQueueManager
+from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager
from core.app.entities.app_invoke_entities import (
AgentChatAppGenerateEntity,
InvokeFrom,
- ModelConfigWithCredentialsEntity,
)
from core.model_manager import ModelInstance
from core.tools.__base.tool import Tool
@@ -32,17 +31,19 @@ from core.tools.entities.tool_entities import (
ToolDescription,
ToolEntity,
ToolIdentity,
+ ToolParameter,
ToolProviderType,
)
-from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
+from core.tools.utils.dataset_retriever.dataset_multi_retriever_tool import DatasetMultiRetrieverTool
from core.tools.utils.dataset_retriever_tool import DatasetRetrieverTool
from extensions.ext_storage import storage
from extensions.storage.storage_type import StorageType
from graphon.file import FileTransferMethod, FileType
from graphon.model_runtime.entities import LLMUsage, PromptMessageTool
-from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
from models.enums import ConversationFromSource, CreatorUserRole, MessageFileBelongsTo
from models.model import AppMode, AppModelConfig, Conversation, Message, MessageAgentThought, MessageFile, UploadFile
+from tests.tool_fixtures import make_runtime_tool
+from tests.unit_tests.core.model_fixtures import make_model_config
def _message(
@@ -188,11 +189,18 @@ def _tool_entity(name: str) -> ToolEntity:
)
-def _dataset_tool(mocker: MockerFixture, name: str) -> DatasetRetrieverTool:
+def _dataset_tool(name: str) -> DatasetRetrieverTool:
return DatasetRetrieverTool(
entity=_tool_entity(name),
runtime=ToolRuntime(tenant_id="tenant"),
- retrieval_tool=mocker.Mock(spec=DatasetRetrieverBaseTool),
+ retrieval_tool=DatasetMultiRetrieverTool(
+ tenant_id="tenant",
+ dataset_ids=[],
+ return_resource=False,
+ retriever_from="dev",
+ reranking_provider_name="",
+ reranking_model_name="",
+ ),
)
@@ -205,16 +213,30 @@ def database_session(sqlite_session: Session, monkeypatch: pytest.MonkeyPatch) -
@pytest.fixture
-def runner(sqlite_session: Session, mocker: MockerFixture) -> BaseAgentRunner:
+def queue_manager(mocker: MockerFixture) -> MessageBasedAppQueueManager:
+ mocker.patch("core.app.apps.base_app_queue_manager.redis_client.setex")
+ return MessageBasedAppQueueManager(
+ task_id="task",
+ user_id="user",
+ invoke_from=InvokeFrom.DEBUGGER,
+ conversation_id="conv1",
+ app_mode=AppMode.AGENT_CHAT,
+ message_id="msg_current",
+ )
+
+
+def runner(
+ sqlite_session: Session, mocker: MockerFixture, queue_manager: MessageBasedAppQueueManager
+) -> BaseAgentRunner:
app_config = _app_config()
- llm = mocker.Mock(spec=LargeLanguageModel)
- llm.get_model_schema.return_value = None
- model_instance = mocker.Mock(
- spec=ModelInstance,
- model_type_instance=llm,
- model_name="model",
- credentials={},
+ model_config = make_model_config(provider="provider", model="model", mode="chat")
+ model_instance = ModelInstance(
+ provider_model_bundle=model_config.provider_model_bundle,
+ model=model_config.model,
+ credentials=model_config.credentials,
)
+ mocker.patch.object(model_instance.model_type_instance, "get_model_schema", return_value=None)
return BaseAgentRunner(
session=sqlite_session,
@@ -222,15 +244,35 @@ def runner(sqlite_session: Session, mocker: MockerFixture) -> BaseAgentRunner:
application_generate_entity=_app_generate(app_config=app_config),
conversation=_conversation(),
app_config=app_config,
- model_config=ModelConfigWithCredentialsEntity.model_construct(),
+ model_config=model_config,
config=_agent(),
- queue_manager=mocker.Mock(spec=AppQueueManager),
+ queue_manager=queue_manager,
message=_message(),
user_id="user",
model_instance=model_instance,
)
+def _tool(name: str, parameter_names: list[str]) -> Tool:
+ tool = make_runtime_tool(
+ base_params=[
+ ToolParameter(
+ name=parameter_name,
+ label=I18nObject(en_US=parameter_name),
+ human_description=I18nObject(en_US="desc"),
+ llm_description="desc",
+ type=ToolParameter.ToolParameterType.STRING,
+ form=ToolParameter.ToolParameterForm.LLM,
+ required=True,
+ )
+ for parameter_name in parameter_names
+ ],
+ runtime_params=[],
+ )
+ tool.entity.identity.name = name
+ return tool
+
+
class TestRepack:
def test_sets_empty_if_none(self, runner: BaseAgentRunner) -> None:
entity = _app_generate(app_config=_app_config(simple_prompt_template=None))
@@ -243,14 +285,13 @@ class TestRepack:
assert result.app_config.prompt_template.simple_prompt_template == "abc"
-def test_update_prompt_tool_replaces_parameters(runner: BaseAgentRunner, mocker: MockerFixture) -> None:
- tool = mocker.Mock(spec=Tool)
+def test_update_prompt_tool_replaces_parameters(runner: BaseAgentRunner) -> None:
+ tool = _tool("tool", ["p1"])
schema = {
"type": "object",
"properties": {"p1": {"type": "string", "description": "desc"}},
"required": ["p1"],
}
- tool.get_llm_parameters_json_schema.return_value = schema
prompt_tool = PromptMessageTool(name="tool", description="", parameters={"properties": {}, "required": []})
result = runner.update_prompt_message_tool(tool, prompt_tool)
@@ -582,13 +623,12 @@ def test_organize_history_without_tool_name(runner: BaseAgentRunner, sqlite_sess
def test_convert_tool_to_prompt_message_tool(runner: BaseAgentRunner, mocker: MockerFixture) -> None:
tool = _agent_tool("tool1")
- tool_entity = mocker.Mock(spec=Tool, entity=_tool_entity("tool1"))
+ tool_entity = _tool("tool1", ["param1"])
schema = {
"type": "object",
"properties": {"param1": {"type": "string", "description": "desc"}},
"required": ["param1"],
}
- tool_entity.get_llm_parameters_json_schema.return_value = schema
mocker.patch.object(module.ToolManager, "get_agent_tool_runtime", return_value=tool_entity)
prompt_tool, entity = runner._convert_tool_to_prompt_message_tool(tool)
@@ -597,8 +637,8 @@ def test_convert_tool_to_prompt_message_tool(runner: BaseAgentRunner, mocker: Mo
assert prompt_tool.parameters == schema
-def test_convert_dataset_retriever_tool(runner: BaseAgentRunner, mocker: MockerFixture) -> None:
- dataset_tool = _dataset_tool(mocker, "ds")
+def test_convert_dataset_retriever_tool(runner: BaseAgentRunner) -> None:
+ dataset_tool = _dataset_tool("ds")
prompt = runner._convert_dataset_retriever_tool_to_prompt_message_tool(dataset_tool)
@@ -608,10 +648,9 @@ def test_convert_dataset_retriever_tool(runner: BaseAgentRunner, mocker: MockerF
def test_init_prompt_tools_adds_agent_and_dataset_tools(runner: BaseAgentRunner, mocker: MockerFixture) -> None:
agent_tool = _agent_tool("agent_tool")
- agent_runtime = mocker.Mock(spec=Tool, entity=_tool_entity("agent_tool"))
- agent_runtime.get_llm_parameters_json_schema.return_value = {"type": "object", "properties": {}}
+ agent_runtime = _tool("agent_tool", [])
mocker.patch.object(module.ToolManager, "get_agent_tool_runtime", return_value=agent_runtime)
- dataset_tool = _dataset_tool(mocker, "dataset_tool")
+ dataset_tool = _dataset_tool("dataset_tool")
runner.app_config.agent = _agent(agent_tool)
runner.dataset_tools = [dataset_tool]
@@ -635,6 +674,7 @@ def test_init_prompt_tools_skips_deleted_agent_tool(runner: BaseAgentRunner, moc
def test_init_uses_real_session_for_count_and_dependencies(
sqlite_session: Session,
mocker: MockerFixture,
+ queue_manager: MessageBasedAppQueueManager,
) -> None:
sqlite_session.add_all(
[
@@ -649,16 +689,14 @@ def test_init_uses_real_session_for_count_and_dependencies(
"get_dataset_tools",
return_value=["ds_tool"],
)
- llm = mocker.Mock(spec=LargeLanguageModel)
- llm.get_model_schema.return_value = mocker.Mock(
- features=[module.ModelFeature.STREAM_TOOL_CALL, module.ModelFeature.VISION]
- )
- model_instance = mocker.Mock(
- spec=ModelInstance,
- model_type_instance=llm,
- model_name="m",
- credentials="c",
+ model_config = make_model_config(provider="provider", model="m", mode="chat")
+ model_config.model_schema.features = [module.ModelFeature.STREAM_TOOL_CALL, module.ModelFeature.VISION]
+ model_instance = ModelInstance(
+ provider_model_bundle=model_config.provider_model_bundle,
+ model=model_config.model,
+ credentials=model_config.credentials,
)
+ mocker.patch.object(model_instance.model_type_instance, "get_model_schema", return_value=model_config.model_schema)
app_config = _app_config(
dataset=DatasetEntity(
dataset_ids=["d1"],
@@ -677,9 +715,9 @@ def test_init_uses_real_session_for_count_and_dependencies(
application_generate_entity=app_generate,
conversation=_conversation(),
app_config=app_config,
- model_config=ModelConfigWithCredentialsEntity.model_construct(),
+ model_config=model_config,
config=_agent(),
- queue_manager=mocker.Mock(spec=AppQueueManager),
+ queue_manager=queue_manager,
message=message,
user_id="user",
model_instance=model_instance,