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 generation events and trace managers (#43175)

Asuka Minatod28b99ef6d94
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
index abfc76afa05..bdc6d48e945 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
@@ -1,7 +1,6 @@
import pytest
from pytest_mock import MockerFixture
-import core.app.apps.pipeline.pipeline_queue_manager as module
from core.app.apps.base_app_queue_manager import PublishFrom
from core.app.apps.exc import GenerateTaskStoppedError
from core.app.apps.pipeline.pipeline_queue_manager import PipelineQueueManager
@@ -9,6 +8,7 @@ from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import (
QueueErrorEvent,
QueueMessageEndEvent,
+ QueuePingEvent,
QueueStopEvent,
QueueWorkflowFailedEvent,
QueueWorkflowPartialSuccessEvent,
@@ -53,6 +53,6 @@ def test_publish_non_stop_event_no_stop_listen(mocker: MockerFixture):
manager.stop_listen = mocker.MagicMock()
manager._is_stopped = mocker.MagicMock(return_value=False)
- non_stop_event = mocker.MagicMock(spec=module.AppQueueEvent)
+ non_stop_event = QueuePingEvent()
manager._publish(non_stop_event, PublishFrom.TASK_PIPELINE)
manager.stop_listen.assert_not_called()
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py
index 90016228bdd..4e1e01780dd 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py
@@ -14,7 +14,7 @@ from core.app.apps.draft_variable_saver import DraftVariableSaverFactory
from core.app.apps.workflow.app_generator import WorkflowAppGenerator
from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, PauseStatePersistenceLayer
-from core.ops.ops_trace_manager import TraceQueueManager
+from core.ops.ops_trace_manager import OpsTraceManager, TraceQueueManager
from core.repositories import SQLAlchemyWorkflowExecutionRepository, SQLAlchemyWorkflowNodeExecutionRepository
from graphon.enums import WorkflowExecutionStatus
from graphon.runtime import GraphRuntimeState, VariablePool
@@ -25,6 +25,14 @@ from models.workflow import Workflow, WorkflowKind, WorkflowNodeExecutionTrigger
from tests.unit_tests.model_factories import make_workflow
[email protected](autouse=True)
+def disable_trace_delivery(monkeypatch: pytest.MonkeyPatch) -> None:
+ """Construct real trace managers without provider lookup or background delivery."""
+ monkeypatch.setattr(OpsTraceManager, "get_ops_trace_instance", lambda app_id: None)
+ monkeypatch.setattr(TraceQueueManager, "start_timer", lambda self: None)
+ monkeypatch.setattr("core.telemetry.gateway.is_enterprise_telemetry_enabled", lambda: False)
+
+
def _workflow(
*,
workflow_id: str = "workflow",
@@ -94,7 +102,7 @@ def _generate_entity(
user_id=end_user.id,
stream=stream,
invoke_from=invoke_from,
- trace_manager=MagicMock(spec=TraceQueueManager),
+ trace_manager=TraceQueueManager(app_id=app.id, user_id=end_user.id),
workflow_execution_id="run",
)
@@ -197,10 +205,6 @@ def test_generate_includes_parent_trace_context_in_extras(
monkeypatch.setattr(
"core.app.apps.workflow.app_generator.file_factory.build_from_mappings", lambda *args, **kwargs: []
)
- monkeypatch.setattr(
- "core.app.apps.workflow.app_generator.TraceQueueManager",
- MagicMock(return_value=MagicMock(spec=TraceQueueManager)),
- )
repository_tenant_ids: dict[str, str] = {}
workflow_execution_factory = app_generator_module.DifyCoreRepositoryFactory.create_workflow_execution_repository
workflow_node_execution_factory = (
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py b/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py
index c3d2d2c9077..50b6122b141 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py
@@ -14,12 +14,21 @@ from core.app.apps.exc import GenerateTaskStoppedError
from core.app.apps.workflow import app_generator as app_generator_module
from core.app.apps.workflow.app_generator import WorkflowAppGenerator
from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
-from core.ops.ops_trace_manager import TraceQueueManager
+from core.ops.ops_trace_manager import OpsTraceManager, TraceQueueManager
from models.enums import EndUserType
from models.model import App, AppMode, EndUser
from models.snippet import CustomizedSnippet
from models.workflow import Workflow, WorkflowKind, WorkflowType
+
[email protected](autouse=True)
+def disable_trace_delivery(monkeypatch: pytest.MonkeyPatch) -> None:
+ """Construct real trace managers without provider lookup or background delivery."""
+ monkeypatch.setattr(OpsTraceManager, "get_ops_trace_instance", lambda app_id: None)
+ monkeypatch.setattr(TraceQueueManager, "start_timer", lambda self: None)
+ monkeypatch.setattr("core.telemetry.gateway.is_enterprise_telemetry_enabled", lambda: False)
+
+
TENANT_ID = "00000000-0000-0000-0000-000000000001"
OTHER_TENANT_ID = "00000000-0000-0000-0000-000000000002"
APP_ID = "00000000-0000-0000-0000-000000000003"
@@ -492,7 +501,6 @@ class TestWorkflowAppGeneratorGenerate:
app = _persist_app(sqlite_generator_session)
workflow = _persist_workflow(sqlite_generator_session)
user = _persist_end_user(sqlite_generator_session)
- monkeypatch.setattr(app_generator_module, "TraceQueueManager", Mock(return_value=Mock(spec=TraceQueueManager)))
execute = Mock(return_value={"ok": True})
monkeypatch.setattr(generator, "_generate", execute)
return generator, app, workflow, user, execute
diff --git a/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py b/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
index c14ac33f571..bdf6bffdb14 100644
--- a/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
+++ b/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
@@ -5,11 +5,14 @@ from unittest.mock import MagicMock
import pytest
from pytest_mock import MockerFixture
-from core.app.entities.queue_entities import QueueNodeSucceededEvent, QueueTextChunkEvent
+from core.app.entities.queue_entities import QueueNodeSucceededEvent, QueueTextChunkEvent, WorkflowQueueMessage
from core.base.tts.app_generator_tts_publisher import AppGeneratorTTSPublisher, AudioTrunk
from core.plugin.entities.plugin_daemon import TTSAudioChunk
+from graphon.enums import BuiltinNodeTypes
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from graphon.model_runtime.errors.invoke import InvokeBadRequestError
+from libs.datetime_utils import naive_utc_now
+from models.model import AppMode
@pytest.fixture
@@ -35,14 +38,25 @@ def patch_threads(mocker: MockerFixture):
mocker.patch("threading.Thread.start", return_value=None)
-def _text_event(text: str) -> MagicMock:
- event = MagicMock()
- event.event = MagicMock(spec=QueueTextChunkEvent)
- event.event.text = text
- return event
+def _text_event(text: str) -> WorkflowQueueMessage:
+ return WorkflowQueueMessage(task_id="task", app_mode=AppMode.WORKFLOW, event=QueueTextChunkEvent(text=text))
-def _run(publisher: AppGeneratorTTSPublisher, *messages: MagicMock) -> None:
+def _node_event(outputs: dict[str, object] | None) -> WorkflowQueueMessage:
+ event = QueueNodeSucceededEvent(
+ node_execution_id="execution",
+ node_id="node",
+ node_type=BuiltinNodeTypes.END,
+ start_at=naive_utc_now(),
+ outputs=outputs or {},
+ )
+ if outputs is None:
+ # Preserve the publisher's legacy null-output guard beyond the current schema.
+ event = event.model_copy(update={"outputs": None})
+ return WorkflowQueueMessage(task_id="task", app_mode=AppMode.WORKFLOW, event=event)
+
+
+def _run(publisher: AppGeneratorTTSPublisher, *messages: WorkflowQueueMessage | MagicMock) -> None:
for message in messages:
publisher._msg_queue.put(message)
publisher._msg_queue.put(None)
@@ -254,9 +268,7 @@ class TestAppGeneratorTTSPublisher:
def test_runtime_handles_node_succeeded_output(self, mock_model_manager, mock_model_instance: MagicMock):
publisher = AppGeneratorTTSPublisher("tenant", "voice1")
- event = MagicMock()
- event.event = MagicMock(spec=QueueNodeSucceededEvent)
- event.event.outputs = {"output": "Hello world."}
+ event = _node_event({"output": "Hello world."})
_run(publisher, event)
@@ -264,9 +276,7 @@ class TestAppGeneratorTTSPublisher:
def test_runtime_ignores_node_succeeded_without_output(self, mock_model_manager, mock_model_instance: MagicMock):
publisher = AppGeneratorTTSPublisher("tenant", "voice1")
- event = MagicMock()
- event.event = MagicMock(spec=QueueNodeSucceededEvent)
- event.event.outputs = None
+ event = _node_event(None)
_run(publisher, event)
diff --git a/api/tests/unit_tests/core/ops/test_base_trace_instance.py b/api/tests/unit_tests/core/ops/test_base_trace_instance.py
index f0f99cae104..c64b8ce27c1 100644
--- a/api/tests/unit_tests/core/ops/test_base_trace_instance.py
+++ b/api/tests/unit_tests/core/ops/test_base_trace_instance.py
@@ -1,5 +1,4 @@
from types import SimpleNamespace
-from unittest.mock import MagicMock
import pytest
from sqlalchemy import Engine
@@ -61,8 +60,7 @@ def _persist_account(session: Session) -> Account:
def _trace_instance() -> ConcreteTraceInstance:
- # Tracing configuration is a domain collaborator, not an ORM session.
- return ConcreteTraceInstance(MagicMock(spec=BaseTracingConfig))
+ return ConcreteTraceInstance(BaseTracingConfig())
@pytest.mark.parametrize("sqlite_session", [TABLES], indirect=True)