+
+
+
+
diff --git a/api/templates/without-brand/workflow_comment_mention_template_zh-CN.html b/api/templates/without-brand/workflow_comment_mention_template_zh-CN.html
new file mode 100644
index 0000000000..8b9b2dbe71
--- /dev/null
+++ b/api/templates/without-brand/workflow_comment_mention_template_zh-CN.html
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+ 
+
+
+ You were mentioned in a workflow comment
+
+
+ Hi {{ mentioned_name }},
+{{ commenter_name }} mentioned you in {{ app_name }}.
+Open {{ application_title }} to reply to the comment.
+
+
+
+
+
diff --git a/api/templates/workflow_comment_mention_template_en-US.html b/api/templates/workflow_comment_mention_template_en-US.html
new file mode 100644
index 0000000000..1ef8fe4e3f
--- /dev/null
+++ b/api/templates/workflow_comment_mention_template_en-US.html
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 你在工作流评论中被提及
+
+
+ 你好，{{ mentioned_name }}：
+{{ commenter_name }} 在 {{ app_name }} 中提及了你。
+
+
+ {{ comment_content }}
+请在 {{ application_title }} 中查看并回复此评论。
+
+
+
+
+
diff --git a/api/templates/workflow_comment_mention_template_zh-CN.html b/api/templates/workflow_comment_mention_template_zh-CN.html
new file mode 100644
index 0000000000..8b9b2dbe71
--- /dev/null
+++ b/api/templates/workflow_comment_mention_template_zh-CN.html
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ You were mentioned in a workflow comment
+
+
+ Hi {{ mentioned_name }},
+{{ commenter_name }} mentioned you in {{ app_name }}.
+
+
+ {{ comment_content }}
+Open {{ application_title }} to reply to the comment.
+
+
+
+
+
diff --git a/api/tests/integration_tests/conftest.py b/api/tests/integration_tests/conftest.py
index b2e8dda443..09078d196d 100644
--- a/api/tests/integration_tests/conftest.py
+++ b/api/tests/integration_tests/conftest.py
@@ -48,7 +48,7 @@ os.environ["OPENDAL_FS_ROOT"] = "/tmp/dify-storage"
os.environ.setdefault("STORAGE_TYPE", "opendal")
os.environ.setdefault("OPENDAL_SCHEME", "fs")
-_CACHED_APP = create_app()
+_SIO_APP, _CACHED_APP = create_app()
@pytest.fixture(scope="session")
diff --git a/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py b/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
index 91245e879e..a876b0c4aa 100644
--- a/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
+++ b/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
@@ -1,9 +1,8 @@
from collections.abc import Generator
-from graphon.node_events import StreamCompletedEvent
-
from core.datasource.datasource_manager import DatasourceManager
from core.datasource.entities.datasource_entities import DatasourceMessage
+from graphon.node_events import StreamCompletedEvent
def _gen_var_stream() -> Generator[DatasourceMessage, None, None]:
diff --git a/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py b/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
index 3fdea10976..2392084c36 100644
--- a/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
+++ b/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
@@ -1,8 +1,8 @@
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.node_events import NodeRunResult, StreamCompletedEvent
-
from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+from core.workflow.nodes.datasource.entities import DatasourceNodeData
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult, StreamCompletedEvent
class _Seg:
@@ -70,19 +70,16 @@ def test_node_integration_minimal_stream(mocker):
mocker.patch("core.workflow.nodes.datasource.datasource_node.DatasourceManager", new=_Mgr)
node = DatasourceNode(
- id="n",
- config={
- "id": "n",
- "data": {
- "type": "datasource",
- "version": "1",
- "title": "Datasource",
- "provider_type": "plugin",
- "provider_name": "p",
- "plugin_id": "plug",
- "datasource_name": "ds",
- },
- },
+ node_id="n",
+ config=DatasourceNodeData(
+ type="datasource",
+ version="1",
+ title="Datasource",
+ provider_type="plugin",
+ provider_name="p",
+ plugin_id="plug",
+ datasource_name="ds",
+ ),
graph_init_params=_GP(),
graph_runtime_state=_GS(vp),
)
diff --git a/api/tests/integration_tests/model_runtime/__mock/plugin_model.py b/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
index ce04a158a8..c4146d5ccd 100644
--- a/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
+++ b/api/tests/integration_tests/model_runtime/__mock/plugin_model.py
@@ -4,6 +4,9 @@ from collections.abc import Generator, Sequence
from decimal import Decimal
from json import dumps
+from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
+from core.plugin.impl.model import PluginModelClient
+
# import monkeypatch
from graphon.model_runtime.entities.common_entities import I18nObject
from graphon.model_runtime.entities.llm_entities import (
@@ -23,9 +26,6 @@ from graphon.model_runtime.entities.model_entities import (
)
from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
-from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
-from core.plugin.impl.model import PluginModelClient
-
class MockModelClass(PluginModelClient):
def fetch_model_providers(self, tenant_id: str) -> Sequence[PluginModelProviderEntity]:
diff --git a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
index c7bb90f019..e130644338 100644
--- a/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
+++ b/api/tests/integration_tests/services/test_workflow_draft_variable_service.py
@@ -3,10 +3,6 @@ import unittest
import uuid
import pytest
-from graphon.nodes import BuiltinNodeTypes
-from graphon.variables.segments import StringSegment
-from graphon.variables.types import SegmentType
-from graphon.variables.variables import StringVariable
from sqlalchemy import delete, func, select
from sqlalchemy.orm import Session
@@ -15,6 +11,10 @@ from extensions.ext_database import db
from extensions.ext_storage import storage
from extensions.storage.storage_type import StorageType
from factories.variable_factory import build_segment
+from graphon.nodes import BuiltinNodeTypes
+from graphon.variables.segments import StringSegment
+from graphon.variables.types import SegmentType
+from graphon.variables.variables import StringVariable
from libs import datetime_utils
from models.enums import CreatorUserRole
from models.model import UploadFile
diff --git a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
index 3dfedd811d..4f444598b1 100644
--- a/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
+++ b/api/tests/integration_tests/tasks/test_remove_app_and_related_data_task.py
@@ -2,11 +2,11 @@ import uuid
from unittest.mock import patch
import pytest
-from graphon.variables.segments import StringSegment
from sqlalchemy import delete, func, select
from core.db.session_factory import session_factory
from extensions.storage.storage_type import StorageType
+from graphon.variables.segments import StringSegment
from models import Tenant
from models.enums import CreatorUserRole
from models.model import App, UploadFile
@@ -209,7 +209,6 @@ class TestDeleteDraftVariablesWithOffloadIntegration:
def setup_offload_test_data(self, app_and_tenant):
tenant, app = app_and_tenant
from graphon.variables.types import SegmentType
-
from libs.datetime_utils import naive_utc_now
with session_factory.create_session() as session:
@@ -453,7 +452,6 @@ class TestDeleteDraftVariablesSessionCommit:
def setup_offload_test_data(self, app_and_tenant):
"""Create test data with offload files for session commit tests."""
from graphon.variables.types import SegmentType
-
from libs.datetime_utils import naive_utc_now
tenant, app = app_and_tenant
diff --git a/api/tests/integration_tests/workflow/nodes/__mock/model.py b/api/tests/integration_tests/workflow/nodes/__mock/model.py
index c0143faa85..a9a2617bae 100644
--- a/api/tests/integration_tests/workflow/nodes/__mock/model.py
+++ b/api/tests/integration_tests/workflow/nodes/__mock/model.py
@@ -1,12 +1,11 @@
from unittest.mock import MagicMock
-from graphon.model_runtime.entities.model_entities import ModelType
-
from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
from core.entities.provider_entities import CustomConfiguration, CustomProviderConfiguration, SystemConfiguration
from core.model_manager import ModelInstance
from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
+from graphon.model_runtime.entities.model_entities import ModelType
from models.provider import ProviderType
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index 4f41396c22..aaa6092993 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -2,17 +2,18 @@ import time
import uuid
import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
-from graphon.node_events import NodeRunResult
-from graphon.nodes.code.code_node import CodeNode
-from graphon.nodes.code.limits import CodeNodeLimits
-from graphon.runtime import GraphRuntimeState, VariablePool
from configs import dify_config
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.workflow.node_factory import DifyNodeFactory
from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.graph import Graph
+from graphon.node_events import NodeRunResult
+from graphon.nodes.code.code_node import CodeNode
+from graphon.nodes.code.entities import CodeNodeData
+from graphon.nodes.code.limits import CodeNodeLimits
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_graph_init_params
pytest_plugins = ("tests.integration_tests.workflow.nodes.__mock.code_executor",)
@@ -64,8 +65,8 @@ def init_code_node(code_config: dict):
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
node = CodeNode(
- id=str(uuid.uuid4()),
- config=code_config,
+ node_id=str(uuid.uuid4()),
+ config=CodeNodeData.model_validate(code_config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
code_executor=node_factory._code_executor,
diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py
index b1f937e738..b9f7b9575b 100644
--- a/api/tests/integration_tests/workflow/nodes/test_http.py
+++ b/api/tests/integration_tests/workflow/nodes/test_http.py
@@ -3,11 +3,6 @@ import uuid
from urllib.parse import urlencode
import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file.file_manager import file_manager
-from graphon.graph import Graph
-from graphon.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig
-from graphon.runtime import GraphRuntimeState, VariablePool
from configs import dify_config
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
@@ -16,6 +11,11 @@ from core.tools.tool_file_manager import ToolFileManager
from core.workflow.node_factory import DifyNodeFactory
from core.workflow.node_runtime import DifyFileReferenceFactory
from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file.file_manager import file_manager
+from graphon.graph import Graph
+from graphon.nodes.http_request import HttpRequestNode, HttpRequestNodeConfig, HttpRequestNodeData
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_graph_init_params
pytest_plugins = ("tests.integration_tests.workflow.nodes.__mock.http",)
@@ -75,8 +75,8 @@ def init_http_node(config: dict):
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
node = HttpRequestNode(
- id=str(uuid.uuid4()),
- config=config,
+ node_id=str(uuid.uuid4()),
+ config=HttpRequestNodeData.model_validate(config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
http_request_config=HTTP_REQUEST_CONFIG,
@@ -192,6 +192,7 @@ def test_custom_authorization_header(setup_http_mock):
@pytest.mark.parametrize("setup_http_mock", [["none"]], indirect=True)
def test_custom_auth_with_empty_api_key_raises_error(setup_http_mock):
"""Test: In custom authentication mode, when the api_key is empty, AuthorizationConfigError should be raised."""
+ from core.workflow.system_variables import build_system_variables
from graphon.enums import BuiltinNodeTypes
from graphon.nodes.http_request.entities import (
HttpRequestNodeAuthorization,
@@ -202,8 +203,6 @@ def test_custom_auth_with_empty_api_key_raises_error(setup_http_mock):
from graphon.nodes.http_request.executor import Executor
from graphon.runtime import VariablePool
- from core.workflow.system_variables import build_system_variables
-
# Create variable pool
variable_pool = VariablePool(
system_variables=build_system_variables(user_id="test", files=[]),
@@ -724,8 +723,8 @@ def test_nested_object_variable_selector(setup_http_mock):
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
node = HttpRequestNode(
- id=str(uuid.uuid4()),
- config=graph_config["nodes"][1],
+ node_id=str(uuid.uuid4()),
+ config=HttpRequestNodeData.model_validate(graph_config["nodes"][1]["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
http_request_config=HTTP_REQUEST_CONFIG,
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index f0f3fcead1..3eead70163 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -4,20 +4,20 @@ import uuid
from collections.abc import Generator
from unittest.mock import MagicMock, patch
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.llm_generator.output_parser.structured_output import _parse_structured_output
+from core.model_manager import ModelInstance
+from core.workflow.system_variables import build_system_variables
+from extensions.ext_database import db
from graphon.enums import WorkflowNodeExecutionStatus
from graphon.node_events import StreamCompletedEvent
+from graphon.nodes.llm.entities import LLMNodeData
from graphon.nodes.llm.file_saver import LLMFileSaver
from graphon.nodes.llm.node import LLMNode
from graphon.nodes.llm.protocols import CredentialsProvider, ModelFactory
from graphon.nodes.llm.runtime_protocols import PromptMessageSerializerProtocol
from graphon.nodes.protocols import HttpClientProtocol
from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.llm_generator.output_parser.structured_output import _parse_structured_output
-from core.model_manager import ModelInstance
-from core.workflow.system_variables import build_system_variables
-from extensions.ext_database import db
from tests.workflow_test_utils import build_test_graph_init_params
"""FOR MOCK FIXTURES, DO NOT REMOVE"""
@@ -76,8 +76,8 @@ def init_llm_node(config: dict) -> LLMNode:
llm_file_saver = MagicMock(spec=LLMFileSaver)
node = LLMNode(
- id=str(uuid.uuid4()),
- config=config,
+ node_id=str(uuid.uuid4()),
+ config=LLMNodeData.model_validate(config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
credentials_provider=MagicMock(spec=CredentialsProvider),
diff --git a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
index fe512c2585..f2eabb86c3 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -3,17 +3,17 @@ import time
import uuid
from unittest.mock import MagicMock
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
-from graphon.nodes.llm.protocols import CredentialsProvider, ModelFactory
-from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.model_manager import ModelInstance
from core.workflow.node_runtime import DifyPromptMessageSerializer
from core.workflow.system_variables import build_system_variables
from extensions.ext_database import db
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.model_runtime.entities import AssistantPromptMessage, UserPromptMessage
+from graphon.nodes.llm.protocols import CredentialsProvider, ModelFactory
+from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.integration_tests.workflow.nodes.__mock.model import get_mocked_fetch_model_instance
from tests.workflow_test_utils import build_test_graph_init_params
@@ -70,8 +70,8 @@ def init_parameter_extractor_node(config: dict, memory=None):
graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
node = ParameterExtractorNode(
- id=str(uuid.uuid4()),
- config=config,
+ node_id=str(uuid.uuid4()),
+ config=ParameterExtractorNodeData.model_validate(config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
credentials_provider=MagicMock(spec=CredentialsProvider),
diff --git a/api/tests/integration_tests/workflow/nodes/test_template_transform.py b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
index 2d728569be..e2e0723fb8 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -1,15 +1,15 @@
import time
import uuid
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
-from graphon.nodes.template_transform.template_transform_node import TemplateTransformNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.template_rendering import TemplateRenderError
-
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.workflow.node_factory import DifyNodeFactory
from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.graph import Graph
+from graphon.nodes.template_transform.entities import TemplateTransformNodeData
+from graphon.nodes.template_transform.template_transform_node import TemplateTransformNode
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.template_rendering import TemplateRenderError
from tests.workflow_test_utils import build_test_graph_init_params
@@ -87,8 +87,8 @@ def test_execute_template_transform():
assert graph is not None
node = TemplateTransformNode(
- id=str(uuid.uuid4()),
- config=config,
+ node_id=str(uuid.uuid4()),
+ config=TemplateTransformNodeData.model_validate(config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
jinja2_template_renderer=_SimpleJinja2Renderer(),
diff --git a/api/tests/integration_tests/workflow/nodes/test_tool.py b/api/tests/integration_tests/workflow/nodes/test_tool.py
index 750ced7075..a8e9422c1e 100644
--- a/api/tests/integration_tests/workflow/nodes/test_tool.py
+++ b/api/tests/integration_tests/workflow/nodes/test_tool.py
@@ -2,18 +2,18 @@ import time
import uuid
from unittest.mock import MagicMock, patch
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
-from graphon.node_events import StreamCompletedEvent
-from graphon.nodes.protocols import ToolFileManagerProtocol
-from graphon.nodes.tool.tool_node import ToolNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.tools.utils.configuration import ToolParameterConfigurationManager
from core.workflow.node_factory import DifyNodeFactory
from core.workflow.node_runtime import DifyToolNodeRuntime
from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.graph import Graph
+from graphon.node_events import StreamCompletedEvent
+from graphon.nodes.protocols import ToolFileManagerProtocol
+from graphon.nodes.tool.entities import ToolNodeData
+from graphon.nodes.tool.tool_node import ToolNode
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_graph_init_params
@@ -61,8 +61,8 @@ def init_tool_node(config: dict):
tool_file_manager_factory = MagicMock(spec=ToolFileManagerProtocol)
node = ToolNode(
- id=str(uuid.uuid4()),
- config=config,
+ node_id=str(uuid.uuid4()),
+ config=ToolNodeData.model_validate(config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
tool_file_manager_factory=tool_file_manager_factory,
diff --git a/api/tests/test_containers_integration_tests/conftest.py b/api/tests/test_containers_integration_tests/conftest.py
index ef74893f07..66a25e5daf 100644
--- a/api/tests/test_containers_integration_tests/conftest.py
+++ b/api/tests/test_containers_integration_tests/conftest.py
@@ -369,7 +369,7 @@ def _create_app_with_containers() -> Flask:
# Create and configure the Flask application
logger.info("Initializing Flask application...")
- app = create_app()
+ sio_app, app = create_app()
logger.info("Flask application created successfully")
# Initialize database schema
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
index ea95959a82..5a22f81a69 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
@@ -4,11 +4,11 @@ import json
import uuid
from flask.testing import FlaskClient
-from graphon.enums import WorkflowExecutionStatus
from sqlalchemy.orm import Session
from configs import dify_config
from constants import HEADER_NAME_CSRF_TOKEN
+from graphon.enums import WorkflowExecutionStatus
from libs.datetime_utils import naive_utc_now
from libs.token import _real_cookie_name, generate_csrf_token
from models import Account, DifySetup, Tenant, TenantAccountJoin
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
index 8ddf867370..290be87697 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
@@ -3,12 +3,12 @@
import uuid
from flask.testing import FlaskClient
-from graphon.variables.segments import StringSegment
from sqlalchemy import select
from sqlalchemy.orm import Session
from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
from factories.variable_factory import segment_to_variable
+from graphon.variables.segments import StringSegment
from models import Workflow
from models.model import AppMode
from models.workflow import WorkflowDraftVariable
diff --git a/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py b/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
index b4b65abdb6..c342e8994b 100644
--- a/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
+++ b/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
@@ -22,13 +22,6 @@ import uuid
from time import time
import pytest
-from graphon.entities.pause_reason import SchedulingPause
-from graphon.enums import WorkflowExecutionStatus
-from graphon.graph_engine.entities.commands import GraphEngineCommand
-from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
-from graphon.graph_events import GraphRunPausedEvent
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
from sqlalchemy import Engine, delete, select
from sqlalchemy.orm import Session
@@ -40,6 +33,13 @@ from core.app.layers.pause_state_persist_layer import (
)
from core.workflow.system_variables import build_system_variables
from extensions.ext_storage import storage
+from graphon.entities.pause_reason import SchedulingPause
+from graphon.enums import WorkflowExecutionStatus
+from graphon.graph_engine.entities.commands import GraphEngineCommand
+from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
+from graphon.graph_events import GraphRunPausedEvent
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
from libs.datetime_utils import naive_utc_now
from models import Account
from models import WorkflowPause as WorkflowPauseModel
diff --git a/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py b/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
index 3b1570a9a8..6524d6ce61 100644
--- a/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
+++ b/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
@@ -4,12 +4,11 @@ from __future__ import annotations
from uuid import uuid4
-from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData, UserAction
from sqlalchemy import Engine, select
from sqlalchemy.orm import Session
from core.repositories.human_input_repository import FormCreateParams, HumanInputFormRepositoryImpl
-from core.workflow.human_input_compat import (
+from core.workflow.human_input_adapter import (
DeliveryChannelConfig,
EmailDeliveryConfig,
EmailDeliveryMethod,
@@ -18,6 +17,7 @@ from core.workflow.human_input_compat import (
MemberRecipient,
WebAppDeliveryMethod,
)
+from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData, UserAction
from models.account import (
Account,
AccountStatus,
diff --git a/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py b/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
index 3ecf621095..5aed230cd4 100644
--- a/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
+++ b/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
@@ -4,6 +4,17 @@ from datetime import timedelta
from unittest.mock import MagicMock
import pytest
+from sqlalchemy import delete, select
+from sqlalchemy.orm import Session
+
+from core.app.app_config.entities import WorkflowUIBasedAppConfig
+from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
+from core.app.workflow.layers import PersistenceWorkflowInfo, WorkflowPersistenceLayer
+from core.repositories.human_input_repository import HumanInputFormEntity, HumanInputFormRepository
+from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
+from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import build_system_variables
from graphon.enums import WorkflowType
from graphon.graph import Graph
from graphon.graph_engine import GraphEngine
@@ -16,17 +27,6 @@ from graphon.nodes.human_input.human_input_node import HumanInputNode
from graphon.nodes.start.entities import StartNodeData
from graphon.nodes.start.start_node import StartNode
from graphon.runtime import GraphRuntimeState, VariablePool
-from sqlalchemy import delete, select
-from sqlalchemy.orm import Session
-
-from core.app.app_config.entities import WorkflowUIBasedAppConfig
-from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
-from core.app.workflow.layers import PersistenceWorkflowInfo, WorkflowPersistenceLayer
-from core.repositories.human_input_repository import HumanInputFormEntity, HumanInputFormRepository
-from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
-from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import build_system_variables
from libs.datetime_utils import naive_utc_now
from models import Account
from models.account import AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
@@ -101,8 +101,8 @@ def _build_graph(
start_data = StartNodeData(title="start", variables=[])
start_node = StartNode(
- id="start",
- config={"id": "start", "data": start_data.model_dump()},
+ node_id="start",
+ config=start_data,
graph_init_params=params,
graph_runtime_state=runtime_state,
)
@@ -116,8 +116,8 @@ def _build_graph(
],
)
human_node = HumanInputNode(
- id="human",
- config={"id": "human", "data": human_data.model_dump()},
+ node_id="human",
+ config=human_data,
graph_init_params=params,
graph_runtime_state=runtime_state,
form_repository=form_repository,
@@ -130,8 +130,8 @@ def _build_graph(
desc=None,
)
end_node = EndNode(
- id="end",
- config={"id": "end", "data": end_data.model_dump()},
+ node_id="end",
+ config=end_data,
graph_init_params=params,
graph_runtime_state=runtime_state,
)
diff --git a/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py b/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py
index cc72dc1cf3..35e41035df 100644
--- a/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py
+++ b/api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py
@@ -4,13 +4,13 @@ from unittest.mock import patch
from uuid import uuid4
import pytest
-from graphon.file import File, FileTransferMethod, FileType
from sqlalchemy.orm import Session
from core.app.file_access import DatabaseFileAccessController
from extensions.ext_database import db
from extensions.storage.storage_type import StorageType
from factories.file_factory import StorageKeyLoader
+from graphon.file import File, FileTransferMethod, FileType
from models import ToolFile, UploadFile
from models.enums import CreatorUserRole
@@ -123,9 +123,9 @@ class TestStorageKeyLoader(unittest.TestCase):
file_related_id = related_id
return File(
- id=str(uuid4()), # Generate new UUID for File.id
+ file_id=str(uuid4()), # Generate new UUID for File.id
tenant_id=tenant_id,
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=transfer_method,
related_id=file_related_id,
remote_url=remote_url,
diff --git a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
index b745aed141..2fd289dfbc 100644
--- a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
+++ b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
@@ -6,7 +6,6 @@ from decimal import Decimal
from uuid import uuid4
from graphon.nodes.human_input.entities import FormDefinition, UserAction
-
from libs.datetime_utils import naive_utc_now
from models.account import Account, Tenant, TenantAccountJoin
from models.enums import ConversationFromSource, InvokeFrom
diff --git a/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py b/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py
index e922c19a5a..f10f519e25 100644
--- a/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py
+++ b/api/tests/test_containers_integration_tests/models/test_conversation_message_inputs.py
@@ -10,10 +10,10 @@ from unittest.mock import patch
from uuid import uuid4
import pytest
-from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod
from sqlalchemy.orm import Session
from core.workflow.file_reference import build_file_reference
+from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod
from models.model import App, AppMode, Conversation, Message
diff --git a/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py b/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
index 4ca87de52d..6352f815df 100644
--- a/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
+++ b/api/tests/test_containers_integration_tests/models/test_conversation_status_count.py
@@ -9,9 +9,9 @@ from collections.abc import Generator
from uuid import uuid4
import pytest
-from graphon.enums import WorkflowExecutionStatus
from sqlalchemy.orm import Session
+from graphon.enums import WorkflowExecutionStatus
from models.enums import ConversationFromSource, InvokeFrom
from models.model import App, AppMode, Conversation, Message, Site
from models.workflow import Workflow, WorkflowRun, WorkflowRunTriggeredFrom, WorkflowType
diff --git a/api/tests/test_containers_integration_tests/models/test_types_enum_text.py b/api/tests/test_containers_integration_tests/models/test_types_enum_text.py
index 957b7145d3..b325c97f7d 100644
--- a/api/tests/test_containers_integration_tests/models/test_types_enum_text.py
+++ b/api/tests/test_containers_integration_tests/models/test_types_enum_text.py
@@ -4,13 +4,13 @@ from typing import Any, NamedTuple
import pytest
import sqlalchemy as sa
-from graphon.model_runtime.entities.model_entities import ModelType
from sqlalchemy import exc as sa_exc
from sqlalchemy import insert, select
from sqlalchemy.engine import Connection, Engine
from sqlalchemy.orm import DeclarativeBase, Mapped, Session, mapped_column
from sqlalchemy.sql.sqltypes import VARCHAR
+from graphon.model_runtime.entities.model_entities import ModelType
from models.types import EnumText
_USER_TABLE = "enum_text_users"
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
index a68b3a08c7..641399c7f9 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_node_execution_repository.py
@@ -5,10 +5,10 @@ from __future__ import annotations
from datetime import timedelta
from uuid import uuid4
-from graphon.enums import WorkflowNodeExecutionStatus
from sqlalchemy import Engine, delete
from sqlalchemy.orm import Session, sessionmaker
+from graphon.enums import WorkflowNodeExecutionStatus
from libs.datetime_utils import naive_utc_now
from models.enums import CreatorUserRole
from models.workflow import WorkflowNodeExecutionModel
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index 64c93ac07c..aebe87839c 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -8,15 +8,15 @@ from unittest.mock import Mock
from uuid import uuid4
import pytest
+from sqlalchemy import Engine, delete, select
+from sqlalchemy.orm import Session, sessionmaker
+
+from extensions.ext_storage import storage
from graphon.entities import WorkflowExecution
from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
from graphon.enums import WorkflowExecutionStatus
from graphon.nodes.human_input.entities import FormDefinition, FormInput, UserAction
from graphon.nodes.human_input.enums import FormInputType, HumanInputFormStatus
-from sqlalchemy import Engine, delete, select
-from sqlalchemy.orm import Session, sessionmaker
-
-from extensions.ext_storage import storage
from libs.datetime_utils import naive_utc_now
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.human_input import (
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
index 7f44eb6ca3..54b7afc018 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
@@ -12,11 +12,11 @@ from decimal import Decimal
from uuid import uuid4
import pytest
-from graphon.nodes.human_input.entities import FormDefinition, UserAction
-from graphon.nodes.human_input.enums import HumanInputFormStatus
from sqlalchemy import Engine, delete, select
from sqlalchemy.orm import Session, sessionmaker
+from graphon.nodes.human_input.entities import FormDefinition, UserAction
+from graphon.nodes.human_input.enums import HumanInputFormStatus
from libs.datetime_utils import naive_utc_now
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
from models.enums import ConversationFromSource, InvokeFrom
@@ -271,7 +271,7 @@ def _create_recipient(
def _create_delivery(session: Session, *, form_id: str) -> HumanInputDelivery:
- from core.workflow.human_input_compat import DeliveryMethodType
+ from core.workflow.human_input_adapter import DeliveryMethodType
from models.human_input import ConsoleDeliveryPayload
delivery = HumanInputDelivery(
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py
index 22e0aa34ff..fa78f1c28b 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py
@@ -7,6 +7,11 @@ from datetime import datetime
from decimal import Decimal
from uuid import uuid4
+from sqlalchemy import Engine
+from sqlalchemy.orm import Session, sessionmaker
+
+from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
+from core.repositories.factory import OrderConfig
from graphon.entities import WorkflowNodeExecution
from graphon.enums import (
BuiltinNodeTypes,
@@ -14,11 +19,6 @@ from graphon.enums import (
WorkflowNodeExecutionStatus,
)
from graphon.model_runtime.utils.encoders import jsonable_encoder
-from sqlalchemy import Engine
-from sqlalchemy.orm import Session, sessionmaker
-
-from core.repositories import SQLAlchemyWorkflowNodeExecutionRepository
-from core.repositories.factory import OrderConfig
from models.account import Account, Tenant
from models.enums import CreatorUserRole
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py b/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py
index c5e9201ee3..d6f0657380 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_workflow_run_repository.py
@@ -7,12 +7,12 @@ from datetime import timedelta
from uuid import uuid4
import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus
from sqlalchemy import Engine, delete
from sqlalchemy import exc as sa_exc
from sqlalchemy.orm import Session, sessionmaker
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus
from libs.datetime_utils import naive_utc_now
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.workflow import WorkflowRun, WorkflowType
diff --git a/api/tests/test_containers_integration_tests/services/test_agent_service.py b/api/tests/test_containers_integration_tests/services/test_agent_service.py
index 4f3c0e4200..00a2f9a59f 100644
--- a/api/tests/test_containers_integration_tests/services/test_agent_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_agent_service.py
@@ -842,7 +842,6 @@ class TestAgentService:
conversation, message = self._create_test_conversation_and_message(db_session_with_containers, app, account)
from graphon.file import FileTransferMethod, FileType
-
from models.enums import CreatorUserRole
# Add files to message
diff --git a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
index 6c15587058..77ce28b999 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
@@ -9,7 +9,6 @@ from uuid import uuid4
import pytest
import yaml
from faker import Faker
-from graphon.enums import BuiltinNodeTypes
from core.trigger.constants import (
TRIGGER_PLUGIN_NODE_TYPE,
@@ -17,6 +16,7 @@ from core.trigger.constants import (
TRIGGER_WEBHOOK_NODE_TYPE,
)
from extensions.ext_redis import redis_client
+from graphon.enums import BuiltinNodeTypes
from models import Account, AppMode
from models.model import AppModelConfig, IconType
from services import app_dsl_service
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
new file mode 100644
index 0000000000..0b7bd9ca64
--- /dev/null
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
@@ -0,0 +1,524 @@
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+from unittest.mock import patch
+from uuid import uuid4
+
+import pytest
+from sqlalchemy.orm import sessionmaker
+
+from core.app.entities.app_invoke_entities import InvokeFrom
+from extensions.ext_database import db
+from graphon.variables import FloatVariable, IntegerVariable, StringVariable
+from models.account import Account, Tenant, TenantAccountJoin
+from models.enums import ConversationFromSource
+from models.model import App, Conversation, EndUser
+from models.workflow import ConversationVariable
+from services.conversation_service import ConversationService
+from services.errors.conversation import (
+ ConversationVariableNotExistsError,
+ ConversationVariableTypeMismatchError,
+ LastConversationNotExistsError,
+)
+
+
+class ConversationServiceVariableIntegrationFactory:
+ @staticmethod
+ def create_app_and_account(db_session_with_containers):
+ tenant = Tenant(name=f"Tenant {uuid4()}")
+ db_session_with_containers.add(tenant)
+ db_session_with_containers.flush()
+
+ account = Account(
+ name=f"Account {uuid4()}",
+ email=f"conversation-variable-{uuid4()}@example.com",
+ password="hashed-password",
+ password_salt="salt",
+ interface_language="en-US",
+ timezone="UTC",
+ )
+ db_session_with_containers.add(account)
+ db_session_with_containers.flush()
+
+ tenant_join = TenantAccountJoin(
+ tenant_id=tenant.id,
+ account_id=account.id,
+ role="owner",
+ current=True,
+ )
+ db_session_with_containers.add(tenant_join)
+ db_session_with_containers.flush()
+
+ app = App(
+ tenant_id=tenant.id,
+ name=f"App {uuid4()}",
+ description="",
+ mode="chat",
+ icon_type="emoji",
+ icon="bot",
+ icon_background="#FFFFFF",
+ enable_site=False,
+ enable_api=True,
+ api_rpm=100,
+ api_rph=100,
+ is_demo=False,
+ is_public=False,
+ is_universal=False,
+ created_by=account.id,
+ updated_by=account.id,
+ )
+ db_session_with_containers.add(app)
+ db_session_with_containers.commit()
+
+ return app, account
+
+ @staticmethod
+ def create_end_user(db_session_with_containers, app: App):
+ end_user = EndUser(
+ tenant_id=app.tenant_id,
+ app_id=app.id,
+ type=InvokeFrom.SERVICE_API.value,
+ external_user_id=f"external-{uuid4()}",
+ name=f"End User {uuid4()}",
+ is_anonymous=False,
+ session_id=f"session-{uuid4()}",
+ )
+ db_session_with_containers.add(end_user)
+ db_session_with_containers.commit()
+ return end_user
+
+ @staticmethod
+ def create_conversation(
+ db_session_with_containers,
+ app: App,
+ user: Account | EndUser,
+ *,
+ name: str | None = None,
+ invoke_from: InvokeFrom = InvokeFrom.WEB_APP,
+ created_at: datetime | None = None,
+ updated_at: datetime | None = None,
+ ) -> Conversation:
+ conversation = Conversation(
+ app_id=app.id,
+ app_model_config_id=None,
+ model_provider=None,
+ model_id="",
+ override_model_configs=None,
+ mode=app.mode,
+ name=name or f"Conversation {uuid4()}",
+ summary="",
+ inputs={},
+ introduction="",
+ system_instruction="",
+ system_instruction_tokens=0,
+ status="normal",
+ invoke_from=invoke_from.value,
+ from_source=ConversationFromSource.API if isinstance(user, EndUser) else ConversationFromSource.CONSOLE,
+ from_end_user_id=user.id if isinstance(user, EndUser) else None,
+ from_account_id=user.id if isinstance(user, Account) else None,
+ dialogue_count=0,
+ is_deleted=False,
+ )
+ conversation.inputs = {}
+ if created_at is not None:
+ conversation.created_at = created_at
+ if updated_at is not None:
+ conversation.updated_at = updated_at
+
+ db_session_with_containers.add(conversation)
+ db_session_with_containers.commit()
+ return conversation
+
+ @staticmethod
+ def create_variable(
+ db_session_with_containers,
+ *,
+ app: App,
+ conversation: Conversation,
+ variable: StringVariable | FloatVariable | IntegerVariable,
+ created_at: datetime | None = None,
+ ) -> ConversationVariable:
+ row = ConversationVariable.from_variable(app_id=app.id, conversation_id=conversation.id, variable=variable)
+ if created_at is not None:
+ row.created_at = created_at
+ row.updated_at = created_at
+
+ db_session_with_containers.add(row)
+ db_session_with_containers.commit()
+ return row
+
+
+@pytest.fixture
+def real_conversation_service_session_factory(flask_app_with_containers):
+ del flask_app_with_containers
+ real_session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
+
+ with (
+ patch("services.conversation_service.session_factory.create_session", side_effect=lambda: real_session_maker()),
+ patch("services.conversation_service.session_factory.get_session_maker", return_value=real_session_maker),
+ ):
+ yield
+
+
+class TestConversationServiceVariables:
+ def test_get_conversational_variable_success(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+ older_time = datetime(2024, 1, 1, 12, 0, 0)
+ newer_time = older_time + timedelta(minutes=5)
+
+ first_variable = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name="topic", value="billing"),
+ created_at=older_time,
+ )
+ second_variable = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name="priority", value="high"),
+ created_at=newer_time,
+ )
+
+ result = ConversationService.get_conversational_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ user=account,
+ limit=10,
+ last_id=None,
+ )
+
+ assert [item["id"] for item in result.data] == [first_variable.id, second_variable.id]
+ assert [item["name"] for item in result.data] == ["topic", "priority"]
+ assert result.limit == 10
+ assert result.has_more is False
+
+ def test_get_conversational_variable_with_last_id(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+ base_time = datetime(2024, 1, 1, 9, 0, 0)
+
+ first_variable = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name="topic", value="billing"),
+ created_at=base_time,
+ )
+ second_variable = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name="priority", value="high"),
+ created_at=base_time + timedelta(minutes=1),
+ )
+ third_variable = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name="owner", value="alice"),
+ created_at=base_time + timedelta(minutes=2),
+ )
+
+ result = ConversationService.get_conversational_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ user=account,
+ limit=10,
+ last_id=first_variable.id,
+ )
+
+ assert [item["id"] for item in result.data] == [second_variable.id, third_variable.id]
+ assert result.has_more is False
+
+ def test_get_conversational_variable_last_id_not_found_raises_error(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+
+ with pytest.raises(ConversationVariableNotExistsError):
+ ConversationService.get_conversational_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ user=account,
+ limit=10,
+ last_id=str(uuid4()),
+ )
+
+ def test_get_conversational_variable_sets_has_more(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+
+ for index in range(3):
+ factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name=f"var_{index}", value=f"value_{index}"),
+ created_at=datetime(2024, 1, 1, 10, 0, index),
+ )
+
+ result = ConversationService.get_conversational_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ user=account,
+ limit=2,
+ last_id=None,
+ )
+
+ assert len(result.data) == 2
+ assert result.has_more is True
+
+ def test_update_conversation_variable_success(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+ existing = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=StringVariable(id=str(uuid4()), name="topic", value="billing"),
+ )
+ updated_at = datetime(2024, 1, 1, 15, 0, 0)
+
+ with patch("services.conversation_service.naive_utc_now", return_value=updated_at):
+ result = ConversationService.update_conversation_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ variable_id=existing.id,
+ user=account,
+ new_value="support",
+ )
+
+ db_session_with_containers.expire_all()
+ persisted = db_session_with_containers.get(ConversationVariable, (existing.id, conversation.id))
+
+ assert persisted is not None
+ assert persisted.to_variable().value == "support"
+ assert result["id"] == existing.id
+ assert result["value"] == "support"
+ assert result["updated_at"] == updated_at
+
+ def test_update_conversation_variable_not_found_raises_error(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+
+ with pytest.raises(ConversationVariableNotExistsError):
+ ConversationService.update_conversation_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ variable_id=str(uuid4()),
+ user=account,
+ new_value="support",
+ )
+
+ def test_update_conversation_variable_type_mismatch_raises_error(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+ existing = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=FloatVariable(id=str(uuid4()), name="score", value=1.5),
+ )
+
+ with pytest.raises(ConversationVariableTypeMismatchError, match="expects float"):
+ ConversationService.update_conversation_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ variable_id=existing.id,
+ user=account,
+ new_value="wrong-type",
+ )
+
+ def test_update_conversation_variable_integer_number_compatibility(
+ self, db_session_with_containers, real_conversation_service_session_factory
+ ):
+ del real_conversation_service_session_factory
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ conversation = factory.create_conversation(db_session_with_containers, app, account)
+ existing = factory.create_variable(
+ db_session_with_containers,
+ app=app,
+ conversation=conversation,
+ variable=IntegerVariable(id=str(uuid4()), name="attempts", value=1),
+ )
+
+ result = ConversationService.update_conversation_variable(
+ app_model=app,
+ conversation_id=conversation.id,
+ variable_id=existing.id,
+ user=account,
+ new_value=42,
+ )
+
+ db_session_with_containers.expire_all()
+ persisted = db_session_with_containers.get(ConversationVariable, (existing.id, conversation.id))
+
+ assert persisted is not None
+ assert persisted.to_variable().value == 42
+ assert result["value"] == 42
+
+
+class TestConversationServicePaginationWithContainers:
+ def test_pagination_by_last_id_raises_error_when_last_id_missing(self, db_session_with_containers):
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+
+ with pytest.raises(LastConversationNotExistsError):
+ ConversationService.pagination_by_last_id(
+ session=db_session_with_containers,
+ app_model=app,
+ user=account,
+ last_id=str(uuid4()),
+ limit=20,
+ invoke_from=InvokeFrom.WEB_APP,
+ )
+
+ def test_pagination_by_last_id_with_default_desc_updated_at(self, db_session_with_containers):
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ base_time = datetime(2024, 1, 1, 8, 0, 0)
+ newest = factory.create_conversation(
+ db_session_with_containers,
+ app,
+ account,
+ name="Newest",
+ updated_at=base_time + timedelta(minutes=2),
+ )
+ middle = factory.create_conversation(
+ db_session_with_containers,
+ app,
+ account,
+ name="Middle",
+ updated_at=base_time + timedelta(minutes=1),
+ )
+ oldest = factory.create_conversation(
+ db_session_with_containers,
+ app,
+ account,
+ name="Oldest",
+ updated_at=base_time,
+ )
+
+ result = ConversationService.pagination_by_last_id(
+ session=db_session_with_containers,
+ app_model=app,
+ user=account,
+ last_id=middle.id,
+ limit=10,
+ invoke_from=InvokeFrom.WEB_APP,
+ )
+
+ assert newest.id != middle.id
+ assert [conversation.id for conversation in result.data] == [oldest.id]
+
+ def test_pagination_by_last_id_with_name_sort(self, db_session_with_containers):
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ alpha = factory.create_conversation(db_session_with_containers, app, account, name="Alpha")
+ beta = factory.create_conversation(db_session_with_containers, app, account, name="Beta")
+ gamma = factory.create_conversation(db_session_with_containers, app, account, name="Gamma")
+
+ result = ConversationService.pagination_by_last_id(
+ session=db_session_with_containers,
+ app_model=app,
+ user=account,
+ last_id=beta.id,
+ limit=10,
+ invoke_from=InvokeFrom.WEB_APP,
+ sort_by="name",
+ )
+
+ assert alpha.id != beta.id
+ assert [conversation.id for conversation in result.data] == [gamma.id]
+
+ def test_pagination_filters_to_end_user_api_source(self, db_session_with_containers):
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ end_user = factory.create_end_user(db_session_with_containers, app)
+ account_conversation = factory.create_conversation(
+ db_session_with_containers,
+ app,
+ account,
+ name="Console Conversation",
+ invoke_from=InvokeFrom.WEB_APP,
+ )
+ end_user_conversation = factory.create_conversation(
+ db_session_with_containers,
+ app,
+ end_user,
+ name="API Conversation",
+ invoke_from=InvokeFrom.SERVICE_API,
+ )
+
+ result = ConversationService.pagination_by_last_id(
+ session=db_session_with_containers,
+ app_model=app,
+ user=end_user,
+ last_id=None,
+ limit=20,
+ invoke_from=InvokeFrom.SERVICE_API,
+ )
+
+ assert account_conversation.id != end_user_conversation.id
+ assert [conversation.id for conversation in result.data] == [end_user_conversation.id]
+
+ def test_pagination_filters_to_account_console_source(self, db_session_with_containers):
+ factory = ConversationServiceVariableIntegrationFactory
+ app, account = factory.create_app_and_account(db_session_with_containers)
+ end_user = factory.create_end_user(db_session_with_containers, app)
+ account_conversation = factory.create_conversation(
+ db_session_with_containers,
+ app,
+ account,
+ name="Console Conversation",
+ invoke_from=InvokeFrom.WEB_APP,
+ )
+ factory.create_conversation(
+ db_session_with_containers,
+ app,
+ end_user,
+ name="API Conversation",
+ invoke_from=InvokeFrom.SERVICE_API,
+ )
+
+ result = ConversationService.pagination_by_last_id(
+ session=db_session_with_containers,
+ app_model=app,
+ user=account,
+ last_id=None,
+ limit=20,
+ invoke_from=InvokeFrom.WEB_APP,
+ )
+
+ assert [conversation.id for conversation in result.data] == [account_conversation.id]
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py b/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
index fb0adbbcc2..02ab3f8314 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
@@ -3,10 +3,10 @@
from uuid import uuid4
import pytest
-from graphon.variables import StringVariable
from sqlalchemy.orm import sessionmaker
from extensions.ext_database import db
+from graphon.variables import StringVariable
from models.workflow import ConversationVariable
from services.conversation_variable_updater import ConversationVariableNotFoundError, ConversationVariableUpdater
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service.py b/api/tests/test_containers_integration_tests/services/test_dataset_service.py
index f9bfa570cb..0de3c64c4f 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service.py
@@ -9,11 +9,11 @@ from unittest.mock import Mock, patch
from uuid import uuid4
import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
from sqlalchemy.orm import Session
from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
from core.rag.retrieval.retrieval_methods import RetrievalMethod
+from graphon.model_runtime.entities.model_entities import ModelType
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
from models.dataset import Dataset, DatasetPermissionEnum, Document, ExternalKnowledgeBindings, Pipeline
from models.enums import DatasetRuntimeMode, DataSourceType, DocumentCreatedFrom, IndexingStatus
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py
new file mode 100644
index 0000000000..2bec703f0c
--- /dev/null
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py
@@ -0,0 +1,650 @@
+"""Testcontainers integration tests for SQL-backed DocumentService paths."""
+
+import datetime
+import json
+from unittest.mock import create_autospec, patch
+from uuid import uuid4
+
+import pytest
+from werkzeug.exceptions import Forbidden, NotFound
+
+from core.rag.index_processor.constant.index_type import IndexStructureType
+from extensions.storage.storage_type import StorageType
+from models import Account
+from models.dataset import Dataset, Document
+from models.enums import CreatorUserRole, DataSourceType, DocumentCreatedFrom, IndexingStatus
+from models.model import UploadFile
+from services.dataset_service import DocumentService
+from services.errors.account import NoPermissionError
+
+FIXED_UPLOAD_CREATED_AT = datetime.datetime(2024, 1, 1, 0, 0, 0)
+
+
+class DocumentServiceIntegrationFactory:
+ @staticmethod
+ def create_dataset(
+ db_session_with_containers,
+ *,
+ tenant_id: str | None = None,
+ created_by: str | None = None,
+ name: str | None = None,
+ ) -> Dataset:
+ dataset = Dataset(
+ tenant_id=tenant_id or str(uuid4()),
+ name=name or f"dataset-{uuid4()}",
+ data_source_type=DataSourceType.UPLOAD_FILE,
+ created_by=created_by or str(uuid4()),
+ )
+ db_session_with_containers.add(dataset)
+ db_session_with_containers.commit()
+ return dataset
+
+ @staticmethod
+ def create_document(
+ db_session_with_containers,
+ *,
+ dataset: Dataset,
+ name: str = "doc.txt",
+ position: int = 1,
+ tenant_id: str | None = None,
+ indexing_status: str = IndexingStatus.COMPLETED,
+ enabled: bool = True,
+ archived: bool = False,
+ is_paused: bool = False,
+ need_summary: bool = False,
+ doc_form: str = IndexStructureType.PARAGRAPH_INDEX,
+ batch: str | None = None,
+ data_source_type: str = DataSourceType.UPLOAD_FILE,
+ data_source_info: dict | None = None,
+ created_by: str | None = None,
+ ) -> Document:
+ document = Document(
+ tenant_id=tenant_id or dataset.tenant_id,
+ dataset_id=dataset.id,
+ position=position,
+ data_source_type=data_source_type,
+ data_source_info=json.dumps(data_source_info or {}),
+ batch=batch or f"batch-{uuid4()}",
+ name=name,
+ created_from=DocumentCreatedFrom.WEB,
+ created_by=created_by or dataset.created_by,
+ doc_form=doc_form,
+ )
+ document.indexing_status = indexing_status
+ document.enabled = enabled
+ document.archived = archived
+ document.is_paused = is_paused
+ document.need_summary = need_summary
+ if indexing_status == IndexingStatus.COMPLETED:
+ document.completed_at = FIXED_UPLOAD_CREATED_AT
+ db_session_with_containers.add(document)
+ db_session_with_containers.commit()
+ return document
+
+ @staticmethod
+ def create_upload_file(
+ db_session_with_containers,
+ *,
+ tenant_id: str,
+ created_by: str,
+ file_id: str | None = None,
+ name: str = "source.txt",
+ ) -> UploadFile:
+ upload_file = UploadFile(
+ tenant_id=tenant_id,
+ storage_type=StorageType.LOCAL,
+ key=f"uploads/{uuid4()}",
+ name=name,
+ size=128,
+ extension="txt",
+ mime_type="text/plain",
+ created_by_role=CreatorUserRole.ACCOUNT,
+ created_by=created_by,
+ created_at=FIXED_UPLOAD_CREATED_AT,
+ used=False,
+ )
+ if file_id:
+ upload_file.id = file_id
+ db_session_with_containers.add(upload_file)
+ db_session_with_containers.commit()
+ return upload_file
+
+
+@pytest.fixture
+def current_user_mock():
+ with patch("services.dataset_service.current_user", create_autospec(Account, instance=True)) as current_user:
+ current_user.id = str(uuid4())
+ current_user.current_tenant_id = str(uuid4())
+ current_user.current_role = None
+ yield current_user
+
+
+def test_get_document_returns_none_when_document_id_is_missing(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+
+ assert DocumentService.get_document(dataset.id, None) is None
+
+
+def test_get_document_queries_by_dataset_and_document_id(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ document = DocumentServiceIntegrationFactory.create_document(db_session_with_containers, dataset=dataset)
+
+ result = DocumentService.get_document(dataset.id, document.id)
+
+ assert result is not None
+ assert result.id == document.id
+
+
+def test_get_documents_by_ids_returns_empty_for_empty_input(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+
+ result = DocumentService.get_documents_by_ids(dataset.id, [])
+
+ assert result == []
+
+
+def test_get_documents_by_ids_uses_single_batch_query(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ doc_a = DocumentServiceIntegrationFactory.create_document(db_session_with_containers, dataset=dataset, name="a.txt")
+ doc_b = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ name="b.txt",
+ position=2,
+ )
+
+ result = DocumentService.get_documents_by_ids(dataset.id, [doc_a.id, doc_b.id])
+
+ assert {document.id for document in result} == {doc_a.id, doc_b.id}
+
+
+def test_update_documents_need_summary_returns_zero_for_empty_input(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+
+ assert DocumentService.update_documents_need_summary(dataset.id, []) == 0
+
+
+def test_update_documents_need_summary_updates_matching_non_qa_documents(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ paragraph_doc = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ need_summary=True,
+ )
+ qa_doc = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ need_summary=True,
+ doc_form=IndexStructureType.QA_INDEX,
+ )
+
+ updated_count = DocumentService.update_documents_need_summary(
+ dataset.id,
+ [paragraph_doc.id, qa_doc.id],
+ need_summary=False,
+ )
+
+ db_session_with_containers.expire_all()
+ refreshed_paragraph = db_session_with_containers.get(Document, paragraph_doc.id)
+ refreshed_qa = db_session_with_containers.get(Document, qa_doc.id)
+ assert updated_count == 1
+ assert refreshed_paragraph is not None
+ assert refreshed_qa is not None
+ assert refreshed_paragraph.need_summary is False
+ assert refreshed_qa.need_summary is True
+
+
+def test_get_document_download_url_uses_signed_url_helper(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ upload_file = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ )
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": upload_file.id},
+ )
+
+ with patch("services.dataset_service.file_helpers.get_signed_file_url", return_value="signed-url") as get_url:
+ result = DocumentService.get_document_download_url(document)
+
+ assert result == "signed-url"
+ get_url.assert_called_once_with(upload_file_id=upload_file.id, as_attachment=True)
+
+
+def test_get_upload_file_id_for_upload_file_document_rejects_invalid_source_type(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_type=DataSourceType.WEBSITE_CRAWL,
+ data_source_info={"url": "https://example.com"},
+ )
+
+ with pytest.raises(NotFound, match="invalid source"):
+ DocumentService._get_upload_file_id_for_upload_file_document(
+ document,
+ invalid_source_message="invalid source",
+ missing_file_message="missing file",
+ )
+
+
+def test_get_upload_file_id_for_upload_file_document_rejects_missing_upload_file_id(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={},
+ )
+
+ with pytest.raises(NotFound, match="missing file"):
+ DocumentService._get_upload_file_id_for_upload_file_document(
+ document,
+ invalid_source_message="invalid source",
+ missing_file_message="missing file",
+ )
+
+
+def test_get_upload_file_id_for_upload_file_document_returns_string_id(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": 99},
+ )
+
+ result = DocumentService._get_upload_file_id_for_upload_file_document(
+ document,
+ invalid_source_message="invalid source",
+ missing_file_message="missing file",
+ )
+
+ assert result == "99"
+
+
+def test_get_upload_file_for_upload_file_document_raises_when_file_service_returns_nothing(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": "missing-file"},
+ )
+
+ with patch("services.dataset_service.FileService.get_upload_files_by_ids", return_value={}):
+ with pytest.raises(NotFound, match="Uploaded file not found"):
+ DocumentService._get_upload_file_for_upload_file_document(document)
+
+
+def test_get_upload_file_for_upload_file_document_returns_upload_file(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ upload_file = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ )
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": upload_file.id},
+ )
+
+ result = DocumentService._get_upload_file_for_upload_file_document(document)
+
+ assert result.id == upload_file.id
+
+
+def test_get_upload_files_by_document_id_for_zip_download_raises_for_missing_documents(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+
+ with pytest.raises(NotFound, match="Document not found"):
+ DocumentService._get_upload_files_by_document_id_for_zip_download(
+ dataset_id=dataset.id,
+ document_ids=[str(uuid4())],
+ tenant_id=dataset.tenant_id,
+ )
+
+
+def test_get_upload_files_by_document_id_for_zip_download_rejects_cross_tenant_access(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ upload_file = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ )
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ tenant_id=str(uuid4()),
+ data_source_info={"upload_file_id": upload_file.id},
+ )
+
+ with pytest.raises(Forbidden, match="No permission"):
+ DocumentService._get_upload_files_by_document_id_for_zip_download(
+ dataset_id=dataset.id,
+ document_ids=[document.id],
+ tenant_id=dataset.tenant_id,
+ )
+
+
+def test_get_upload_files_by_document_id_for_zip_download_rejects_missing_upload_files(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": str(uuid4())},
+ )
+
+ with pytest.raises(NotFound, match="Only uploaded-file documents can be downloaded as ZIP"):
+ DocumentService._get_upload_files_by_document_id_for_zip_download(
+ dataset_id=dataset.id,
+ document_ids=[document.id],
+ tenant_id=dataset.tenant_id,
+ )
+
+
+def test_get_upload_files_by_document_id_for_zip_download_returns_document_keyed_mapping(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ upload_file_a = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ name="a.txt",
+ )
+ upload_file_b = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ name="b.txt",
+ )
+ document_a = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": upload_file_a.id},
+ )
+ document_b = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ data_source_info={"upload_file_id": upload_file_b.id},
+ )
+
+ mapping = DocumentService._get_upload_files_by_document_id_for_zip_download(
+ dataset_id=dataset.id,
+ document_ids=[document_a.id, document_b.id],
+ tenant_id=dataset.tenant_id,
+ )
+
+ assert mapping[document_a.id].id == upload_file_a.id
+ assert mapping[document_b.id].id == upload_file_b.id
+
+
+def test_prepare_document_batch_download_zip_raises_not_found_for_missing_dataset(
+ current_user_mock, flask_app_with_containers
+):
+ with flask_app_with_containers.app_context():
+ with pytest.raises(NotFound, match="Dataset not found"):
+ DocumentService.prepare_document_batch_download_zip(
+ dataset_id=str(uuid4()),
+ document_ids=[str(uuid4())],
+ tenant_id=current_user_mock.current_tenant_id,
+ current_user=current_user_mock,
+ )
+
+
+def test_prepare_document_batch_download_zip_translates_permission_error_to_forbidden(
+ db_session_with_containers,
+ current_user_mock,
+):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(
+ db_session_with_containers,
+ tenant_id=current_user_mock.current_tenant_id,
+ created_by=current_user_mock.id,
+ )
+
+ with patch(
+ "services.dataset_service.DatasetService.check_dataset_permission",
+ side_effect=NoPermissionError("denied"),
+ ):
+ with pytest.raises(Forbidden, match="denied"):
+ DocumentService.prepare_document_batch_download_zip(
+ dataset_id=dataset.id,
+ document_ids=[],
+ tenant_id=current_user_mock.current_tenant_id,
+ current_user=current_user_mock,
+ )
+
+
+def test_prepare_document_batch_download_zip_returns_upload_files_in_requested_order(
+ db_session_with_containers,
+ current_user_mock,
+):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(
+ db_session_with_containers,
+ tenant_id=current_user_mock.current_tenant_id,
+ created_by=current_user_mock.id,
+ )
+ upload_file_a = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ name="a.txt",
+ )
+ upload_file_b = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ name="b.txt",
+ )
+ document_a = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": upload_file_a.id},
+ )
+ document_b = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ data_source_info={"upload_file_id": upload_file_b.id},
+ )
+
+ upload_files, download_name = DocumentService.prepare_document_batch_download_zip(
+ dataset_id=dataset.id,
+ document_ids=[document_b.id, document_a.id],
+ tenant_id=current_user_mock.current_tenant_id,
+ current_user=current_user_mock,
+ )
+
+ assert [upload_file.id for upload_file in upload_files] == [upload_file_b.id, upload_file_a.id]
+ assert download_name.endswith(".zip")
+
+
+def test_get_document_by_dataset_id_returns_enabled_documents(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ enabled_document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ enabled=True,
+ )
+ DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ enabled=False,
+ )
+
+ result = DocumentService.get_document_by_dataset_id(dataset.id)
+
+ assert [document.id for document in result] == [enabled_document.id]
+
+
+def test_get_working_documents_by_dataset_id_returns_completed_enabled_unarchived_documents(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ available_document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ indexing_status=IndexingStatus.COMPLETED,
+ enabled=True,
+ archived=False,
+ )
+ DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ indexing_status=IndexingStatus.ERROR,
+ )
+
+ result = DocumentService.get_working_documents_by_dataset_id(dataset.id)
+
+ assert [document.id for document in result] == [available_document.id]
+
+
+def test_get_error_documents_by_dataset_id_returns_error_and_paused_documents(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ error_document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ indexing_status=IndexingStatus.ERROR,
+ )
+ paused_document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ indexing_status=IndexingStatus.PAUSED,
+ )
+ DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=3,
+ indexing_status=IndexingStatus.COMPLETED,
+ )
+
+ result = DocumentService.get_error_documents_by_dataset_id(dataset.id)
+
+ assert {document.id for document in result} == {error_document.id, paused_document.id}
+
+
+def test_get_batch_documents_filters_by_current_user_tenant(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ batch = f"batch-{uuid4()}"
+ matching_document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ batch=batch,
+ )
+ DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ tenant_id=str(uuid4()),
+ batch=batch,
+ )
+
+ with patch("services.dataset_service.current_user", create_autospec(Account, instance=True)) as current_user:
+ current_user.current_tenant_id = dataset.tenant_id
+ result = DocumentService.get_batch_documents(dataset.id, batch)
+
+ assert [document.id for document in result] == [matching_document.id]
+
+
+def test_get_document_file_detail_returns_upload_file(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ upload_file = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ )
+
+ result = DocumentService.get_document_file_detail(upload_file.id)
+
+ assert result is not None
+ assert result.id == upload_file.id
+
+
+def test_delete_document_emits_signal_and_commits(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ upload_file = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ )
+ document = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": upload_file.id},
+ )
+
+ with patch("services.dataset_service.document_was_deleted.send") as signal_send:
+ DocumentService.delete_document(document)
+
+ assert db_session_with_containers.get(Document, document.id) is None
+ signal_send.assert_called_once_with(
+ document.id,
+ dataset_id=document.dataset_id,
+ doc_form=document.doc_form,
+ file_id=upload_file.id,
+ )
+
+
+def test_delete_documents_ignores_empty_input(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+
+ with patch("services.dataset_service.batch_clean_document_task.delay") as delay:
+ DocumentService.delete_documents(dataset, [])
+
+ delay.assert_not_called()
+
+
+def test_delete_documents_deletes_rows_and_dispatches_cleanup_task(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ dataset.chunk_structure = IndexStructureType.PARAGRAPH_INDEX
+ db_session_with_containers.commit()
+ upload_file_a = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ name="a.txt",
+ )
+ upload_file_b = DocumentServiceIntegrationFactory.create_upload_file(
+ db_session_with_containers,
+ tenant_id=dataset.tenant_id,
+ created_by=dataset.created_by,
+ name="b.txt",
+ )
+ document_a = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ data_source_info={"upload_file_id": upload_file_a.id},
+ )
+ document_b = DocumentServiceIntegrationFactory.create_document(
+ db_session_with_containers,
+ dataset=dataset,
+ position=2,
+ data_source_info={"upload_file_id": upload_file_b.id},
+ )
+
+ with patch("services.dataset_service.batch_clean_document_task.delay") as delay:
+ DocumentService.delete_documents(dataset, [document_a.id, document_b.id])
+
+ assert db_session_with_containers.get(Document, document_a.id) is None
+ assert db_session_with_containers.get(Document, document_b.id) is None
+ delay.assert_called_once()
+ args = delay.call_args.args
+ assert args[0] == [document_a.id, document_b.id]
+ assert args[1] == dataset.id
+ assert set(args[3]) == {upload_file_a.id, upload_file_b.id}
+
+
+def test_get_documents_position_returns_next_position_when_documents_exist(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+ DocumentServiceIntegrationFactory.create_document(db_session_with_containers, dataset=dataset, position=3)
+
+ assert DocumentService.get_documents_position(dataset.id) == 4
+
+
+def test_get_documents_position_defaults_to_one_when_dataset_is_empty(db_session_with_containers):
+ dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
+
+ assert DocumentService.get_documents_position(dataset.id) == 1
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py
index 2974e00897..ac0483a45d 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_update_dataset.py
@@ -3,10 +3,10 @@ from unittest.mock import Mock, patch
from uuid import uuid4
import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
from sqlalchemy.orm import Session
from core.rag.index_processor.constant.index_type import IndexTechniqueType
+from graphon.model_runtime.entities.model_entities import ModelType
from models.account import (
Account,
AccountStatus,
diff --git a/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py b/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
index c8f04e9215..fe426ae516 100644
--- a/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
+++ b/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
@@ -5,9 +5,9 @@ Testcontainers integration tests for archived workflow run deletion service.
from datetime import UTC, datetime, timedelta
from uuid import uuid4
-from graphon.enums import WorkflowExecutionStatus
from sqlalchemy import select
+from graphon.enums import WorkflowExecutionStatus
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.workflow import WorkflowArchiveLog, WorkflowRun
from services.retention.workflow_run.delete_archived_workflow_run import ArchivedWorkflowRunDeletion
diff --git a/api/tests/test_containers_integration_tests/services/test_feature_service.py b/api/tests/test_containers_integration_tests/services/test_feature_service.py
index b3e7dd2a59..315936d721 100644
--- a/api/tests/test_containers_integration_tests/services/test_feature_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_feature_service.py
@@ -274,6 +274,7 @@ class TestFeatureService:
mock_config.ENABLE_EMAIL_CODE_LOGIN = True
mock_config.ENABLE_EMAIL_PASSWORD_LOGIN = True
mock_config.ENABLE_SOCIAL_OAUTH_LOGIN = False
+ mock_config.ENABLE_COLLABORATION_MODE = True
mock_config.ALLOW_REGISTER = False
mock_config.ALLOW_CREATE_WORKSPACE = False
mock_config.MAIL_TYPE = "smtp"
@@ -298,6 +299,7 @@ class TestFeatureService:
# Verify authentication settings
assert result.enable_email_code_login is True
assert result.enable_email_password_login is False
+ assert result.enable_collaboration_mode is True
assert result.is_allow_register is False
assert result.is_allow_create_workspace is False
@@ -401,6 +403,7 @@ class TestFeatureService:
mock_config.ENABLE_EMAIL_CODE_LOGIN = True
mock_config.ENABLE_EMAIL_PASSWORD_LOGIN = True
mock_config.ENABLE_SOCIAL_OAUTH_LOGIN = False
+ mock_config.ENABLE_COLLABORATION_MODE = False
mock_config.ALLOW_REGISTER = True
mock_config.ALLOW_CREATE_WORKSPACE = True
mock_config.MAIL_TYPE = "smtp"
@@ -422,6 +425,7 @@ class TestFeatureService:
assert result.enable_email_code_login is True
assert result.enable_email_password_login is True
assert result.enable_social_oauth_login is False
+ assert result.enable_collaboration_mode is False
assert result.is_allow_register is True
assert result.is_allow_create_workspace is True
assert result.is_email_setup is True
diff --git a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py
index c46b8fba0b..80f9083e81 100644
--- a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py
+++ b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test.py
@@ -3,15 +3,15 @@ import uuid
from unittest.mock import MagicMock
import pytest
-from graphon.enums import BuiltinNodeTypes
-from graphon.nodes.human_input.entities import HumanInputNodeData
-from core.workflow.human_input_compat import (
+from core.workflow.human_input_adapter import (
EmailDeliveryConfig,
EmailDeliveryMethod,
EmailRecipients,
ExternalRecipient,
)
+from graphon.enums import BuiltinNodeTypes
+from graphon.nodes.human_input.entities import HumanInputNodeData
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
from models.model import App, AppMode
from models.workflow import Workflow, WorkflowType
diff --git a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
index 0f252515f7..ed75363f3b 100644
--- a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
@@ -5,17 +5,17 @@ from unittest.mock import MagicMock, patch
from uuid import uuid4
import pytest
-from graphon.runtime import VariablePool
from sqlalchemy.engine import Engine
from configs import dify_config
-from core.workflow.human_input_compat import (
+from core.workflow.human_input_adapter import (
EmailDeliveryConfig,
EmailDeliveryMethod,
EmailRecipients,
ExternalRecipient,
MemberRecipient,
)
+from graphon.runtime import VariablePool
from models.account import Account, TenantAccountJoin
from services import human_input_delivery_test_service as service_module
from services.human_input_delivery_test_service import (
diff --git a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
index 2340dd2a03..cd63d3ad6c 100644
--- a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
@@ -8,11 +8,11 @@ from unittest.mock import MagicMock, patch
import pytest
from faker import Faker
-from graphon.file import FileType
from sqlalchemy.orm import Session
from enums.cloud_plan import CloudPlan
from extensions.ext_redis import redis_client
+from graphon.file import FileType
from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
from models.enums import (
ConversationFromSource,
diff --git a/api/tests/test_containers_integration_tests/services/test_model_provider_service.py b/api/tests/test_containers_integration_tests/services/test_model_provider_service.py
index ba926bf675..8955a3b5f2 100644
--- a/api/tests/test_containers_integration_tests/services/test_model_provider_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_model_provider_service.py
@@ -2,10 +2,10 @@ from unittest.mock import MagicMock, patch
import pytest
from faker import Faker
-from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
from sqlalchemy.orm import Session
from core.entities.model_entities import ModelStatus
+from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
from models.provider import Provider, ProviderModel, ProviderModelSetting, ProviderType
from services.model_provider_service import ModelProviderService
@@ -405,11 +405,10 @@ class TestModelProviderService:
mock_provider_manager = mock_external_service_dependencies["provider_manager"].return_value
# Create mock models
+ from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
from graphon.model_runtime.entities.common_entities import I18nObject
from graphon.model_runtime.entities.provider_entities import ProviderEntity
- from core.entities.model_entities import ModelWithProviderEntity, SimpleModelProviderEntity
-
# Create real model objects instead of mocks
provider_entity_1 = SimpleModelProviderEntity(
ProviderEntity(
@@ -644,9 +643,8 @@ class TestModelProviderService:
mock_provider_manager = mock_external_service_dependencies["provider_manager"].return_value
# Create mock default model response
- from graphon.model_runtime.entities.common_entities import I18nObject
-
from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
+ from graphon.model_runtime.entities.common_entities import I18nObject
mock_default_model = DefaultModelEntity(
model="gpt-3.5-turbo",
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
index 749c6fff5b..1e57b5603d 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
@@ -8,9 +8,9 @@ from unittest.mock import patch
import pytest
from faker import Faker
-from graphon.enums import WorkflowExecutionStatus
from sqlalchemy.orm import Session
+from graphon.enums import WorkflowExecutionStatus
from models import EndUser, Workflow, WorkflowAppLog, WorkflowArchiveLog, WorkflowRun
from models.enums import AppTriggerType, CreatorUserRole, WorkflowRunTriggeredFrom
from models.workflow import WorkflowAppLogCreatedFrom
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
index 0c281c8c33..86cf2327c7 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
@@ -1,9 +1,9 @@
import pytest
from faker import Faker
-from graphon.variables.segments import StringSegment
from sqlalchemy.orm import Session
from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from graphon.variables.segments import StringSegment
from models import App, Workflow
from models.enums import DraftVariableType
from models.workflow import WorkflowDraftVariable
diff --git a/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py b/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py
index d3e765055a..af83adaae0 100644
--- a/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py
+++ b/api/tests/test_containers_integration_tests/services/tools/test_api_tools_manage_service.py
@@ -1,3 +1,5 @@
+import inspect
+import json
from unittest.mock import patch
import pytest
@@ -6,6 +8,8 @@ from pydantic import TypeAdapter, ValidationError
from sqlalchemy.orm import Session
from core.tools.entities.tool_entities import ApiProviderSchemaType
+from core.tools.errors import ApiToolProviderNotFoundError
+from core.tools.tool_label_manager import ToolLabelManager
from models import Account, Tenant
from models.tools import ApiToolProvider
from services.tools.api_tools_manage_service import ApiToolManageService
@@ -590,30 +594,204 @@ class TestApiToolManageService:
with pytest.raises(ValueError, match="you have not added provider"):
ApiToolManageService.delete_api_tool_provider(account.id, tenant.id, "nonexistent")
- def test_update_api_tool_provider_not_found(
+ def test_update_api_tool_provider_success(
self, flask_req_ctx_with_containers, db_session_with_containers: Session, mock_external_service_dependencies
):
- """Test update raises ValueError when original provider not found."""
fake = Faker()
+
+ # Firmware fix for cache.delete() in update flow
+ mock_encrypter = mock_external_service_dependencies["encrypter"]
+ from unittest.mock import MagicMock
+
+ mock_cache = MagicMock()
+ mock_cache.delete.return_value = None
+ mock_encrypter.return_value = (mock_encrypter, mock_cache)
+
+ # Get fake account and tenant
account, tenant = self._create_test_account_and_tenant(
db_session_with_containers, mock_external_service_dependencies
)
- with pytest.raises(ValueError, match="does not exists"):
- ApiToolManageService.update_api_tool_provider(
+ # original provider name
+ original_name = "original-provider"
+
+ # Create original provider
+ _ = ApiToolManageService.create_api_tool_provider(
+ user_id=account.id,
+ tenant_id=tenant.id,
+ provider_name=original_name,
+ icon={"type": "emoji", "value": "🔧"},
+ credentials={"auth_type": "none"},
+ schema_type=ApiProviderSchemaType.OPENAPI,
+ schema=self._create_test_openapi_schema(),
+ privacy_policy="",
+ custom_disclaimer="",
+ labels=["old-label"],
+ )
+
+ # new provide name and new labels for update
+ new_name = "updated-provider"
+ new_labels = ["new-label-1", "new-label-2"]
+
+ # Reset mock history so assertions focus on update path only
+ mock_external_service_dependencies["encrypter"].reset_mock()
+ mock_external_service_dependencies["provider_controller"].from_db.reset_mock()
+ mock_external_service_dependencies["tool_label_manager"].update_tool_labels.reset_mock()
+
+ # Act: Update the provider with new values
+ result = ApiToolManageService.update_api_tool_provider(
+ user_id=account.id,
+ tenant_id=tenant.id,
+ # new provider name - changed 1
+ provider_name=new_name,
+ original_provider=original_name,
+ # new icon - changed 2
+ icon={"type": "emoji", "value": "🚀"},
+ credentials={"auth_type": "none"},
+ _schema_type=ApiProviderSchemaType.OPENAPI,
+ schema=self._create_test_openapi_schema(),
+ # new privacy policy - changed 3
+ privacy_policy="https://new-policy.com",
+ # new custom disclaimer - changed 4
+ custom_disclaimer="New disclaimer",
+ # new labels - changed 5 (However, we will not verify this, not this layer responsibility.)
+ labels=new_labels,
+ )
+
+ # Assert: Verify the result
+ assert result == {"result": "success"}
+
+ # Get the updated provider from the database
+ updated_provider: ApiToolProvider | None = (
+ db_session_with_containers.query(ApiToolProvider)
+ .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == new_name)
+ .first()
+ )
+
+ # Verify the provider was updated successfully
+ assert updated_provider is not None
+
+ # Manually refresh to keep object detachment
+ db_session_with_containers.refresh(updated_provider)
+ # Verify all the updated fields
+ # - changed 1
+ assert updated_provider.name == new_name
+ # - changed 2
+ icon_data = json.loads(updated_provider.icon)
+ assert icon_data["type"] == "emoji"
+ assert icon_data["value"] == "🚀"
+ # - changed 3
+ assert updated_provider.privacy_policy == "https://new-policy.com"
+ # - changed 4
+ assert updated_provider.custom_disclaimer == "New disclaimer"
+
+ # Verify old provider name no longer exists after rename
+ original_provider: ApiToolProvider | None = (
+ db_session_with_containers.query(ApiToolProvider)
+ .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == original_name)
+ .first()
+ )
+ assert original_provider is None
+
+ # Verify update flow calls critical collaborators
+ mock_external_service_dependencies["provider_controller"].from_db.assert_called_once()
+ mock_external_service_dependencies["encrypter"].assert_called_once()
+ mock_cache.delete.assert_called_once()
+
+ # Deeply verify on session propagation of labels update logics:
+ # Since in refactoring, we pass session down to label manager to keep atomicity.
+ # The assertion here is to verify this.
+ sig = inspect.signature(ToolLabelManager.update_tool_labels)
+ args, kwargs = mock_external_service_dependencies["tool_label_manager"].update_tool_labels.call_args
+ bound_args = sig.bind(*args, **kwargs)
+ passed_session = bound_args.arguments.get("session")
+ # Ensure the type: Session
+ assert isinstance(passed_session, Session), f"Expected Session object, got {type(passed_session)}"
+ assert passed_session is not None, (
+ "Atomicity Failure: Session cannot be passed to Label Manager in update_api_tool_provider"
+ )
+
+ def test_update_api_tool_provider_not_found(
+ self, flask_req_ctx_with_containers, db_session_with_containers: Session, mock_external_service_dependencies
+ ):
+ """
+ Test update raises ValueError when original provider not found.
+
+ This test verifies:
+ - Proper error when trying to update a non-existing original provider
+ - No accidental upsert/new provider creation
+ - No external dependency invocation on early failure path
+ """
+ # Arrange: Create test account and tenant
+ account, tenant = self._create_test_account_and_tenant(
+ db_session_with_containers, mock_external_service_dependencies
+ )
+
+ # Keep an existing provider in DB to ensure unrelated data remains unchanged
+ existing_provider_name = "existing-provider"
+ _ = ApiToolManageService.create_api_tool_provider(
+ user_id=account.id,
+ tenant_id=tenant.id,
+ provider_name=existing_provider_name,
+ icon={"type": "emoji", "value": "🔧"},
+ credentials={"auth_type": "none"},
+ schema_type=ApiProviderSchemaType.OPENAPI,
+ schema=self._create_test_openapi_schema(),
+ privacy_policy="https://existing-policy.com",
+ custom_disclaimer="Existing disclaimer",
+ labels=["existing-label"],
+ )
+
+ # Reset mock history so assertions focus on update failure path only
+ mock_external_service_dependencies["tool_label_manager"].update_tool_labels.reset_mock()
+ mock_external_service_dependencies["encrypter"].reset_mock()
+ mock_external_service_dependencies["provider_controller"].from_db.reset_mock()
+
+ # Act & Assert: Verify update fails with clear error message
+ target_new_name = "new-provider-name"
+ missing_original_name = "missing-original-provider"
+ with pytest.raises(ApiToolProviderNotFoundError) as exc_info:
+ _ = ApiToolManageService.update_api_tool_provider(
user_id=account.id,
tenant_id=tenant.id,
- provider_name="new-name",
- original_provider="nonexistent",
- icon={},
+ provider_name=target_new_name,
+ original_provider=missing_original_name,
+ icon={"type": "emoji", "value": "🚀"},
credentials={"auth_type": "none"},
_schema_type=ApiProviderSchemaType.OPENAPI,
schema=self._create_test_openapi_schema(),
- privacy_policy=None,
- custom_disclaimer="",
- labels=[],
+ privacy_policy="https://new-policy.com",
+ custom_disclaimer="New disclaimer",
+ labels=["new-label"],
)
+ error = exc_info.value
+ assert error.provider_name == missing_original_name
+ assert error.tenant_id == tenant.id
+ assert error.error_code == "api_tool_provider_not_found"
+
+ # Assert: Existing provider should remain unchanged
+ existing_provider: ApiToolProvider | None = (
+ db_session_with_containers.query(ApiToolProvider)
+ .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == existing_provider_name)
+ .first()
+ )
+ assert existing_provider is not None
+ assert existing_provider.name == existing_provider_name
+
+ # Assert: No new provider should be created
+ unexpected_new_provider: ApiToolProvider | None = (
+ db_session_with_containers.query(ApiToolProvider)
+ .filter(ApiToolProvider.tenant_id == tenant.id, ApiToolProvider.name == target_new_name)
+ .first()
+ )
+ assert unexpected_new_provider is None
+
+ # Assert: Early failure should skip all downstream external interactions
+ mock_external_service_dependencies["tool_label_manager"].update_tool_labels.assert_not_called()
+ mock_external_service_dependencies["encrypter"].assert_not_called()
+ mock_external_service_dependencies["provider_controller"].from_db.assert_not_called()
+
def test_update_api_tool_provider_missing_auth_type(
self, flask_req_ctx_with_containers, db_session_with_containers: Session, mock_external_service_dependencies
):
diff --git a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
index ce2fd2eeb1..ce5c2bd162 100644
--- a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
+++ b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_converter.py
@@ -5,9 +5,6 @@ from unittest.mock import MagicMock, patch
import pytest
from faker import Faker
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.message_entities import PromptMessageRole
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
from sqlalchemy.orm import Session
from core.app.app_config.entities import (
@@ -21,6 +18,9 @@ from core.app.app_config.entities import (
PromptTemplateEntity,
)
from core.prompt.utils.prompt_template_parser import PromptTemplateParser
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.message_entities import PromptMessageRole
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
from models import Account, Tenant
from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
from models.model import App, AppMode, AppModelConfig
diff --git a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
index 7c43bf676b..4dab895135 100644
--- a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
+++ b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
@@ -1,10 +1,10 @@
from datetime import datetime, timedelta
from uuid import uuid4
-from graphon.enums import WorkflowNodeExecutionStatus
from sqlalchemy import Engine, select
from sqlalchemy.orm import Session, sessionmaker
+from graphon.enums import WorkflowNodeExecutionStatus
from libs.datetime_utils import naive_utc_now
from models.enums import CreatorUserRole
from models.workflow import WorkflowNodeExecutionModel
diff --git a/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py b/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
index 2fb62e0fc0..fa3ac12cf0 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
@@ -11,7 +11,8 @@ from unittest.mock import Mock, patch
import pytest
from faker import Faker
-from sqlalchemy import func, select
+from sqlalchemy import ColumnElement, func, select
+from sqlalchemy.orm import Session
from core.rag.index_processor.constant.index_type import IndexStructureType
from models.dataset import Dataset, Document, DocumentSegment
@@ -21,6 +22,14 @@ from tasks.clean_notion_document_task import clean_notion_document_task
from tests.test_containers_integration_tests.helpers import generate_valid_password
+def _count_documents(session: Session, condition: ColumnElement[bool]) -> int:
+ return session.scalar(select(func.count()).select_from(Document).where(condition)) or 0
+
+
+def _count_segments(session: Session, condition: ColumnElement[bool]) -> int:
+ return session.scalar(select(func.count()).select_from(DocumentSegment).where(condition)) or 0
+
+
class TestCleanNotionDocumentTask:
"""Integration tests for clean_notion_document_task using testcontainers."""
@@ -146,29 +155,14 @@ class TestCleanNotionDocumentTask:
db_session_with_containers.commit()
# Verify data exists before cleanup
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.id.in_(document_ids))
- )
- == 3
- )
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(document_ids))
- )
- == 6
- )
+ assert _count_documents(db_session_with_containers, Document.id.in_(document_ids)) == 3
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(document_ids)) == 6
# Execute cleanup task
clean_notion_document_task(document_ids, dataset.id)
# Verify segments are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(document_ids))
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(document_ids)) == 0
# Verify index processor was called
mock_processor = mock_index_processor_factory.return_value.init_index_processor.return_value
@@ -328,12 +322,7 @@ class TestCleanNotionDocumentTask:
# The task properly handles various index types and document configurations.
# Verify segments are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
# Reset mock for next iteration
mock_index_processor_factory.reset_mock()
@@ -416,12 +405,7 @@ class TestCleanNotionDocumentTask:
clean_notion_document_task([document.id], dataset.id)
# Verify segments are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
# Note: This test successfully verifies that segments without index_node_ids
# are properly deleted from the database.
@@ -507,18 +491,8 @@ class TestCleanNotionDocumentTask:
db_session_with_containers.commit()
# Verify all data exists before cleanup
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.dataset_id == dataset.id)
- )
- == 5
- )
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
- )
- == 10
- )
+ assert _count_documents(db_session_with_containers, Document.dataset_id == dataset.id) == 5
+ assert _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id) == 10
# Clean up only first 3 documents
documents_to_clean = [doc.id for doc in documents[:3]]
@@ -528,29 +502,12 @@ class TestCleanNotionDocumentTask:
clean_notion_document_task(documents_to_clean, dataset.id)
# Verify only specified documents' segments are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count())
- .select_from(DocumentSegment)
- .where(DocumentSegment.document_id.in_(documents_to_clean))
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(documents_to_clean)) == 0
# Verify remaining documents and segments are intact
remaining_docs = [doc.id for doc in documents[3:]]
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.id.in_(remaining_docs))
- )
- == 2
- )
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(remaining_docs))
- )
- == 4
- )
+ assert _count_documents(db_session_with_containers, Document.id.in_(remaining_docs)) == 2
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(remaining_docs)) == 4
# Note: This test successfully verifies partial document cleanup operations.
# The database operations work correctly, isolating only the specified documents.
@@ -634,23 +591,13 @@ class TestCleanNotionDocumentTask:
db_session_with_containers.commit()
# Verify all segments exist before cleanup
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
- )
- == 4
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 4
# Execute cleanup task
clean_notion_document_task([document.id], dataset.id)
# Verify all segments are deleted regardless of status
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
# Note: This test successfully verifies database operations.
# IndexProcessor verification would require more sophisticated mocking.
@@ -820,16 +767,9 @@ class TestCleanNotionDocumentTask:
db_session_with_containers.commit()
# Verify all data exists before cleanup
+ assert _count_documents(db_session_with_containers, Document.dataset_id == dataset.id) == num_documents
assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.dataset_id == dataset.id)
- )
- == num_documents
- )
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
- )
+ _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id)
== num_documents * num_segments_per_doc
)
@@ -838,12 +778,7 @@ class TestCleanNotionDocumentTask:
clean_notion_document_task(all_document_ids, dataset.id)
# Verify all segments are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id) == 0
# Note: This test successfully verifies bulk document cleanup operations.
# The database efficiently handles large-scale deletions.
@@ -950,29 +885,12 @@ class TestCleanNotionDocumentTask:
clean_notion_document_task([target_document.id], target_dataset.id)
# Verify only documents' segments from target dataset are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count())
- .select_from(DocumentSegment)
- .where(DocumentSegment.document_id == target_document.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == target_document.id) == 0
# Verify documents from other datasets remain intact
remaining_docs = [doc.id for doc in all_documents[1:]]
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.id.in_(remaining_docs))
- )
- == 2
- )
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id.in_(remaining_docs))
- )
- == 6
- )
+ assert _count_documents(db_session_with_containers, Document.id.in_(remaining_docs)) == 2
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id.in_(remaining_docs)) == 6
# Note: This test successfully verifies multi-tenant isolation.
# Only documents from the target dataset are affected, maintaining tenant separation.
@@ -1067,13 +985,9 @@ class TestCleanNotionDocumentTask:
db_session_with_containers.commit()
# Verify all data exists before cleanup
- assert db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.dataset_id == dataset.id)
- ) == len(document_statuses)
+ assert _count_documents(db_session_with_containers, Document.dataset_id == dataset.id) == len(document_statuses)
assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
- )
+ _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id)
== len(document_statuses) * 2
)
@@ -1082,12 +996,7 @@ class TestCleanNotionDocumentTask:
clean_notion_document_task(all_document_ids, dataset.id)
# Verify all segments are deleted regardless of status
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.dataset_id == dataset.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.dataset_id == dataset.id) == 0
# Note: This test successfully verifies cleanup of documents in various states.
# All documents are deleted regardless of their indexing status.
@@ -1185,29 +1094,14 @@ class TestCleanNotionDocumentTask:
db_session_with_containers.commit()
# Verify data exists before cleanup
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(Document).where(Document.id == document.id)
- )
- == 1
- )
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
- )
- == 3
- )
+ assert _count_documents(db_session_with_containers, Document.id == document.id) == 1
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 3
# Execute cleanup task
clean_notion_document_task([document.id], dataset.id)
# Verify segments are deleted
- assert (
- db_session_with_containers.scalar(
- select(func.count()).select_from(DocumentSegment).where(DocumentSegment.document_id == document.id)
- )
- == 0
- )
+ assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
# Note: This test successfully verifies cleanup of documents with rich metadata.
# The task properly handles complex document structures and metadata fields.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
index d457b59d58..48fec441c5 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
@@ -11,6 +11,7 @@ from unittest.mock import ANY, Mock, patch
import pytest
from faker import Faker
+from sqlalchemy import select
from core.rag.index_processor.constant.index_type import IndexStructureType
from models.dataset import Dataset, Document, DocumentSegment
@@ -221,7 +222,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify document status was updated to indexing then completed
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
# Verify index processor load method was called
@@ -322,7 +325,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "update")
# Verify document status was updated to indexing then completed
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
# Verify index processor clean and load methods were called
@@ -431,7 +436,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify document status was updated to indexing then completed
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
# Verify that no index processor load was called since no segments exist
@@ -564,7 +571,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify document status was updated to error
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.ERROR
assert "Test exception during indexing" in updated_document.error
@@ -635,7 +644,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify document status was updated to indexing then completed
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
# Verify index processor was initialized with custom index type
@@ -711,7 +722,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify document status was updated to indexing then completed
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
# Verify index processor was initialized with the document's index type
@@ -815,7 +828,9 @@ class TestDealDatasetVectorIndexTask:
# Verify all documents were processed
for document in documents:
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
# Verify index processor load was called multiple times
@@ -917,7 +932,9 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify final document status
- updated_document = db_session_with_containers.query(Document).filter_by(id=document.id).first()
+ updated_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == document.id).limit(1)
+ )
assert updated_document.indexing_status == IndexingStatus.COMPLETED
def test_deal_dataset_vector_index_task_with_disabled_documents(
@@ -1027,12 +1044,14 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify only enabled document was processed
- updated_enabled_document = db_session_with_containers.query(Document).filter_by(id=enabled_document.id).first()
+ updated_enabled_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == enabled_document.id).limit(1)
+ )
assert updated_enabled_document.indexing_status == IndexingStatus.COMPLETED
# Verify disabled document status remains unchanged
- updated_disabled_document = (
- db_session_with_containers.query(Document).filter_by(id=disabled_document.id).first()
+ updated_disabled_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == disabled_document.id).limit(1)
)
assert updated_disabled_document.indexing_status == IndexingStatus.COMPLETED # Should not change
@@ -1148,12 +1167,14 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify only active document was processed
- updated_active_document = db_session_with_containers.query(Document).filter_by(id=active_document.id).first()
+ updated_active_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == active_document.id).limit(1)
+ )
assert updated_active_document.indexing_status == IndexingStatus.COMPLETED
# Verify archived document status remains unchanged
- updated_archived_document = (
- db_session_with_containers.query(Document).filter_by(id=archived_document.id).first()
+ updated_archived_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == archived_document.id).limit(1)
)
assert updated_archived_document.indexing_status == IndexingStatus.COMPLETED # Should not change
@@ -1269,14 +1290,14 @@ class TestDealDatasetVectorIndexTask:
deal_dataset_vector_index_task(dataset.id, "add")
# Verify only completed document was processed
- updated_completed_document = (
- db_session_with_containers.query(Document).filter_by(id=completed_document.id).first()
+ updated_completed_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == completed_document.id).limit(1)
)
assert updated_completed_document.indexing_status == IndexingStatus.COMPLETED
# Verify incomplete document status remains unchanged
- updated_incomplete_document = (
- db_session_with_containers.query(Document).filter_by(id=incomplete_document.id).first()
+ updated_incomplete_document = db_session_with_containers.scalar(
+ select(Document).where(Document.id == incomplete_document.id).limit(1)
)
assert updated_incomplete_document.indexing_status == IndexingStatus.INDEXING # Should not change
diff --git a/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py b/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
index 6a8e186958..39c58987fd 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
@@ -2,6 +2,7 @@ from unittest.mock import MagicMock, patch
import pytest
from faker import Faker
+from sqlalchemy import select
from core.indexing_runner import DocumentIsPausedError
from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
@@ -317,7 +318,7 @@ class TestDuplicateDocumentIndexingTasks:
# Verify documents were updated to parsing status
# Re-query documents from database since _duplicate_document_indexing_task uses a different session
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
assert updated_document.processing_started_at is not None
@@ -362,14 +363,14 @@ class TestDuplicateDocumentIndexingTasks:
# Verify segments were deleted from database
# Re-query segments from database using captured IDs to avoid stale ORM instances
for seg_id in segment_ids:
- deleted_segment = (
- db_session_with_containers.query(DocumentSegment).where(DocumentSegment.id == seg_id).first()
+ deleted_segment = db_session_with_containers.scalar(
+ select(DocumentSegment).where(DocumentSegment.id == seg_id).limit(1)
)
assert deleted_segment is None
# Verify documents were updated to parsing status
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
assert updated_document.processing_started_at is not None
@@ -438,7 +439,7 @@ class TestDuplicateDocumentIndexingTasks:
# Verify only existing documents were updated
# Re-query documents from database since _duplicate_document_indexing_task uses a different session
for doc_id in existing_document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
assert updated_document.processing_started_at is not None
@@ -485,7 +486,7 @@ class TestDuplicateDocumentIndexingTasks:
# Verify documents were still updated to parsing status before the exception
# Re-query documents from database since _duplicate_document_indexing_task close the session
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
assert updated_document.processing_started_at is not None
@@ -543,7 +544,7 @@ class TestDuplicateDocumentIndexingTasks:
# Assert: Verify error handling
# Re-query documents from database since _duplicate_document_indexing_task uses a different session
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.ERROR
assert updated_document.error is not None
assert "batch upload" in updated_document.error.lower()
@@ -585,7 +586,7 @@ class TestDuplicateDocumentIndexingTasks:
# Assert: Verify error handling
# Re-query documents from database since _duplicate_document_indexing_task uses a different session
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.ERROR
assert updated_document.error is not None
assert "limit" in updated_document.error.lower()
@@ -649,7 +650,7 @@ class TestDuplicateDocumentIndexingTasks:
# Verify documents were processed
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
@patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
@@ -692,7 +693,7 @@ class TestDuplicateDocumentIndexingTasks:
# Verify documents were processed
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
@patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
@@ -736,7 +737,7 @@ class TestDuplicateDocumentIndexingTasks:
# Verify documents were processed
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.indexing_status == IndexingStatus.PARSING
@patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
@@ -851,7 +852,7 @@ class TestDuplicateDocumentIndexingTasks:
# Assert
for doc_id in document_ids:
- updated_document = db_session_with_containers.query(Document).where(Document.id == doc_id).first()
+ updated_document = db_session_with_containers.scalar(select(Document).where(Document.id == doc_id).limit(1))
assert updated_document.is_paused is True
assert updated_document.indexing_status == IndexingStatus.PARSING
assert updated_document.display_status == "paused"
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
index 1b4dcf28ea..95a867dbb5 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
@@ -3,9 +3,6 @@ from datetime import UTC, datetime
from unittest.mock import patch
import pytest
-from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.entities import HumanInputNodeData
-from graphon.runtime import GraphRuntimeState, VariablePool
from sqlalchemy import delete
from configs import dify_config
@@ -13,7 +10,7 @@ from core.app.app_config.entities import WorkflowUIBasedAppConfig
from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
from core.app.layers.pause_state_persist_layer import WorkflowResumptionContext
from core.repositories.human_input_repository import FormCreateParams, HumanInputFormRepositoryImpl
-from core.workflow.human_input_compat import (
+from core.workflow.human_input_adapter import (
EmailDeliveryConfig,
EmailDeliveryMethod,
EmailRecipients,
@@ -21,6 +18,9 @@ from core.workflow.human_input_compat import (
MemberRecipient,
)
from extensions.ext_storage import storage
+from graphon.enums import WorkflowExecutionStatus
+from graphon.nodes.human_input.entities import HumanInputNodeData
+from graphon.runtime import GraphRuntimeState, VariablePool
from models.account import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole
from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
from models.human_input import HumanInputDelivery, HumanInputForm, HumanInputFormRecipient
diff --git a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
index b5bef145d5..b43b622870 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
@@ -2,12 +2,12 @@ import uuid
from unittest.mock import ANY, call, patch
import pytest
-from graphon.variables.segments import StringSegment
-from graphon.variables.types import SegmentType
from sqlalchemy import delete, func, select
from core.db.session_factory import session_factory
from extensions.storage.storage_type import StorageType
+from graphon.variables.segments import StringSegment
+from graphon.variables.types import SegmentType
from libs.datetime_utils import naive_utc_now
from models import Tenant
from models.enums import CreatorUserRole
diff --git a/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py b/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
index 6e98c0855a..b00d827e37 100644
--- a/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
+++ b/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
@@ -24,12 +24,12 @@ from dataclasses import dataclass
from datetime import timedelta
import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus
from sqlalchemy import delete, func, select
from sqlalchemy.orm import Session, selectinload, sessionmaker
from extensions.ext_storage import storage
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus
from libs.datetime_utils import naive_utc_now
from models import Account
from models import WorkflowPause as WorkflowPauseModel
diff --git a/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py b/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py
index d725fb990a..55aec49878 100644
--- a/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py
+++ b/api/tests/test_containers_integration_tests/trigger/test_trigger_e2e.py
@@ -10,7 +10,6 @@ from typing import Any
import pytest
from flask import Flask, Response
from flask.testing import FlaskClient
-from graphon.enums import BuiltinNodeTypes
from sqlalchemy import select
from sqlalchemy.orm import Session
@@ -25,6 +24,7 @@ from core.trigger.debug import event_selectors
from core.trigger.debug.event_bus import TriggerDebugEventBus
from core.trigger.debug.event_selectors import PluginTriggerDebugEventPoller, WebhookTriggerDebugEventPoller
from core.trigger.debug.events import PluginTriggerDebugEvent, build_plugin_pool_key
+from graphon.enums import BuiltinNodeTypes
from libs.datetime_utils import naive_utc_now
from models.account import Account, Tenant
from models.enums import AppTriggerStatus, AppTriggerType, CreatorUserRole, WorkflowTriggerStatus
diff --git a/api/tests/unit_tests/controllers/console/app/test_audio.py b/api/tests/unit_tests/controllers/console/app/test_audio.py
index c52bc02420..2d218dac7e 100644
--- a/api/tests/unit_tests/controllers/console/app/test_audio.py
+++ b/api/tests/unit_tests/controllers/console/app/test_audio.py
@@ -4,7 +4,6 @@ import io
from types import SimpleNamespace
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from werkzeug.datastructures import FileStorage
from werkzeug.exceptions import InternalServerError
@@ -21,6 +20,7 @@ from controllers.console.app.error import (
UnsupportedAudioTypeError,
)
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
from services.audio_service import AudioService
from services.errors.app_model_config import AppModelConfigBrokenError
from services.errors.audio import (
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
index 11b3b3470d..24b7e39f73 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_api.py
@@ -33,12 +33,17 @@ def test_completion_conversation_list_returns_paginated_result(app, monkeypatch:
monkeypatch.setattr(conversation_module, "parse_time_range", lambda *_args, **_kwargs: (None, None))
paginate_result = MagicMock()
+ paginate_result.page = 1
+ paginate_result.per_page = 20
+ paginate_result.total = 0
+ paginate_result.has_next = False
+ paginate_result.items = []
monkeypatch.setattr(conversation_module.db, "paginate", lambda *_args, **_kwargs: paginate_result)
with app.test_request_context("/console/api/apps/app-1/completion-conversations", method="GET"):
response = method(app_model=SimpleNamespace(id="app-1"))
- assert response is paginate_result
+ assert response == {"page": 1, "limit": 20, "total": 0, "has_more": False, "data": []}
def test_completion_conversation_list_invalid_time_range(app, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -71,12 +76,17 @@ def test_chat_conversation_list_advanced_chat_calls_paginate(app, monkeypatch: p
monkeypatch.setattr(conversation_module, "parse_time_range", lambda *_args, **_kwargs: (None, None))
paginate_result = MagicMock()
+ paginate_result.page = 1
+ paginate_result.per_page = 20
+ paginate_result.total = 0
+ paginate_result.has_next = False
+ paginate_result.items = []
monkeypatch.setattr(conversation_module.db, "paginate", lambda *_args, **_kwargs: paginate_result)
with app.test_request_context("/console/api/apps/app-1/chat-conversations", method="GET"):
response = method(app_model=SimpleNamespace(id="app-1", mode=AppMode.ADVANCED_CHAT))
- assert response is paginate_result
+ assert response == {"page": 1, "limit": 20, "total": 0, "has_more": False, "data": []}
def test_get_conversation_updates_read_at(monkeypatch: pytest.MonkeyPatch) -> None:
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
index 42b3420c31..1a412aff29 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
@@ -5,10 +5,10 @@ from datetime import UTC, datetime
from types import SimpleNamespace
import pytest
-from graphon.variables.types import SegmentType
from pydantic import ValidationError
from controllers.console.app import conversation_variables as conversation_variables_module
+from graphon.variables.types import SegmentType
def _unwrap(func):
diff --git a/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py b/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
index baac4cd4e0..1af15d8dc6 100644
--- a/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
+++ b/api/tests/unit_tests/controllers/console/app/test_mcp_server_response.py
@@ -1,6 +1,25 @@
import datetime
+from types import SimpleNamespace
+from unittest.mock import PropertyMock, patch
-from controllers.console.app.mcp_server import AppMCPServerResponse
+from flask import Flask
+
+from controllers.console import console_ns
+from controllers.console.app.mcp_server import AppMCPServerController, AppMCPServerResponse
+
+
+def unwrap(func):
+ while hasattr(func, "__wrapped__"):
+ func = func.__wrapped__
+ return func
+
+
+class _ValidatedResponse:
+ def __init__(self, payload):
+ self._payload = payload
+
+ def model_dump(self, mode="json"):
+ return self._payload
class TestAppMCPServerResponse:
@@ -40,6 +59,18 @@ class TestAppMCPServerResponse:
resp = AppMCPServerResponse.model_validate(data)
assert resp.parameters == {"already": "parsed"}
+ def test_parameters_json_array_parsed(self):
+ data = {
+ "id": "s1",
+ "name": "test",
+ "server_code": "code",
+ "description": "desc",
+ "status": "active",
+ "parameters": '["a", "b"]',
+ }
+ resp = AppMCPServerResponse.model_validate(data)
+ assert resp.parameters == ["a", "b"]
+
def test_timestamps_normalized(self):
dt = datetime.datetime(2024, 1, 1, 0, 0, 0, tzinfo=datetime.UTC)
data = {
@@ -68,3 +99,40 @@ class TestAppMCPServerResponse:
resp = AppMCPServerResponse.model_validate(data)
assert resp.created_at is None
assert resp.updated_at is None
+
+
+class TestAppMCPServerController:
+ def test_get_returns_empty_dict_when_server_missing(self):
+ api = AppMCPServerController()
+ method = unwrap(api.get)
+
+ with patch("controllers.console.app.mcp_server.db.session.scalar", return_value=None):
+ response = method(api, app_model=SimpleNamespace(id="app-1"))
+
+ assert response == {}
+
+ def test_post_returns_201(self):
+ api = AppMCPServerController()
+ method = unwrap(api.post)
+ payload = {"parameters": {"timeout": 30}}
+ app = Flask(__name__)
+ app.config["TESTING"] = True
+
+ with (
+ app.test_request_context("/", json=payload),
+ patch.object(type(console_ns), "payload", new_callable=PropertyMock, return_value=payload),
+ patch("controllers.console.app.mcp_server.current_account_with_tenant", return_value=(None, "tenant-1")),
+ patch("controllers.console.app.mcp_server.db.session.add"),
+ patch("controllers.console.app.mcp_server.db.session.commit"),
+ patch("controllers.console.app.mcp_server.AppMCPServer.generate_server_code", return_value="server-code"),
+ patch(
+ "controllers.console.app.mcp_server.AppMCPServerResponse.model_validate",
+ return_value=_ValidatedResponse({"id": "server-1"}),
+ ),
+ ):
+ response, status_code = method(
+ api, app_model=SimpleNamespace(id="app-1", name="Demo App", description="App description")
+ )
+
+ assert response == {"id": "server-1"}
+ assert status_code == 201
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow.py b/api/tests/unit_tests/controllers/console/app/test_workflow.py
index f32d0ef0ec..e91c0a0597 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow.py
@@ -1,15 +1,16 @@
from __future__ import annotations
+import json
from datetime import datetime
from types import SimpleNamespace
from unittest.mock import Mock
import pytest
-from graphon.file import File, FileTransferMethod, FileType
from werkzeug.exceptions import HTTPException, NotFound
from controllers.console.app import workflow as workflow_module
from controllers.console.app.error import DraftWorkflowNotExist, DraftWorkflowNotSync
+from graphon.file import File, FileTransferMethod, FileType
def _unwrap(func):
@@ -30,7 +31,7 @@ def test_parse_file_with_config(monkeypatch: pytest.MonkeyPatch) -> None:
file_list = [
File(
tenant_id="t1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="http://u",
)
@@ -347,3 +348,87 @@ def test_advanced_chat_run_conversation_not_exists(app, monkeypatch: pytest.Monk
):
with pytest.raises(NotFound):
handler(api, app_model=SimpleNamespace(id="app"))
+
+
+def test_workflow_online_users_filters_inaccessible_workflow(app, monkeypatch: pytest.MonkeyPatch) -> None:
+ app_id_1 = "11111111-1111-1111-1111-111111111111"
+ app_id_2 = "22222222-2222-2222-2222-222222222222"
+ signed_avatar_url = "https://files.example.com/signed/avatar-1"
+ sign_avatar = Mock(return_value=signed_avatar_url)
+ monkeypatch.setattr(workflow_module, "current_account_with_tenant", lambda: (SimpleNamespace(), "tenant-1"))
+ monkeypatch.setattr(
+ workflow_module,
+ "WorkflowService",
+ lambda: SimpleNamespace(get_accessible_app_ids=lambda app_ids, tenant_id: {app_id_1}),
+ )
+ monkeypatch.setattr(workflow_module.file_helpers, "get_signed_file_url", sign_avatar)
+
+ workflow_module.redis_client.hgetall.side_effect = lambda key: (
+ {
+ b"sid-1": json.dumps(
+ {
+ "user_id": "u-1",
+ "username": "Alice",
+ "avatar": "avatar-file-id",
+ "sid": "sid-1",
+ }
+ )
+ }
+ if key == f"{workflow_module.WORKFLOW_ONLINE_USERS_PREFIX}{app_id_1}"
+ else {}
+ )
+
+ api = workflow_module.WorkflowOnlineUsersApi()
+ handler = _unwrap(api.get)
+
+ with app.test_request_context(
+ f"/apps/workflows/online-users?app_ids={app_id_1},{app_id_2}",
+ method="GET",
+ ):
+ response = handler(api)
+
+ assert response == {
+ "data": [
+ {
+ "app_id": app_id_1,
+ "users": [
+ {
+ "user_id": "u-1",
+ "username": "Alice",
+ "avatar": signed_avatar_url,
+ "sid": "sid-1",
+ }
+ ],
+ }
+ ]
+ }
+ workflow_module.redis_client.hgetall.assert_called_once_with(
+ f"{workflow_module.WORKFLOW_ONLINE_USERS_PREFIX}{app_id_1}"
+ )
+ sign_avatar.assert_called_once_with("avatar-file-id")
+
+
+def test_workflow_online_users_rejects_excessive_workflow_ids(app, monkeypatch: pytest.MonkeyPatch) -> None:
+ monkeypatch.setattr(workflow_module, "current_account_with_tenant", lambda: (SimpleNamespace(), "tenant-1"))
+ accessible_app_ids = Mock(return_value=set())
+ monkeypatch.setattr(
+ workflow_module,
+ "WorkflowService",
+ lambda: SimpleNamespace(get_accessible_app_ids=accessible_app_ids),
+ )
+
+ excessive_ids = ",".join(f"wf-{index}" for index in range(workflow_module.MAX_WORKFLOW_ONLINE_USERS_QUERY_IDS + 1))
+
+ api = workflow_module.WorkflowOnlineUsersApi()
+ handler = _unwrap(api.get)
+
+ with app.test_request_context(
+ f"/apps/workflows/online-users?app_ids={excessive_ids}",
+ method="GET",
+ ):
+ with pytest.raises(HTTPException) as exc:
+ handler(api)
+
+ assert exc.value.code == 400
+ assert "Maximum" in exc.value.description
+ accessible_app_ids.assert_not_called()
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py
index 2adb69c704..a9853f25b0 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_app_log_api.py
@@ -2,9 +2,8 @@ from __future__ import annotations
from datetime import UTC, datetime
-from graphon.enums import WorkflowExecutionStatus
-
from controllers.console.app import workflow_app_log as workflow_app_log_module
+from graphon.enums import WorkflowExecutionStatus
def test_workflow_app_log_query_parses_bool_and_datetime():
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py
new file mode 100644
index 0000000000..85afcf0e60
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py
@@ -0,0 +1,201 @@
+from __future__ import annotations
+
+from contextlib import nullcontext
+from dataclasses import dataclass
+from datetime import datetime
+from types import SimpleNamespace
+from unittest.mock import MagicMock, PropertyMock, patch
+
+import pytest
+from flask import Flask
+from werkzeug.exceptions import Forbidden
+
+from controllers.console import console_ns
+from controllers.console import wraps as console_wraps
+from controllers.console.app import workflow_comment as workflow_comment_module
+from controllers.console.app import wraps as app_wraps
+from libs import login as login_lib
+from models.account import Account, AccountStatus, TenantAccountRole
+
+
+def _make_account(role: TenantAccountRole) -> Account:
+ account = Account(name="tester", email="tester@example.com")
+ account.status = AccountStatus.ACTIVE
+ account.role = role
+ account.id = "account-123" # type: ignore[assignment]
+ account._current_tenant = SimpleNamespace(id="tenant-123") # type: ignore[attr-defined]
+ account._get_current_object = lambda: account # type: ignore[attr-defined]
+ return account
+
+
+def _make_app() -> SimpleNamespace:
+ return SimpleNamespace(id="app-123", tenant_id="tenant-123", status="normal", mode="workflow")
+
+
+def _patch_console_guards(monkeypatch: pytest.MonkeyPatch, account: Account, app_model: SimpleNamespace) -> None:
+ monkeypatch.setattr(login_lib.dify_config, "LOGIN_DISABLED", True)
+ monkeypatch.setattr(login_lib, "current_user", account)
+ monkeypatch.setattr(login_lib, "current_account_with_tenant", lambda: (account, account.current_tenant_id))
+ monkeypatch.setattr(login_lib, "check_csrf_token", lambda *_, **__: None)
+ monkeypatch.setattr(console_wraps, "current_account_with_tenant", lambda: (account, account.current_tenant_id))
+ monkeypatch.setattr(console_wraps.dify_config, "EDITION", "CLOUD")
+ monkeypatch.setattr(app_wraps, "current_account_with_tenant", lambda: (account, account.current_tenant_id))
+ monkeypatch.setattr(app_wraps, "_load_app_model", lambda _app_id: app_model)
+ monkeypatch.setattr(workflow_comment_module, "current_user", account)
+
+
+def _patch_write_services(monkeypatch: pytest.MonkeyPatch) -> None:
+ for method_name in (
+ "create_comment",
+ "update_comment",
+ "delete_comment",
+ "resolve_comment",
+ "validate_comment_access",
+ "create_reply",
+ "update_reply",
+ "delete_reply",
+ ):
+ monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, method_name, MagicMock())
+
+
+def _patch_payload(payload: dict[str, object] | None):
+ if payload is None:
+ return nullcontext()
+ return patch.object(
+ type(console_ns),
+ "payload",
+ new_callable=PropertyMock,
+ return_value=payload,
+ )
+
+
+@dataclass(frozen=True)
+class WriteCase:
+ resource_cls: type
+ method_name: str
+ path: str
+ kwargs: dict[str, str]
+ payload: dict[str, object] | None = None
+
+
+@pytest.mark.parametrize(
+ "case",
+ [
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentListApi,
+ method_name="post",
+ path="/console/api/apps/app-123/workflow/comments",
+ kwargs={"app_id": "app-123"},
+ payload={"content": "hello", "position_x": 1.0, "position_y": 2.0, "mentioned_user_ids": []},
+ ),
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentDetailApi,
+ method_name="put",
+ path="/console/api/apps/app-123/workflow/comments/comment-1",
+ kwargs={"app_id": "app-123", "comment_id": "comment-1"},
+ payload={"content": "hello", "position_x": 1.0, "position_y": 2.0, "mentioned_user_ids": []},
+ ),
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentDetailApi,
+ method_name="delete",
+ path="/console/api/apps/app-123/workflow/comments/comment-1",
+ kwargs={"app_id": "app-123", "comment_id": "comment-1"},
+ ),
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentResolveApi,
+ method_name="post",
+ path="/console/api/apps/app-123/workflow/comments/comment-1/resolve",
+ kwargs={"app_id": "app-123", "comment_id": "comment-1"},
+ ),
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentReplyApi,
+ method_name="post",
+ path="/console/api/apps/app-123/workflow/comments/comment-1/replies",
+ kwargs={"app_id": "app-123", "comment_id": "comment-1"},
+ payload={"content": "reply", "mentioned_user_ids": []},
+ ),
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentReplyDetailApi,
+ method_name="put",
+ path="/console/api/apps/app-123/workflow/comments/comment-1/replies/reply-1",
+ kwargs={"app_id": "app-123", "comment_id": "comment-1", "reply_id": "reply-1"},
+ payload={"content": "reply", "mentioned_user_ids": []},
+ ),
+ WriteCase(
+ resource_cls=workflow_comment_module.WorkflowCommentReplyDetailApi,
+ method_name="delete",
+ path="/console/api/apps/app-123/workflow/comments/comment-1/replies/reply-1",
+ kwargs={"app_id": "app-123", "comment_id": "comment-1", "reply_id": "reply-1"},
+ ),
+ ],
+)
+def test_write_endpoints_require_edit_permission(app: Flask, monkeypatch: pytest.MonkeyPatch, case: WriteCase) -> None:
+ app.config.setdefault("RESTX_MASK_HEADER", "X-Fields")
+ account = _make_account(TenantAccountRole.NORMAL)
+ app_model = _make_app()
+ _patch_console_guards(monkeypatch, account, app_model)
+ _patch_write_services(monkeypatch)
+
+ with app.test_request_context(case.path, method=case.method_name.upper(), json=case.payload):
+ with _patch_payload(case.payload):
+ handler = getattr(case.resource_cls(), case.method_name)
+ with pytest.raises(Forbidden):
+ handler(**case.kwargs)
+
+
+def test_create_comment_allows_editor(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+ app.config.setdefault("RESTX_MASK_HEADER", "X-Fields")
+ account = _make_account(TenantAccountRole.EDITOR)
+ app_model = _make_app()
+ _patch_console_guards(monkeypatch, account, app_model)
+
+ create_comment_mock = MagicMock(return_value={"id": "comment-1"})
+ monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, "create_comment", create_comment_mock)
+ payload = {"content": "hello", "position_x": 1.0, "position_y": 2.0, "mentioned_user_ids": []}
+
+ with app.test_request_context("/console/api/apps/app-123/workflow/comments", method="POST", json=payload):
+ with _patch_payload(payload):
+ result = workflow_comment_module.WorkflowCommentListApi().post(app_id="app-123")
+
+ if isinstance(result, tuple):
+ response = result[0]
+ else:
+ response = result
+ assert response["id"] == "comment-1"
+ create_comment_mock.assert_called_once_with(
+ tenant_id="tenant-123",
+ app_id="app-123",
+ created_by="account-123",
+ content="hello",
+ position_x=1.0,
+ position_y=2.0,
+ mentioned_user_ids=[],
+ )
+
+
+def test_update_comment_omits_mentions_when_payload_does_not_include_them(
+ app: Flask, monkeypatch: pytest.MonkeyPatch
+) -> None:
+ app.config.setdefault("RESTX_MASK_HEADER", "X-Fields")
+ account = _make_account(TenantAccountRole.EDITOR)
+ app_model = _make_app()
+ _patch_console_guards(monkeypatch, account, app_model)
+
+ update_comment_mock = MagicMock(return_value={"id": "comment-1", "updated_at": datetime(2024, 1, 1, 12, 0, 0)})
+ monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, "update_comment", update_comment_mock)
+ payload = {"content": "hello", "position_x": 10.0, "position_y": 20.0}
+
+ with app.test_request_context("/console/api/apps/app-123/workflow/comments/comment-1", method="PUT", json=payload):
+ with _patch_payload(payload):
+ workflow_comment_module.WorkflowCommentDetailApi().put(app_id="app-123", comment_id="comment-1")
+
+ update_comment_mock.assert_called_once_with(
+ tenant_id="tenant-123",
+ app_id="app-123",
+ comment_id="comment-1",
+ user_id="account-123",
+ content="hello",
+ position_x=10.0,
+ position_y=20.0,
+ mentioned_user_ids=None,
+ )
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
index e11102acb1..c4a8148446 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
@@ -6,14 +6,14 @@ from unittest.mock import Mock
import pytest
from flask import Flask
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
from controllers.console import wraps as console_wraps
from controllers.console.app import workflow_run as workflow_run_module
from controllers.web.error import NotFoundError
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus
+from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.enums import FormInputType
from libs import login as login_lib
from models.account import Account, AccountStatus, TenantAccountRole
from models.workflow import WorkflowRun
diff --git a/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py b/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
index 740da1f1df..22b80b748e 100644
--- a/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
+++ b/api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py
@@ -5,7 +5,6 @@ from unittest.mock import MagicMock, patch
import pytest
from flask_restx import marshal
-from graphon.variables.types import SegmentType
from controllers.console.app.workflow_draft_variable import (
_WORKFLOW_DRAFT_VARIABLE_FIELDS,
@@ -16,6 +15,7 @@ from controllers.console.app.workflow_draft_variable import (
)
from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
from factories.variable_factory import build_segment
+from graphon.variables.types import SegmentType
from libs.datetime_utils import naive_utc_now
from libs.uuid_utils import uuidv7
from models.workflow import WorkflowDraftVariable, WorkflowDraftVariableFile
@@ -314,8 +314,8 @@ def test_workflow_file_variable_with_signed_url():
# Create a File object with LOCAL_FILE transfer method (which generates signed URLs)
test_file = File(
- id="test_file_id",
- type=FileType.IMAGE,
+ file_id="test_file_id",
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="test_upload_file_id",
filename="test.jpg",
@@ -370,8 +370,8 @@ def test_workflow_file_variable_remote_url():
# Create a File object with REMOTE_URL transfer method
test_file = File(
- id="test_file_id",
- type=FileType.IMAGE,
+ file_id="test_file_id",
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/test.jpg",
filename="test.jpg",
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
index 9c9f8da87c..5136922e88 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
@@ -1,7 +1,6 @@
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
from werkzeug.exceptions import Forbidden, NotFound
from controllers.console import console_ns
@@ -18,6 +17,7 @@ from controllers.console.datasets.rag_pipeline.datasource_auth import (
DatasourceUpdateProviderNameApi,
)
from core.plugin.impl.oauth import OAuthHandler
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
from services.datasource_provider_service import DatasourceProviderService
from services.plugin.oauth_service import OAuthProxyService
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
index 6ef8ccfdbd..63950736c5 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
@@ -2,7 +2,6 @@ from unittest.mock import MagicMock, patch
import pytest
from flask import Response
-from graphon.variables.types import SegmentType
from controllers.console import console_ns
from controllers.console.app.error import DraftWorkflowNotExist
@@ -16,6 +15,7 @@ from controllers.console.datasets.rag_pipeline.rag_pipeline_draft_variable impor
)
from controllers.web.error import InvalidArgumentError, NotFoundError
from core.workflow.variable_prefixes import SYSTEM_VARIABLE_NODE_ID
+from graphon.variables.types import SegmentType
from models.account import Account
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
index ce2278de4f..d9b02ac453 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
@@ -1,3 +1,4 @@
+from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
@@ -215,17 +216,23 @@ class TestDatasetDocumentListApi:
method = unwrap(api.post)
payload = {"indexing_technique": "economy"}
+ created_dataset = SimpleNamespace(id="ds-1", name="Dataset", indexing_technique="economy")
+ created_document = SimpleNamespace(id="doc-1", name="Document", doc_metadata_details=None)
with (
app.test_request_context("/", json=payload),
patch.object(type(console_ns), "payload", payload),
+ patch(
+ "controllers.console.datasets.datasets_document.DatasetService.get_dataset",
+ return_value=created_dataset,
+ ),
patch(
"controllers.console.datasets.datasets_document.DocumentService.document_create_args_validate",
return_value=None,
),
patch(
"controllers.console.datasets.datasets_document.DocumentService.save_document_with_dataset_id",
- return_value=([MagicMock()], "batch-1"),
+ return_value=([created_document], "batch-1"),
),
):
response = method(api, "ds-1")
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
index 710c9be684..e4acd91b76 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
@@ -1,7 +1,6 @@
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
import services
@@ -21,6 +20,7 @@ from core.errors.error import (
ProviderTokenNotInitError,
QuotaExceededError,
)
+from graphon.model_runtime.errors.invoke import InvokeError
from models.account import Account
from services.dataset_service import DatasetService
from services.hit_testing_service import HitTestingService
diff --git a/api/tests/unit_tests/controllers/console/explore/test_audio.py b/api/tests/unit_tests/controllers/console/explore/test_audio.py
index 66c9ba48c5..b4b57022e2 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_audio.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_audio.py
@@ -2,7 +2,6 @@ from io import BytesIO
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from werkzeug.exceptions import InternalServerError
import controllers.console.explore.audio as audio_module
@@ -20,6 +19,7 @@ from core.errors.error import (
ProviderTokenNotInitError,
QuotaExceededError,
)
+from graphon.model_runtime.errors.invoke import InvokeError
from services.errors.audio import (
AudioTooLargeServiceError,
NoAudioUploadedServiceError,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_message.py b/api/tests/unit_tests/controllers/console/explore/test_message.py
index 2e4ca4f2a4..145cc9cdd7 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_message.py
@@ -1,7 +1,6 @@
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from werkzeug.exceptions import InternalServerError, NotFound
import controllers.console.explore.message as module
@@ -22,6 +21,7 @@ from core.errors.error import (
ProviderTokenNotInitError,
QuotaExceededError,
)
+from graphon.model_runtime.errors.invoke import InvokeError
from services.errors.conversation import ConversationNotExistsError
from services.errors.message import (
FirstMessageNotExistsError,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial.py b/api/tests/unit_tests/controllers/console/explore/test_trial.py
index a43c3ca47e..3625056af9 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial.py
@@ -3,7 +3,6 @@ from unittest.mock import MagicMock, patch
from uuid import uuid4
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
import controllers.console.explore.trial as module
@@ -26,6 +25,7 @@ from core.errors.error import (
ProviderTokenNotInitError,
QuotaExceededError,
)
+from graphon.model_runtime.errors.invoke import InvokeError
from models import Account
from models.account import TenantStatus
from models.model import AppMode
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py b/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py
index 9c42ee9529..b2f949c6e2 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_load_balancing_config.py
@@ -11,9 +11,10 @@ from unittest.mock import MagicMock
import pytest
from flask import Flask
from flask.views import MethodView
+from werkzeug.exceptions import Forbidden
+
from graphon.model_runtime.entities.model_entities import ModelType
from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
-from werkzeug.exceptions import Forbidden
if not hasattr(builtins, "MethodView"):
builtins.MethodView = MethodView # type: ignore[attr-defined]
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
index fb9eec98cb..168479af1e 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
@@ -1,7 +1,6 @@
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
from pydantic_core import ValidationError
from werkzeug.exceptions import Forbidden
@@ -14,6 +13,7 @@ from controllers.console.workspace.model_providers import (
ModelProviderValidateApi,
PreferredProviderTypeUpdateApi,
)
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
VALID_UUID = "123e4567-e89b-12d3-a456-426614174000"
INVALID_UUID = "123"
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_models.py b/api/tests/unit_tests/controllers/console/workspace/test_models.py
index c829327bc7..f0d32f81fb 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_models.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_models.py
@@ -2,8 +2,6 @@ from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
from controllers.console.workspace.models import (
DefaultModelApi,
@@ -16,6 +14,8 @@ from controllers.console.workspace.models import (
ModelProviderModelParameterRuleApi,
ModelProviderModelValidateApi,
)
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
def unwrap(func):
diff --git a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
index 0895fac3a4..d1b09c3a58 100644
--- a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
+++ b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
@@ -41,17 +41,22 @@ class TestTenantUserPayload:
class TestGetUser:
"""Test get_user function"""
+ @patch("controllers.inner_api.plugin.wraps.select")
@patch("controllers.inner_api.plugin.wraps.EndUser")
@patch("controllers.inner_api.plugin.wraps.sessionmaker")
@patch("controllers.inner_api.plugin.wraps.db")
- def test_should_return_existing_user_by_id(self, mock_db, mock_sessionmaker, mock_enduser_class, app: Flask):
+ def test_should_return_existing_user_by_id(
+ self, mock_db, mock_sessionmaker, mock_enduser_class, mock_select, app: Flask
+ ):
"""Test returning existing user when found by ID"""
# Arrange
mock_user = MagicMock()
mock_user.id = "user123"
mock_session = MagicMock()
mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
- mock_session.get.return_value = mock_user
+ mock_session.scalar.return_value = mock_user
+ mock_query = MagicMock()
+ mock_select.return_value.where.return_value.limit.return_value = mock_query
# Act
with app.app_context():
@@ -59,13 +64,45 @@ class TestGetUser:
# Assert
assert result == mock_user
- mock_session.get.assert_called_once()
+ mock_session.scalar.assert_called_once()
+ @patch("controllers.inner_api.plugin.wraps.select")
+ @patch("controllers.inner_api.plugin.wraps.EndUser")
+ @patch("controllers.inner_api.plugin.wraps.sessionmaker")
+ @patch("controllers.inner_api.plugin.wraps.db")
+ def test_should_not_resolve_non_anonymous_users_across_tenants(
+ self,
+ mock_db,
+ mock_sessionmaker,
+ mock_enduser_class,
+ mock_select,
+ app: Flask,
+ ):
+ """Test that explicit user IDs remain scoped to the current tenant."""
+ # Arrange
+ mock_session = MagicMock()
+ mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
+ mock_session.scalar.return_value = None
+ mock_new_user = MagicMock()
+ mock_new_user.tenant_id = "tenant-current"
+ mock_enduser_class.return_value = mock_new_user
+
+ # Act
+ with app.app_context():
+ result = get_user("tenant-current", "foreign-user-id")
+
+ # Assert
+ assert result == mock_new_user
+ mock_session.get.assert_not_called()
+ mock_session.scalar.assert_called_once()
+ mock_session.add.assert_called_once_with(mock_new_user)
+
+ @patch("controllers.inner_api.plugin.wraps.select")
@patch("controllers.inner_api.plugin.wraps.EndUser")
@patch("controllers.inner_api.plugin.wraps.sessionmaker")
@patch("controllers.inner_api.plugin.wraps.db")
def test_should_return_existing_anonymous_user_by_session_id(
- self, mock_db, mock_sessionmaker, mock_enduser_class, app: Flask
+ self, mock_db, mock_sessionmaker, mock_enduser_class, mock_select, app: Flask
):
"""Test returning existing anonymous user by session_id"""
# Arrange
@@ -73,8 +110,9 @@ class TestGetUser:
mock_user.session_id = "anonymous_session"
mock_session = MagicMock()
mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
- # non-anonymous path uses session.get(); anonymous uses session.scalar()
- mock_session.get.return_value = mock_user
+ mock_session.scalar.return_value = mock_user
+ mock_query = MagicMock()
+ mock_select.return_value.where.return_value.limit.return_value = mock_query
# Act
with app.app_context():
@@ -83,17 +121,22 @@ class TestGetUser:
# Assert
assert result == mock_user
+ @patch("controllers.inner_api.plugin.wraps.select")
@patch("controllers.inner_api.plugin.wraps.EndUser")
@patch("controllers.inner_api.plugin.wraps.sessionmaker")
@patch("controllers.inner_api.plugin.wraps.db")
- def test_should_create_new_user_when_not_found(self, mock_db, mock_sessionmaker, mock_enduser_class, app: Flask):
+ def test_should_create_new_user_when_not_found(
+ self, mock_db, mock_sessionmaker, mock_enduser_class, mock_select, app: Flask
+ ):
"""Test creating new user when not found in database"""
# Arrange
mock_session = MagicMock()
mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
- mock_session.get.return_value = None
+ mock_session.scalar.return_value = None
mock_new_user = MagicMock()
mock_enduser_class.return_value = mock_new_user
+ mock_query = MagicMock()
+ mock_select.return_value.where.return_value.limit.return_value = mock_query
# Act
with app.app_context():
@@ -134,7 +177,7 @@ class TestGetUser:
# Arrange
mock_session = MagicMock()
mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
- mock_session.get.side_effect = Exception("Database error")
+ mock_session.scalar.side_effect = Exception("Database error")
# Act & Assert
with app.app_context():
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_audio.py b/api/tests/unit_tests/controllers/service_api/app/test_audio.py
index a26fea8fbd..c16ebad739 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_audio.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_audio.py
@@ -13,7 +13,6 @@ from types import SimpleNamespace
from unittest.mock import Mock, patch
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from werkzeug.datastructures import FileStorage
from werkzeug.exceptions import InternalServerError
@@ -30,6 +29,7 @@ from controllers.service_api.app.error import (
UnsupportedAudioTypeError,
)
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
from services.audio_service import AudioService
from services.errors.app_model_config import AppModelConfigBrokenError
from services.errors.audio import (
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_completion.py b/api/tests/unit_tests/controllers/service_api/app/test_completion.py
index 57681d8f5b..3364c07e62 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_completion.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_completion.py
@@ -16,7 +16,6 @@ from types import SimpleNamespace
from unittest.mock import Mock, patch
import pytest
-from graphon.model_runtime.errors.invoke import InvokeError
from pydantic import ValidationError
from werkzeug.exceptions import BadRequest, NotFound
@@ -35,6 +34,7 @@ from controllers.service_api.app.error import (
NotChatAppError,
)
from core.errors.error import QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
from models.model import App, AppMode, EndUser
from services.app_generate_service import AppGenerateService
from services.app_task_service import AppTaskService
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_conversation.py b/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
index 97fdf1a011..4fb8ecf784 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
@@ -20,7 +20,6 @@ from types import SimpleNamespace
from unittest.mock import Mock, patch
import pytest
-from graphon.variables.types import SegmentType
from werkzeug.exceptions import BadRequest, NotFound
import services
@@ -38,6 +37,9 @@ from controllers.service_api.app.conversation import (
ConversationVariableUpdatePayload,
)
from controllers.service_api.app.error import NotChatAppError
+from fields._value_type_serializer import serialize_value_type
+from graphon.variables import StringSegment
+from graphon.variables.types import SegmentType
from models.model import App, AppMode, EndUser
from services.conversation_service import ConversationService
from services.errors.conversation import (
@@ -284,6 +286,32 @@ class TestConversationVariableResponseModels:
assert response.created_at == int(created_at.timestamp())
assert response.updated_at == int(created_at.timestamp())
+ def test_variable_response_normalizes_string_value_type_alias(self):
+ response = ConversationVariableResponse.model_validate(
+ {
+ "id": "550e8400-e29b-41d4-a716-446655440000",
+ "name": "foo",
+ "value_type": SegmentType.INTEGER.value,
+ }
+ )
+
+ assert response.value_type == "number"
+
+ def test_variable_response_normalizes_callable_exposed_type(self):
+ response = ConversationVariableResponse.model_validate(
+ {
+ "id": "550e8400-e29b-41d4-a716-446655440000",
+ "name": "foo",
+ "value_type": SimpleNamespace(exposed_type=lambda: SegmentType.STRING.exposed_type()),
+ }
+ )
+
+ assert response.value_type == "string"
+
+ def test_serialize_value_type_supports_segments_and_mappings(self):
+ assert serialize_value_type(StringSegment(value="hello")) == "string"
+ assert serialize_value_type({"value_type": SegmentType.INTEGER}) == "number"
+
def test_variable_pagination_response(self):
response = ConversationVariableInfiniteScrollPaginationResponse.model_validate(
{
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
index 74a3c75839..da09ec13ce 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
@@ -20,7 +20,6 @@ from types import SimpleNamespace
from unittest.mock import Mock, patch
import pytest
-from graphon.enums import WorkflowExecutionStatus
from werkzeug.exceptions import BadRequest, NotFound
from controllers.service_api.app.error import NotWorkflowAppError
@@ -37,6 +36,7 @@ from controllers.service_api.app.workflow import (
WorkflowTaskStopApi,
)
from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
+from graphon.enums import WorkflowExecutionStatus
from models.model import App, AppMode
from services.app_generate_service import AppGenerateService
from services.errors.app import IsDraftWorkflowError, WorkflowNotFoundError
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py
index 4b8e3a738c..eda270258d 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow_fields.py
@@ -1,8 +1,7 @@
from types import SimpleNamespace
-from graphon.enums import WorkflowExecutionStatus
-
from controllers.service_api.app.workflow import WorkflowRunOutputsField, WorkflowRunStatusField
+from graphon.enums import WorkflowExecutionStatus
def test_workflow_run_status_field_with_enum() -> None:
diff --git a/api/tests/unit_tests/controllers/web/test_audio.py b/api/tests/unit_tests/controllers/web/test_audio.py
index cbfc8fa613..a6ca441801 100644
--- a/api/tests/unit_tests/controllers/web/test_audio.py
+++ b/api/tests/unit_tests/controllers/web/test_audio.py
@@ -8,7 +8,6 @@ from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
-from graphon.model_runtime.errors.invoke import InvokeError
from controllers.web.audio import AudioApi, TextApi
from controllers.web.error import (
@@ -22,6 +21,7 @@ from controllers.web.error import (
UnsupportedAudioTypeError,
)
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
from services.errors.audio import (
AudioTooLargeServiceError,
NoAudioUploadedServiceError,
diff --git a/api/tests/unit_tests/controllers/web/test_completion.py b/api/tests/unit_tests/controllers/web/test_completion.py
index 49039d03fe..4f8d848637 100644
--- a/api/tests/unit_tests/controllers/web/test_completion.py
+++ b/api/tests/unit_tests/controllers/web/test_completion.py
@@ -7,7 +7,6 @@ from unittest.mock import MagicMock, patch
import pytest
from flask import Flask
-from graphon.model_runtime.errors.invoke import InvokeError
from controllers.web.completion import ChatApi, ChatStopApi, CompletionApi, CompletionStopApi
from controllers.web.error import (
@@ -19,6 +18,7 @@ from controllers.web.error import (
ProviderQuotaExceededError,
)
from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeError
def _completion_app() -> SimpleNamespace:
diff --git a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
index bc7aea0ef9..cde8820e00 100644
--- a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
@@ -2,11 +2,11 @@ import json
from unittest.mock import MagicMock
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMUsage
from core.agent.cot_agent_runner import CotAgentRunner
from core.agent.entities import AgentScratchpadUnit
from core.agent.errors import AgentMaxIterationError
+from graphon.model_runtime.entities.llm_entities import LLMUsage
class DummyRunner(CotAgentRunner):
diff --git a/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
index 97206019b9..ea8cc8aa86 100644
--- a/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
@@ -1,9 +1,9 @@
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
from core.agent.cot_chat_agent_runner import CotChatAgentRunner
+from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
from tests.unit_tests.core.agent.conftest import (
DummyAgentConfig,
DummyAppConfig,
diff --git a/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
index defc8b4b64..2f5873d865 100644
--- a/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
@@ -1,6 +1,8 @@
import json
import pytest
+
+from core.agent.cot_completion_agent_runner import CotCompletionAgentRunner
from graphon.model_runtime.entities.message_entities import (
AssistantPromptMessage,
ImagePromptMessageContent,
@@ -8,8 +10,6 @@ from graphon.model_runtime.entities.message_entities import (
UserPromptMessage,
)
-from core.agent.cot_completion_agent_runner import CotCompletionAgentRunner
-
# -----------------------------
# Fixtures
# -----------------------------
diff --git a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
index a44a0650eb..17ab5babcb 100644
--- a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
@@ -3,6 +3,11 @@ from typing import Any
from unittest.mock import MagicMock
import pytest
+
+from core.agent.errors import AgentMaxIterationError
+from core.agent.fc_agent_runner import FunctionCallAgentRunner
+from core.app.apps.base_app_queue_manager import PublishFrom
+from core.app.entities.queue_entities import QueueMessageFileEvent
from graphon.model_runtime.entities.llm_entities import LLMUsage
from graphon.model_runtime.entities.message_entities import (
DocumentPromptMessageContent,
@@ -11,11 +16,6 @@ from graphon.model_runtime.entities.message_entities import (
UserPromptMessage,
)
-from core.agent.errors import AgentMaxIterationError
-from core.agent.fc_agent_runner import FunctionCallAgentRunner
-from core.app.apps.base_app_queue_manager import PublishFrom
-from core.app.entities.queue_entities import QueueMessageFileEvent
-
# ==============================
# Dummy Helper Classes
# ==============================
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
index 5ee66da94a..186b4a501d 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
@@ -2,8 +2,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
from core.entities.model_entities import ModelStatus
@@ -12,6 +10,8 @@ from core.errors.error import (
ProviderTokenNotInitError,
QuotaExceededError,
)
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
class TestModelConfigConverter:
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
index e2f3c16335..d9fe7004ff 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
@@ -1,9 +1,9 @@
import pytest
-from graphon.variables.input_entities import VariableEntityType
from core.app.app_config.easy_ui_based_app.variables.manager import (
BasicVariablesConfigManager,
)
+from graphon.variables.input_entities import VariableEntityType
class TestBasicVariablesConfigManagerConvert:
diff --git a/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py b/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
index 8bde9c1f97..11b53dd0f9 100644
--- a/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py
@@ -1,8 +1,7 @@
+from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
from graphon.file import FileTransferMethod, FileUploadConfig, ImageConfig
from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
-from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-
def test_convert_with_vision():
config = {
diff --git a/api/tests/unit_tests/core/app/app_config/test_entities.py b/api/tests/unit_tests/core/app/app_config/test_entities.py
index 000f83cd5a..f2bc3076da 100644
--- a/api/tests/unit_tests/core/app/app_config/test_entities.py
+++ b/api/tests/unit_tests/core/app/app_config/test_entities.py
@@ -1,10 +1,10 @@
import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
from core.app.app_config.entities import (
DatasetRetrieveConfigEntity,
PromptTemplateEntity,
)
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
class TestAppConfigEntities:
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py
index 1fb0dc6cf1..45d4b0e321 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_runner_conversation_variables.py
@@ -3,12 +3,12 @@
from unittest.mock import MagicMock, patch
from uuid import uuid4
-from graphon.variables import SegmentType
from sqlalchemy.orm import Session
from core.app.apps.advanced_chat.app_runner import AdvancedChatAppRunner
from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom
from factories import variable_factory
+from graphon.variables import SegmentType
from models import ConversationVariable, Workflow
MINIMAL_GRAPH = {
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py
index e9fdeefee4..f2df35d7d0 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_response_converter.py
@@ -1,7 +1,5 @@
from collections.abc import Generator
-from graphon.enums import WorkflowNodeExecutionStatus
-
from core.app.apps.advanced_chat.generate_response_converter import AdvancedChatAppGenerateResponseConverter
from core.app.entities.task_entities import (
ChatbotAppBlockingResponse,
@@ -12,6 +10,7 @@ from core.app.entities.task_entities import (
NodeStartStreamResponse,
PingStreamResponse,
)
+from graphon.enums import WorkflowNodeExecutionStatus
class TestAdvancedChatGenerateResponseConverter:
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
index a6d8598955..99a386cd45 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline.py
@@ -6,8 +6,6 @@ from types import SimpleNamespace
from unittest import mock
import pytest
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.enums import WorkflowExecutionStatus
from core.app.apps.advanced_chat import generate_task_pipeline as pipeline_module
from core.app.entities.app_invoke_entities import InvokeFrom
@@ -19,6 +17,8 @@ from core.app.entities.queue_entities import (
QueueWorkflowSucceededEvent,
)
from core.app.entities.task_entities import StreamEvent
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.enums import WorkflowExecutionStatus
from models.enums import MessageStatus
from models.execution_extra_content import HumanInputContent
from models.model import AppMode, EndUser
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
index 82b2e51019..29fd63c063 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
@@ -4,8 +4,6 @@ from contextlib import contextmanager
from types import SimpleNamespace
import pytest
-from graphon.enums import BuiltinNodeTypes
-from graphon.runtime import GraphRuntimeState, VariablePool
from core.app.app_config.entities import AppAdditionalFeatures, WorkflowUIBasedAppConfig
from core.app.apps.advanced_chat.generate_task_pipeline import (
@@ -49,6 +47,8 @@ from core.app.entities.task_entities import (
)
from core.base.tts.app_generator_tts_publisher import AudioTrunk
from core.workflow.system_variables import build_system_variables
+from graphon.enums import BuiltinNodeTypes
+from graphon.runtime import GraphRuntimeState, VariablePool
from libs.datetime_utils import naive_utc_now
from models.enums import MessageStatus
from models.model import AppMode, EndUser
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
index 7dc4358150..80f7f94b1a 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
@@ -1,12 +1,12 @@
import contextlib
import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
from pydantic import ValidationError
from core.app.apps.agent_chat.app_generator import AgentChatAppGenerator
from core.app.apps.exc import GenerateTaskStoppedError
from core.app.entities.app_invoke_entities import InvokeFrom
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
class DummyAccount:
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
index 08250bc3b6..4567b35480 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
@@ -1,10 +1,10 @@
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMMode
-from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
from core.agent.entities import AgentEntity
from core.app.apps.agent_chat.app_runner import AgentChatAppRunner
from core.moderation.base import ModerationError
+from graphon.model_runtime.entities.llm_entities import LLMMode
+from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
@pytest.fixture
diff --git a/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py b/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
index 68bcffb0e8..8f3c41701b 100644
--- a/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
+++ b/api/tests/unit_tests/core/app/apps/chat/test_app_generator_and_runner.py
@@ -2,7 +2,6 @@ from types import SimpleNamespace
from unittest.mock import Mock, patch
import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
from core.app.apps.chat.app_generator import ChatAppGenerator
from core.app.apps.chat.app_runner import ChatAppRunner
@@ -10,6 +9,7 @@ from core.app.apps.exc import GenerateTaskStoppedError
from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import QueueAnnotationReplyEvent
from core.moderation.base import ModerationError
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
from models.model import AppMode
diff --git a/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py b/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py
index f255d2c7df..b3ea1a464f 100644
--- a/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py
+++ b/api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py
@@ -4,13 +4,13 @@ from unittest.mock import MagicMock, patch
from uuid import uuid4
import pytest
-from graphon.file import FileTransferMethod, FileType
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
from core.app.apps.base_app_queue_manager import PublishFrom
from core.app.apps.base_app_runner import AppRunner
from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import QueueMessageFileEvent
+from graphon.file import FileTransferMethod, FileType
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
from models.enums import CreatorUserRole
diff --git a/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py b/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py
index 4a94a2b4f1..201923e0e4 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_graph_runtime_state_support.py
@@ -1,11 +1,11 @@
from types import SimpleNamespace
import pytest
-from graphon.runtime import GraphRuntimeState, VariablePool
from core.app.apps.common.graph_runtime_state_support import GraphRuntimeStateSupport
from core.workflow.system_variables import build_system_variables
from core.workflow.variable_pool_initializer import add_variables_to_pool
+from graphon.runtime import GraphRuntimeState, VariablePool
def _make_state(workflow_run_id: str | None) -> GraphRuntimeState:
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
index 328cd12f12..dd6cd0e919 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py
@@ -1,10 +1,9 @@
from collections.abc import Mapping, Sequence
+from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
from graphon.variables.segments import ArrayFileSegment, FileSegment
-from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
-
class TestWorkflowResponseConverterFetchFilesFromVariableValue:
"""Test class for WorkflowResponseConverter._fetch_files_from_variable_value method"""
@@ -12,8 +11,8 @@ class TestWorkflowResponseConverterFetchFilesFromVariableValue:
def create_test_file(self, file_id: str = "test_file_1") -> File:
"""Create a test File object"""
return File(
- id=file_id,
- type=FileType.DOCUMENT,
+ file_id=file_id,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="related_123",
filename=f"{file_id}.txt",
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py
index bc11bf4174..1bef6f69cd 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_human_input.py
@@ -1,13 +1,12 @@
from datetime import UTC, datetime
from types import SimpleNamespace
-from graphon.entities import WorkflowStartReason
-from graphon.runtime import GraphRuntimeState, VariablePool
-
from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import QueueHumanInputFormFilledEvent, QueueHumanInputFormTimeoutEvent
from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.runtime import GraphRuntimeState, VariablePool
def _build_converter():
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py
index c9e146ff12..936ac37e55 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py
@@ -1,11 +1,10 @@
from types import SimpleNamespace
-from graphon.entities import WorkflowStartReason
-from graphon.runtime import GraphRuntimeState, VariablePool
-
from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
from core.app.entities.app_invoke_entities import InvokeFrom
from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.runtime import GraphRuntimeState, VariablePool
def _build_converter() -> WorkflowResponseConverter:
diff --git a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py
index 0fde7565d2..b3c0eb74fa 100644
--- a/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py
+++ b/api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_truncation.py
@@ -10,8 +10,6 @@ from typing import Any
from unittest.mock import Mock
import pytest
-from graphon.entities import WorkflowStartReason
-from graphon.enums import BuiltinNodeTypes
from core.app.app_config.entities import WorkflowUIBasedAppConfig
from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
@@ -27,6 +25,8 @@ from core.app.entities.queue_entities import (
QueueNodeSucceededEvent,
)
from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.enums import BuiltinNodeTypes
from libs.datetime_utils import naive_utc_now
from models import Account
from models.model import AppMode
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
index 619d66085a..aa2085177e 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
@@ -2,11 +2,11 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
import core.app.apps.completion.app_runner as module
from core.app.apps.completion.app_runner import CompletionAppRunner
from core.moderation.base import ModerationError
+from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
@pytest.fixture
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
index 96af9fbdee..f2e35f9900 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
@@ -3,13 +3,13 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
from pydantic import ValidationError
import core.app.apps.completion.app_generator as module
from core.app.apps.completion.app_generator import CompletionAppGenerator
from core.app.apps.exc import GenerateTaskStoppedError
from core.app.entities.app_invoke_entities import InvokeFrom
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
from services.errors.app import MoreLikeThisDisabledError
from services.errors.message import MessageNotExistsError
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py
index 6cdcab29ab..cfe797aa76 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generate_response_converter.py
@@ -1,7 +1,5 @@
from collections.abc import Generator
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-
from core.app.apps.pipeline.generate_response_converter import WorkflowAppGenerateResponseConverter
from core.app.entities.task_entities import (
AppStreamResponse,
@@ -12,6 +10,7 @@ from core.app.entities.task_entities import (
WorkflowAppBlockingResponse,
WorkflowAppStreamResponse,
)
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
def test_convert_blocking_full_and_simple_response():
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 4fe82efcb3..9db83f5531 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,5 +1,4 @@
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult
import core.app.apps.pipeline.pipeline_queue_manager as module
from core.app.apps.base_app_queue_manager import PublishFrom
@@ -14,6 +13,7 @@ from core.app.entities.queue_entities import (
QueueWorkflowPartialSuccessEvent,
QueueWorkflowSucceededEvent,
)
+from graphon.model_runtime.entities.llm_entities import LLMResult
def test_publish_sets_stop_listen_and_raises_on_stopped(mocker):
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
index c8ae288e6f..618c8fd76f 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
@@ -22,11 +22,11 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.graph_events import GraphRunFailedEvent
import core.app.apps.pipeline.pipeline_runner as module
from core.app.apps.pipeline.pipeline_runner import PipelineRunner
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from graphon.graph_events import GraphRunFailedEvent
def _build_app_generate_entity() -> SimpleNamespace:
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
index 6167be3bbd..b0f8b423e1 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
@@ -1,7 +1,7 @@
import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
from core.app.apps.base_app_generator import BaseAppGenerator
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
def test_validate_inputs_with_zero():
@@ -476,9 +476,8 @@ class TestBaseAppGeneratorExtras:
assert converted[1] == "event: ping\n\n"
def test_get_draft_var_saver_factory_debugger(self):
- from graphon.enums import BuiltinNodeTypes
-
from core.app.entities.app_invoke_entities import InvokeFrom
+ from graphon.enums import BuiltinNodeTypes
from models import Account
base_app_generator = BaseAppGenerator()
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_runner.py b/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
index 1dee7fdab6..17de39ca99 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
@@ -4,15 +4,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import (
- AssistantPromptMessage,
- ImagePromptMessageContent,
- PromptMessageRole,
- TextPromptMessageContent,
-)
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-from graphon.model_runtime.errors.invoke import InvokeBadRequestError
from core.app.app_config.entities import (
AdvancedChatMessageEntity,
@@ -23,6 +14,15 @@ from core.app.app_config.entities import (
from core.app.apps.base_app_runner import AppRunner
from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import QueueAgentMessageEvent, QueueLLMChunkEvent, QueueMessageEndEvent
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+ AssistantPromptMessage,
+ ImagePromptMessageContent,
+ PromptMessageRole,
+ TextPromptMessageContent,
+)
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
+from graphon.model_runtime.errors.invoke import InvokeBadRequestError
from models.model import AppMode
diff --git a/api/tests/unit_tests/core/app/apps/test_pause_resume.py b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
index a126bc85f7..6104b8d6ca 100644
--- a/api/tests/unit_tests/core/app/apps/test_pause_resume.py
+++ b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
@@ -4,9 +4,14 @@ from types import ModuleType, SimpleNamespace
from typing import Any
import graphon.nodes.human_input.entities # noqa: F401
+from core.app.apps.advanced_chat import app_generator as adv_app_gen_module
+from core.app.apps.workflow import app_generator as wf_app_gen_module
+from core.app.entities.app_invoke_entities import InvokeFrom
+from core.workflow import node_factory as node_factory_module
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.system_variables import build_system_variables
from graphon.entities import WorkflowStartReason
from graphon.entities.base_node_data import BaseNodeData, RetryConfig
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
from graphon.entities.pause_reason import SchedulingPause
from graphon.enums import BuiltinNodeTypes, NodeType, WorkflowNodeExecutionStatus
from graphon.graph import Graph
@@ -25,12 +30,6 @@ from graphon.nodes.base.node import Node
from graphon.nodes.end.entities import EndNodeData
from graphon.nodes.start.entities import StartNodeData
from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.apps.advanced_chat import app_generator as adv_app_gen_module
-from core.app.apps.workflow import app_generator as wf_app_gen_module
-from core.app.entities.app_invoke_entities import InvokeFrom
-from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.system_variables import build_system_variables
from tests.workflow_test_utils import build_test_graph_init_params
if "core.ops.ops_trace_manager" not in sys.modules:
@@ -56,8 +55,21 @@ class _StubToolNode(Node[_StubToolNodeData]):
def version(cls) -> str:
return "1"
- def init_node_data(self, data):
- self._node_data = _StubToolNodeData.model_validate(data)
+ def __init__(
+ self,
+ node_id: str,
+ config: _StubToolNodeData,
+ *,
+ graph_init_params,
+ graph_runtime_state,
+ **_kwargs: Any,
+ ) -> None:
+ super().__init__(
+ node_id=node_id,
+ config=config,
+ graph_init_params=graph_init_params,
+ graph_runtime_state=graph_runtime_state,
+ )
def _get_error_strategy(self):
return self._node_data.error_strategy
@@ -90,21 +102,14 @@ class _StubToolNode(Node[_StubToolNodeData]):
def _patch_tool_node(mocker):
- original_create_node = DifyNodeFactory.create_node
+ original_resolve_node_class = node_factory_module.resolve_workflow_node_class
- def _patched_create_node(self, node_config: dict[str, object] | NodeConfigDict) -> Node:
- typed_node_config = NodeConfigDictAdapter.validate_python(node_config)
- node_data = typed_node_config["data"]
- if node_data.type == BuiltinNodeTypes.TOOL:
- return _StubToolNode(
- id=str(typed_node_config["id"]),
- config=typed_node_config,
- graph_init_params=self.graph_init_params,
- graph_runtime_state=self.graph_runtime_state,
- )
- return original_create_node(self, typed_node_config)
+ def _patched_resolve_node_class(*, node_type: NodeType, node_version: str) -> type[Node]:
+ if node_type == BuiltinNodeTypes.TOOL:
+ return _StubToolNode
+ return original_resolve_node_class(node_type=node_type, node_version=node_version)
- mocker.patch.object(DifyNodeFactory, "create_node", _patched_create_node)
+ mocker.patch.object(node_factory_module, "resolve_workflow_node_class", side_effect=_patched_resolve_node_class)
def _node_data(node_type: NodeType, data: BaseNodeData) -> dict[str, object]:
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
index de5bca161c..58c7bfa4bc 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
@@ -4,6 +4,23 @@ from datetime import UTC, datetime
from types import SimpleNamespace
import pytest
+
+from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.app.entities.queue_entities import (
+ QueueAgentLogEvent,
+ QueueIterationCompletedEvent,
+ QueueLoopCompletedEvent,
+ QueueNodeExceptionEvent,
+ QueueNodeFailedEvent,
+ QueueNodeRetryEvent,
+ QueueNodeSucceededEvent,
+ QueueTextChunkEvent,
+ QueueWorkflowPausedEvent,
+ QueueWorkflowStartedEvent,
+ QueueWorkflowSucceededEvent,
+)
+from core.workflow.system_variables import default_system_variables
from graphon.entities.pause_reason import HumanInputRequired
from graphon.enums import BuiltinNodeTypes
from graphon.graph_events import (
@@ -24,23 +41,6 @@ from graphon.node_events import NodeRunResult
from graphon.runtime import GraphRuntimeState, VariablePool
from graphon.variables.variables import StringVariable
-from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.app.entities.queue_entities import (
- QueueAgentLogEvent,
- QueueIterationCompletedEvent,
- QueueLoopCompletedEvent,
- QueueNodeExceptionEvent,
- QueueNodeFailedEvent,
- QueueNodeRetryEvent,
- QueueNodeSucceededEvent,
- QueueTextChunkEvent,
- QueueWorkflowPausedEvent,
- QueueWorkflowStartedEvent,
- QueueWorkflowSucceededEvent,
-)
-from core.workflow.system_variables import default_system_variables
-
class TestWorkflowBasedAppRunner:
def test_resolve_user_from(self):
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py
index aa789d9ff3..10fb2271f4 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_notifications.py
@@ -1,11 +1,11 @@
from unittest.mock import MagicMock
import pytest
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.graph_events import GraphRunPausedEvent
from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
from core.app.entities.queue_entities import QueueWorkflowPausedEvent
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.graph_events import GraphRunPausedEvent
class _DummyQueueManager:
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
index 9e30faecf2..620a153204 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
@@ -4,14 +4,14 @@ from typing import Any
from unittest.mock import MagicMock, patch
import pytest
-from graphon.entities.graph_config import NodeConfigDictAdapter
-from graphon.runtime import GraphRuntimeState, VariablePool
from core.app.apps.base_app_queue_manager import AppQueueManager
from core.app.apps.workflow.app_runner import WorkflowAppRunner
from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
from core.workflow.system_variables import default_system_variables
+from graphon.entities.graph_config import NodeConfigDictAdapter
+from graphon.runtime import GraphRuntimeState, VariablePool
from models.workflow import Workflow
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py b/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
index 8a717e1dcc..a3ab379b66 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
@@ -3,11 +3,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.entities import WorkflowStartReason
-from graphon.entities.pause_reason import HumanInputRequired
-from graphon.graph_events import GraphRunPausedEvent
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
from core.app.apps.common import workflow_response_converter
from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
@@ -16,6 +11,11 @@ from core.app.entities.app_invoke_entities import InvokeFrom
from core.app.entities.queue_entities import QueueWorkflowPausedEvent
from core.app.entities.task_entities import HumanInputRequiredResponse, WorkflowPauseStreamResponse
from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.entities.pause_reason import HumanInputRequired
+from graphon.graph_events import GraphRunPausedEvent
+from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.enums import FormInputType
from models.account import Account
from models.human_input import RecipientType
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py
index b768e813bd..7dd7ffd727 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_response_converter.py
@@ -1,7 +1,5 @@
from collections.abc import Generator
-from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-
from core.app.apps.workflow.generate_response_converter import WorkflowAppGenerateResponseConverter
from core.app.entities.task_entities import (
ErrorStreamResponse,
@@ -11,6 +9,7 @@ from core.app.entities.task_entities import (
WorkflowAppBlockingResponse,
WorkflowAppStreamResponse,
)
+from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
class TestWorkflowGenerateResponseConverter:
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
index 29df903aa8..1f6e7e12ef 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline.py
@@ -2,15 +2,14 @@ import time
from contextlib import contextmanager
from unittest.mock import MagicMock
-from graphon.entities import WorkflowStartReason
-from graphon.runtime import GraphRuntimeState
-
from core.app.app_config.entities import WorkflowUIBasedAppConfig
from core.app.apps.base_app_queue_manager import AppQueueManager
from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity
from core.app.entities.queue_entities import QueueWorkflowStartedEvent
from core.workflow.system_variables import build_system_variables
+from graphon.entities import WorkflowStartReason
+from graphon.runtime import GraphRuntimeState
from models.account import Account
from models.model import AppMode
from tests.workflow_test_utils import build_test_variable_pool
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
index d91bb85aee..99433478d3 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
@@ -5,8 +5,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
from core.app.app_config.entities import AppAdditionalFeatures, WorkflowUIBasedAppConfig
from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline
@@ -47,6 +45,8 @@ from core.app.entities.task_entities import (
)
from core.base.tts.app_generator_tts_publisher import AudioTrunk
from core.workflow.system_variables import build_system_variables, system_variables_to_mapping
+from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
from libs.datetime_utils import naive_utc_now
from models.enums import CreatorUserRole
from models.model import AppMode, EndUser
diff --git a/api/tests/unit_tests/core/app/entities/test_task_entities.py b/api/tests/unit_tests/core/app/entities/test_task_entities.py
index 014a0cba72..7c79780641 100644
--- a/api/tests/unit_tests/core/app/entities/test_task_entities.py
+++ b/api/tests/unit_tests/core/app/entities/test_task_entities.py
@@ -1,11 +1,10 @@
-from graphon.enums import WorkflowNodeExecutionStatus
-
from core.app.entities.task_entities import (
NodeFinishStreamResponse,
NodeRetryStreamResponse,
NodeStartStreamResponse,
StreamEvent,
)
+from graphon.enums import WorkflowNodeExecutionStatus
class TestTaskEntities:
diff --git a/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py b/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py
index a78c1b428f..ba55e8f695 100644
--- a/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_conversation_variable_persist_layer.py
@@ -1,6 +1,9 @@
from collections.abc import Sequence
from unittest.mock import Mock
+from core.app.layers.conversation_variable_persist_layer import ConversationVariablePersistenceLayer
+from core.workflow.system_variables import SystemVariableKey
+from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
from graphon.graph_engine.command_channels import CommandChannel
from graphon.graph_events import NodeRunSucceededEvent, NodeRunVariableUpdatedEvent
@@ -8,10 +11,6 @@ from graphon.node_events import NodeRunResult
from graphon.runtime import ReadOnlyGraphRuntimeState
from graphon.variables import StringVariable
from graphon.variables.segments import Segment, StringSegment
-
-from core.app.layers.conversation_variable_persist_layer import ConversationVariablePersistenceLayer
-from core.workflow.system_variables import SystemVariableKey
-from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID
from libs.datetime_utils import naive_utc_now
diff --git a/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py b/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py
index 035e64325b..539944d683 100644
--- a/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_pause_state_persist_layer.py
@@ -4,6 +4,16 @@ from time import time
from unittest.mock import Mock
import pytest
+
+from core.app.app_config.entities import WorkflowUIBasedAppConfig
+from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
+from core.app.layers.pause_state_persist_layer import (
+ PauseStatePersistenceLayer,
+ WorkflowResumptionContext,
+ _AdvancedChatAppGenerateEntityWrapper,
+ _WorkflowGenerateEntityWrapper,
+)
+from core.workflow.system_variables import SystemVariableKey
from graphon.entities.pause_reason import SchedulingPause
from graphon.graph_engine.entities.commands import GraphEngineCommand
from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
@@ -15,16 +25,6 @@ from graphon.graph_events import (
)
from graphon.runtime import ReadOnlyVariablePool
from graphon.variables.segments import Segment
-
-from core.app.app_config.entities import WorkflowUIBasedAppConfig
-from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom, WorkflowAppGenerateEntity
-from core.app.layers.pause_state_persist_layer import (
- PauseStatePersistenceLayer,
- WorkflowResumptionContext,
- _AdvancedChatAppGenerateEntityWrapper,
- _WorkflowGenerateEntityWrapper,
-)
-from core.workflow.system_variables import SystemVariableKey
from models.model import AppMode
from repositories.factory import DifyAPIRepositoryFactory
diff --git a/api/tests/unit_tests/core/app/layers/test_suspend_layer.py b/api/tests/unit_tests/core/app/layers/test_suspend_layer.py
index 95931f4f8b..12d49be0f1 100644
--- a/api/tests/unit_tests/core/app/layers/test_suspend_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_suspend_layer.py
@@ -1,6 +1,5 @@
-from graphon.graph_events import GraphRunPausedEvent
-
from core.app.layers.suspend_layer import SuspendLayer
+from graphon.graph_events import GraphRunPausedEvent
class TestSuspendLayer:
diff --git a/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py b/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py
index 7cf6eb4f31..1ac9a4d8c0 100644
--- a/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_timeslice_layer.py
@@ -1,8 +1,7 @@
from unittest.mock import Mock, patch
-from graphon.graph_engine.entities.commands import CommandType, GraphEngineCommand
-
from core.app.layers.timeslice_layer import TimeSliceLayer
+from graphon.graph_engine.entities.commands import CommandType, GraphEngineCommand
from services.workflow.entities import WorkflowScheduleCFSPlanEntity
from services.workflow.scheduler import SchedulerCommand
diff --git a/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py b/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
index aa9285789b..d3bd15b6f3 100644
--- a/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
@@ -2,11 +2,10 @@ from datetime import UTC, datetime, timedelta
from types import SimpleNamespace
from unittest.mock import Mock, patch
-from graphon.graph_events import GraphRunFailedEvent, GraphRunSucceededEvent
-from graphon.runtime import VariablePool
-
from core.app.layers.trigger_post_layer import TriggerPostLayer
from core.workflow.system_variables import build_system_variables
+from graphon.graph_events import GraphRunFailedEvent, GraphRunSucceededEvent
+from graphon.runtime import VariablePool
from models.enums import WorkflowTriggerStatus
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py b/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
index 58aa7d7478..c246f7b783 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_based_generate_task_pipeline.py
@@ -2,11 +2,11 @@ from types import SimpleNamespace
from unittest.mock import Mock
import pytest
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
from core.app.entities.queue_entities import QueueErrorEvent
from core.app.task_pipeline.based_generate_task_pipeline import BasedGenerateTaskPipeline
from core.errors.error import QuotaExceededError
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
from models.enums import MessageStatus
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
index 4aaa10a81a..1c1bf391d3 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline.py
@@ -2,8 +2,6 @@ from types import SimpleNamespace
from unittest.mock import ANY, Mock, patch
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
-from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
from core.app.apps.base_app_queue_manager import AppQueueManager
from core.app.entities.app_invoke_entities import ChatAppGenerateEntity
@@ -28,6 +26,8 @@ from core.app.entities.task_entities import (
from core.app.task_pipeline.easy_ui_based_generate_task_pipeline import EasyUIBasedGenerateTaskPipeline
from core.base.tts import AppGeneratorTTSPublisher
from core.ops.ops_trace_manager import TraceQueueManager
+from graphon.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
+from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
from models.model import AppMode
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
index f22602a400..a20d89d807 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
@@ -5,9 +5,6 @@ from types import SimpleNamespace
from unittest.mock import Mock
import pytest
-from graphon.file import FileTransferMethod
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
-from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, TextPromptMessageContent
from core.app.app_config.entities import (
AppAdditionalFeatures,
@@ -41,6 +38,9 @@ from core.app.entities.task_entities import (
)
from core.app.task_pipeline.easy_ui_based_generate_task_pipeline import EasyUIBasedGenerateTaskPipeline
from core.base.tts import AudioTrunk
+from graphon.file import FileTransferMethod
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, TextPromptMessageContent
from models.model import AppMode
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
index 31b7313066..595d716666 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_message_end_files.py
@@ -17,11 +17,11 @@ import uuid
from unittest.mock import MagicMock, Mock, patch
import pytest
-from graphon.file import FileTransferMethod, FileType
from sqlalchemy.orm import Session
from core.app.entities.task_entities import MessageEndStreamResponse
from core.app.task_pipeline.easy_ui_based_generate_task_pipeline import EasyUIBasedGenerateTaskPipeline
+from graphon.file import FileTransferMethod, FileType
from models.model import MessageFile, UploadFile
diff --git a/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py b/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py
index 29df7eea86..21c761c579 100644
--- a/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py
+++ b/api/tests/unit_tests/core/app/test_easy_ui_model_config_manager.py
@@ -1,10 +1,9 @@
from types import SimpleNamespace
from unittest.mock import patch
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-
from core.app.app_config.easy_ui_based_app.model_config.manager import ModelConfigManager
from core.app.app_config.entities import ModelConfigEntity
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from models.provider_ids import ModelProviderID
diff --git a/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py b/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py
index dc2d82ccd6..5c50cb78da 100644
--- a/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py
+++ b/api/tests/unit_tests/core/app/workflow/layers/test_persistence.py
@@ -2,14 +2,14 @@ from datetime import UTC, datetime
from unittest.mock import Mock
import pytest
-from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus, WorkflowType
-from graphon.node_events import NodeRunResult
from core.app.workflow.layers.persistence import (
PersistenceWorkflowInfo,
WorkflowPersistenceLayer,
_NodeRuntimeSnapshot,
)
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus, WorkflowType
+from graphon.node_events import NodeRunResult
def _build_layer() -> WorkflowPersistenceLayer:
diff --git a/api/tests/unit_tests/core/app/workflow/test_file_runtime.py b/api/tests/unit_tests/core/app/workflow/test_file_runtime.py
index 7be9d6ac1e..701863b927 100644
--- a/api/tests/unit_tests/core/app/workflow/test_file_runtime.py
+++ b/api/tests/unit_tests/core/app/workflow/test_file_runtime.py
@@ -8,13 +8,13 @@ from unittest.mock import MagicMock, patch
from urllib.parse import parse_qs, urlparse
import pytest
-from graphon.file import File, FileTransferMethod, FileType
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.app.file_access import DatabaseFileAccessController, FileAccessScope
from core.app.workflow import file_runtime
from core.app.workflow.file_runtime import DifyWorkflowFileRuntime, bind_dify_workflow_file_runtime
from core.workflow.file_reference import build_file_reference
+from graphon.file import File, FileTransferMethod, FileType
from models import ToolFile, UploadFile
@@ -26,8 +26,8 @@ def _build_file(
extension: str | None = None,
) -> File:
return File(
- id="file-id",
- type=FileType.IMAGE,
+ file_id="file-id",
+ file_type=FileType.IMAGE,
transfer_method=transfer_method,
reference=reference,
remote_url=remote_url,
@@ -351,7 +351,7 @@ def test_runtime_helper_wrappers_delegate_to_config_and_io(monkeypatch: pytest.M
assert runtime.multimodal_send_format == "url"
- with patch.object(file_runtime.ssrf_proxy, "get", return_value="response") as mock_get:
+ with patch.object(file_runtime.graphon_ssrf_proxy, "get", return_value="response") as mock_get:
assert runtime.http_get("http://example", follow_redirects=False) == "response"
mock_get.assert_called_once_with("http://example", follow_redirects=False)
diff --git a/api/tests/unit_tests/core/app/workflow/test_node_factory.py b/api/tests/unit_tests/core/app/workflow/test_node_factory.py
index 8497261d45..30a068f4c5 100644
--- a/api/tests/unit_tests/core/app/workflow/test_node_factory.py
+++ b/api/tests/unit_tests/core/app/workflow/test_node_factory.py
@@ -1,15 +1,15 @@
from types import SimpleNamespace
import pytest
-from graphon.enums import BuiltinNodeTypes
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom, build_dify_run_context
from core.workflow.node_factory import DifyNodeFactory
+from graphon.enums import BuiltinNodeTypes
class DummyNode:
- def __init__(self, *, id, config, graph_init_params, graph_runtime_state, **kwargs):
- self.id = id
+ def __init__(self, *, node_id, config, graph_init_params, graph_runtime_state, **kwargs):
+ self.id = node_id
self.config = config
self.graph_init_params = graph_init_params
self.graph_runtime_state = graph_runtime_state
diff --git a/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py b/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
index a47d3db6f5..82552470a9 100644
--- a/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
+++ b/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
@@ -2,9 +2,8 @@ from __future__ import annotations
from types import SimpleNamespace
-from graphon.enums import BuiltinNodeTypes
-
from core.app.workflow.layers.observability import ObservabilityLayer
+from graphon.enums import BuiltinNodeTypes
class TestObservabilityLayerExtras:
diff --git a/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py b/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
index d8a68f6d00..cacb4dd4fa 100644
--- a/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
+++ b/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
@@ -4,6 +4,10 @@ from datetime import UTC, datetime
from types import SimpleNamespace
import pytest
+
+from core.app.entities.app_invoke_entities import WorkflowAppGenerateEntity
+from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
+from core.workflow.system_variables import SystemVariableKey, build_system_variables
from graphon.entities import WorkflowNodeExecution
from graphon.entities.pause_reason import SchedulingPause
from graphon.enums import (
@@ -29,10 +33,6 @@ from graphon.graph_events import (
from graphon.node_events import NodeRunResult
from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
-from core.app.entities.app_invoke_entities import WorkflowAppGenerateEntity
-from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
-from core.workflow.system_variables import SystemVariableKey, build_system_variables
-
class _RepoRecorder:
def __init__(self) -> None:
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 5ff9774b52..7b433ab57b 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
@@ -301,6 +301,7 @@ class TestAppGeneratorTTSPublisher:
publisher = AppGeneratorTTSPublisher("tenant", "voice1")
publisher.executor = MagicMock()
+ from core.app.entities.queue_entities import QueueAgentMessageEvent
from graphon.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta
from graphon.model_runtime.entities.message_entities import (
AssistantPromptMessage,
@@ -308,8 +309,6 @@ class TestAppGeneratorTTSPublisher:
TextPromptMessageContent,
)
- from core.app.entities.queue_entities import QueueAgentMessageEvent
-
chunk = LLMResultChunk(
model="model",
delta=LLMResultChunkDelta(
@@ -337,11 +336,10 @@ class TestAppGeneratorTTSPublisher:
publisher = AppGeneratorTTSPublisher("tenant", "voice1")
publisher.executor = MagicMock()
+ from core.app.entities.queue_entities import QueueAgentMessageEvent
from graphon.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta
from graphon.model_runtime.entities.message_entities import AssistantPromptMessage
- from core.app.entities.queue_entities import QueueAgentMessageEvent
-
chunk = LLMResultChunk(
model="model",
delta=LLMResultChunkDelta(
diff --git a/api/tests/unit_tests/core/datasource/test_datasource_manager.py b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
index d338cadb77..deeac49bbc 100644
--- a/api/tests/unit_tests/core/datasource/test_datasource_manager.py
+++ b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
@@ -2,15 +2,15 @@ import types
from collections.abc import Generator
import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
from contexts.wrapper import RecyclableContextVar
from core.datasource.datasource_manager import DatasourceManager
from core.datasource.entities.datasource_entities import DatasourceMessage, DatasourceProviderType
from core.datasource.errors import DatasourceProviderNotFoundError
from core.workflow.file_reference import parse_file_reference
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
def _gen_messages_text_only(text: str) -> Generator[DatasourceMessage, None, None]:
@@ -430,7 +430,7 @@ def test_stream_node_events_builds_file_and_variables_from_messages(mocker):
mocker.patch("core.datasource.datasource_manager.session_factory.create_session", return_value=_Session())
mocker.patch("core.datasource.datasource_manager.get_file_type_by_mime_type", return_value=FileType.IMAGE)
built = File(
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id="tool_file_1",
extension=".png",
@@ -530,7 +530,7 @@ def test_stream_node_events_online_drive_sets_variable_pool_file_and_outputs(moc
mocker.patch.object(DatasourceManager, "stream_online_results", return_value=_gen_messages_text_only("ignored"))
file_in = File(
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id="tf",
extension=".pdf",
diff --git a/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py b/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py
index fbaf6d497d..0fca43cd0b 100644
--- a/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py
+++ b/api/tests/unit_tests/core/datasource/utils/test_message_transformer.py
@@ -1,10 +1,10 @@
from unittest.mock import MagicMock, patch
import pytest
-from graphon.file import File, FileTransferMethod, FileType
from core.datasource.entities.datasource_entities import DatasourceMessage
from core.datasource.utils.message_transformer import DatasourceFileMessageTransformer
+from graphon.file import File, FileTransferMethod, FileType
from models.tools import ToolFile
diff --git a/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py b/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
index ff9fd0d8f3..ef8f360dbf 100644
--- a/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
+++ b/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
@@ -1,12 +1,11 @@
-from graphon.nodes.human_input.entities import FormInput, UserAction
-from graphon.nodes.human_input.enums import FormInputType
-
from core.entities.execution_extra_content import (
ExecutionExtraContentDomainModel,
HumanInputContent,
HumanInputFormDefinition,
HumanInputFormSubmissionData,
)
+from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.enums import FormInputType
from models.execution_extra_content import ExecutionContentType
diff --git a/api/tests/unit_tests/core/entities/test_entities_model_entities.py b/api/tests/unit_tests/core/entities/test_entities_model_entities.py
index 2acd278a31..aeca2e3afd 100644
--- a/api/tests/unit_tests/core/entities/test_entities_model_entities.py
+++ b/api/tests/unit_tests/core/entities/test_entities_model_entities.py
@@ -8,9 +8,6 @@ drive provider mapping behavior.
"""
import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
from core.entities.model_entities import (
DefaultModelEntity,
@@ -19,6 +16,9 @@ from core.entities.model_entities import (
ProviderModelWithStatusEntity,
SimpleModelProviderEntity,
)
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
def _build_model_with_status(status: ModelStatus) -> ProviderModelWithStatusEntity:
@@ -46,7 +46,7 @@ def test_simple_model_provider_entity_maps_from_provider_entity() -> None:
# Assert
assert simple_provider.provider == "openai"
- assert simple_provider.label.en_US == "OpenAI"
+ assert simple_provider.label.en_us == "OpenAI"
assert simple_provider.supported_model_types == [ModelType.LLM]
diff --git a/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py b/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
index 8cf0409c4c..a28143026f 100644
--- a/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
+++ b/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
@@ -6,17 +6,6 @@ from typing import Any
from unittest.mock import Mock, patch
import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import (
- ConfigurateMethod,
- CredentialFormSchema,
- FieldModelSchema,
- FormType,
- ModelCredentialSchema,
- ProviderCredentialSchema,
- ProviderEntity,
-)
from constants import HIDDEN_VALUE
from core.entities.model_entities import ModelStatus
@@ -35,6 +24,17 @@ from core.entities.provider_entities import (
SystemConfiguration,
SystemConfigurationStatus,
)
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import (
+ ConfigurateMethod,
+ CredentialFormSchema,
+ FieldModelSchema,
+ FormType,
+ ModelCredentialSchema,
+ ProviderCredentialSchema,
+ ProviderEntity,
+)
from models.enums import CredentialSourceType
from models.provider import ProviderType
from models.provider_ids import ModelProviderID
@@ -345,22 +345,26 @@ def test_validate_provider_credentials_handles_hidden_secret_value() -> None:
)
]
)
- session = Mock()
- session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(encrypted_config="encrypted-old-key")
+ mock_session = Mock()
+ mock_session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(
+ encrypted_config="encrypted-old-key"
+ )
mock_factory = Mock()
mock_factory.provider_credentials_validate.return_value = {"openai_api_key": "restored-key", "region": "us"}
- with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
- with patch("core.entities.provider_configuration.encrypter.decrypt_token", return_value="restored-key"):
- with patch(
- "core.entities.provider_configuration.encrypter.encrypt_token",
- side_effect=lambda tenant_id, value: f"enc::{value}",
- ):
- validated = configuration.validate_provider_credentials(
- credentials={"openai_api_key": HIDDEN_VALUE, "region": "us"},
- credential_id="credential-1",
- session=session,
- )
+ with _patched_session(mock_session):
+ with patch(
+ "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+ ):
+ with patch("core.entities.provider_configuration.encrypter.decrypt_token", return_value="restored-key"):
+ with patch(
+ "core.entities.provider_configuration.encrypter.encrypt_token",
+ side_effect=lambda tenant_id, value: f"enc::{value}",
+ ):
+ validated = configuration.validate_provider_credentials(
+ credentials={"openai_api_key": HIDDEN_VALUE, "region": "us"},
+ credential_id="credential-1",
+ )
assert validated["openai_api_key"] == "enc::restored-key"
assert validated["region"] == "us"
@@ -370,23 +374,15 @@ def test_validate_provider_credentials_handles_hidden_secret_value() -> None:
)
-def test_validate_provider_credentials_opens_session_when_not_passed() -> None:
+def test_validate_provider_credentials_without_credential_id() -> None:
configuration = _build_provider_configuration()
- mock_session = Mock()
mock_factory = Mock()
mock_factory.provider_credentials_validate.return_value = {"region": "us"}
- with patch("core.entities.provider_configuration.Session") as mock_session_cls:
- with patch("core.entities.provider_configuration.db") as mock_db:
- mock_db.engine = Mock()
- mock_session_cls.return_value.__enter__.return_value = mock_session
- with patch(
- "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
- ):
- validated = configuration.validate_provider_credentials(credentials={"region": "us"})
+ with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
+ validated = configuration.validate_provider_credentials(credentials={"region": "us"})
assert validated == {"region": "us"}
- mock_session_cls.assert_called_once()
def test_switch_preferred_provider_type_returns_early_when_no_change_or_unsupported() -> None:
@@ -717,18 +713,22 @@ def test_check_provider_credential_name_exists_and_model_setting_lookup() -> Non
def test_validate_provider_credentials_handles_invalid_original_json() -> None:
configuration = _build_provider_configuration()
configuration.provider.provider_credential_schema = _build_secret_provider_schema()
- session = Mock()
- session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(encrypted_config="{invalid-json")
+ mock_session = Mock()
+ mock_session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(
+ encrypted_config="{invalid-json"
+ )
mock_factory = Mock()
mock_factory.provider_credentials_validate.return_value = {"openai_api_key": "new-key"}
- with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
- with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-key"):
- validated = configuration.validate_provider_credentials(
- credentials={"openai_api_key": HIDDEN_VALUE},
- credential_id="cred-1",
- session=session,
- )
+ with _patched_session(mock_session):
+ with patch(
+ "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+ ):
+ with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-key"):
+ validated = configuration.validate_provider_credentials(
+ credentials={"openai_api_key": HIDDEN_VALUE},
+ credential_id="cred-1",
+ )
assert validated == {"openai_api_key": "enc-key"}
@@ -1060,37 +1060,35 @@ def test_get_custom_model_credential_uses_specific_id_or_configuration_fallback(
def test_validate_custom_model_credentials_supports_hidden_reuse_and_sessionless_path() -> None:
configuration = _build_provider_configuration()
configuration.provider.model_credential_schema = _build_secret_model_schema()
- session = Mock()
- session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(
+ mock_session = Mock()
+ mock_session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(
encrypted_config='{"openai_api_key":"enc"}'
)
mock_factory = Mock()
mock_factory.model_credentials_validate.return_value = {"openai_api_key": "raw"}
- with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
- with patch("core.entities.provider_configuration.encrypter.decrypt_token", return_value="raw"):
- with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
- validated = configuration.validate_custom_model_credentials(
- model_type=ModelType.LLM,
- model="gpt-4o",
- credentials={"openai_api_key": HIDDEN_VALUE},
- credential_id="cred-1",
- session=session,
- )
- assert validated == {"openai_api_key": "enc-new"}
-
- session = Mock()
- mock_factory = Mock()
- mock_factory.model_credentials_validate.return_value = {"region": "us"}
- with _patched_session(session):
+ with _patched_session(mock_session):
with patch(
"core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
):
- validated = configuration.validate_custom_model_credentials(
- model_type=ModelType.LLM,
- model="gpt-4o",
- credentials={"region": "us"},
- )
+ with patch("core.entities.provider_configuration.encrypter.decrypt_token", return_value="raw"):
+ with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
+ validated = configuration.validate_custom_model_credentials(
+ model_type=ModelType.LLM,
+ model="gpt-4o",
+ credentials={"openai_api_key": HIDDEN_VALUE},
+ credential_id="cred-1",
+ )
+ assert validated == {"openai_api_key": "enc-new"}
+
+ mock_factory2 = Mock()
+ mock_factory2.model_credentials_validate.return_value = {"region": "us"}
+ with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory2):
+ validated = configuration.validate_custom_model_credentials(
+ model_type=ModelType.LLM,
+ model="gpt-4o",
+ credentials={"region": "us"},
+ )
assert validated == {"region": "us"}
@@ -1570,18 +1568,20 @@ def test_get_specific_provider_credential_logs_when_decrypt_fails() -> None:
def test_validate_provider_credentials_uses_empty_original_when_record_missing() -> None:
configuration = _build_provider_configuration()
configuration.provider.provider_credential_schema = _build_secret_provider_schema()
- session = Mock()
- session.execute.return_value.scalar_one_or_none.return_value = None
+ mock_session = Mock()
+ mock_session.execute.return_value.scalar_one_or_none.return_value = None
mock_factory = Mock()
mock_factory.provider_credentials_validate.return_value = {"openai_api_key": "raw"}
- with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
- with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
- validated = configuration.validate_provider_credentials(
- credentials={"openai_api_key": HIDDEN_VALUE},
- credential_id="cred-1",
- session=session,
- )
+ with _patched_session(mock_session):
+ with patch(
+ "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+ ):
+ with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
+ validated = configuration.validate_provider_credentials(
+ credentials={"openai_api_key": HIDDEN_VALUE},
+ credential_id="cred-1",
+ )
assert validated == {"openai_api_key": "enc-new"}
@@ -1692,20 +1692,24 @@ def test_get_specific_custom_model_credential_logs_when_decrypt_fails() -> None:
def test_validate_custom_model_credentials_handles_invalid_original_json() -> None:
configuration = _build_provider_configuration()
configuration.provider.model_credential_schema = _build_secret_model_schema()
- session = Mock()
- session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(encrypted_config="{invalid-json")
+ mock_session = Mock()
+ mock_session.execute.return_value.scalar_one_or_none.return_value = SimpleNamespace(
+ encrypted_config="{invalid-json"
+ )
mock_factory = Mock()
mock_factory.model_credentials_validate.return_value = {"openai_api_key": "raw"}
- with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
- with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
- validated = configuration.validate_custom_model_credentials(
- model_type=ModelType.LLM,
- model="gpt-4o",
- credentials={"openai_api_key": HIDDEN_VALUE},
- credential_id="cred-1",
- session=session,
- )
+ with _patched_session(mock_session):
+ with patch(
+ "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+ ):
+ with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
+ validated = configuration.validate_custom_model_credentials(
+ model_type=ModelType.LLM,
+ model="gpt-4o",
+ credentials={"openai_api_key": HIDDEN_VALUE},
+ credential_id="cred-1",
+ )
assert validated == {"openai_api_key": "enc-new"}
diff --git a/api/tests/unit_tests/core/entities/test_entities_provider_entities.py b/api/tests/unit_tests/core/entities/test_entities_provider_entities.py
index 8685d16283..a159d3ad4d 100644
--- a/api/tests/unit_tests/core/entities/test_entities_provider_entities.py
+++ b/api/tests/unit_tests/core/entities/test_entities_provider_entities.py
@@ -1,5 +1,4 @@
import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
from core.entities.parameter_entities import AppSelectorScope
from core.entities.provider_entities import (
@@ -9,6 +8,7 @@ from core.entities.provider_entities import (
ProviderQuotaType,
)
from core.tools.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
def test_provider_quota_type_value_of_returns_enum_member() -> None:
diff --git a/api/tests/unit_tests/core/file/test_models.py b/api/tests/unit_tests/core/file/test_models.py
index bb6e40e224..8cb0938575 100644
--- a/api/tests/unit_tests/core/file/test_models.py
+++ b/api/tests/unit_tests/core/file/test_models.py
@@ -3,9 +3,9 @@ from graphon.file import File, FileTransferMethod, FileType
def test_file():
file = File(
- id="test-file",
+ file_id="test-file",
tenant_id="test-tenant-id",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id="test-related-id",
filename="image.png",
@@ -25,27 +25,21 @@ def test_file():
assert file.size == 67
-def test_file_model_validate_accepts_legacy_tenant_id():
- data = {
- "id": "test-file",
- "tenant_id": "test-tenant-id",
- "type": "image",
- "transfer_method": "tool_file",
- "related_id": "test-related-id",
- "filename": "image.png",
- "extension": ".png",
- "mime_type": "image/png",
- "size": 67,
- "storage_key": "test-storage-key",
- "url": "https://example.com/image.png",
- # Extra legacy fields
- "tool_file_id": "tool-file-123",
- "upload_file_id": "upload-file-456",
- "datasource_file_id": "datasource-file-789",
- }
+def test_file_constructor_accepts_legacy_tenant_id():
+ file = File(
+ file_id="test-file",
+ tenant_id="test-tenant-id",
+ file_type=FileType.IMAGE,
+ transfer_method=FileTransferMethod.TOOL_FILE,
+ tool_file_id="tool-file-123",
+ filename="image.png",
+ extension=".png",
+ mime_type="image/png",
+ size=67,
+ storage_key="test-storage-key",
+ url="https://example.com/image.png",
+ )
- file = File.model_validate(data)
-
- assert file.related_id == "test-related-id"
+ assert file.related_id == "tool-file-123"
assert file.storage_key == "test-storage-key"
assert "tenant_id" not in file.model_dump()
diff --git a/api/tests/unit_tests/core/helper/test_moderation.py b/api/tests/unit_tests/core/helper/test_moderation.py
index 4a84099b74..a0dfa86d20 100644
--- a/api/tests/unit_tests/core/helper/test_moderation.py
+++ b/api/tests/unit_tests/core/helper/test_moderation.py
@@ -2,11 +2,11 @@ from types import SimpleNamespace
from typing import cast
import pytest
-from graphon.model_runtime.errors.invoke import InvokeBadRequestError
from pytest_mock import MockerFixture
from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
from core.helper.moderation import check_moderation
+from graphon.model_runtime.errors.invoke import InvokeBadRequestError
from models.provider import ProviderType
diff --git a/api/tests/unit_tests/core/helper/test_ssrf_proxy.py b/api/tests/unit_tests/core/helper/test_ssrf_proxy.py
index 3b5c5e6597..d9fed9ae2a 100644
--- a/api/tests/unit_tests/core/helper/test_ssrf_proxy.py
+++ b/api/tests/unit_tests/core/helper/test_ssrf_proxy.py
@@ -1,11 +1,17 @@
from unittest.mock import MagicMock, patch
+import httpx
import pytest
from core.helper.ssrf_proxy import (
SSRF_DEFAULT_MAX_RETRIES,
+ SSRFProxy,
_get_user_provided_host_header,
+ _to_graphon_http_response,
+ graphon_ssrf_proxy,
make_request,
+ max_retries_exceeded_error,
+ request_error,
)
@@ -174,3 +180,56 @@ class TestFollowRedirectsParameter:
call_kwargs = mock_client.request.call_args.kwargs
assert call_kwargs.get("follow_redirects") is True
+
+
+def test_to_graphon_http_response_preserves_httpx_response_fields() -> None:
+ response = httpx.Response(
+ 201,
+ headers={"X-Test": "1"},
+ content=b"payload",
+ request=httpx.Request("GET", "https://example.com/resource"),
+ )
+
+ wrapped = _to_graphon_http_response(response)
+
+ assert wrapped.status_code == 201
+ assert wrapped.headers == {"x-test": "1", "content-length": "7"}
+ assert wrapped.content == b"payload"
+ assert wrapped.url == "https://example.com/resource"
+ assert wrapped.reason_phrase == "Created"
+ assert wrapped.text == "payload"
+
+
+def test_ssrf_proxy_exposes_expected_error_types() -> None:
+ proxy = SSRFProxy()
+
+ assert proxy.max_retries_exceeded_error is max_retries_exceeded_error
+ assert proxy.request_error is request_error
+ assert graphon_ssrf_proxy.max_retries_exceeded_error is max_retries_exceeded_error
+ assert graphon_ssrf_proxy.request_error is request_error
+
+
+@pytest.mark.parametrize("method_name", ["get", "head", "post", "put", "delete", "patch"])
+def test_graphon_ssrf_proxy_wraps_module_requests(method_name: str) -> None:
+ response = httpx.Response(
+ 200,
+ headers={"X-Test": "1"},
+ content=b"ok",
+ request=httpx.Request("GET", "https://example.com/resource"),
+ )
+
+ with patch(f"core.helper.ssrf_proxy.{method_name}", return_value=response) as mock_method:
+ wrapped = getattr(graphon_ssrf_proxy, method_name)(
+ "https://example.com/resource",
+ max_retries=3,
+ headers={"X-Test": "1"},
+ )
+
+ mock_method.assert_called_once_with(
+ url="https://example.com/resource",
+ max_retries=3,
+ headers={"X-Test": "1"},
+ )
+ assert wrapped.status_code == 200
+ assert wrapped.url == "https://example.com/resource"
+ assert wrapped.content == b"ok"
diff --git a/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py b/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py
index b45f6fd9a7..6ed9ddb476 100644
--- a/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py
+++ b/api/tests/unit_tests/core/llm_generator/output_parser/test_structured_output.py
@@ -2,20 +2,6 @@ import json
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.entities.llm_entities import (
- LLMResult,
- LLMResultChunk,
- LLMResultChunkDelta,
- LLMResultWithStructuredOutput,
- LLMUsage,
-)
-from graphon.model_runtime.entities.message_entities import (
- AssistantPromptMessage,
- SystemPromptMessage,
- TextPromptMessageContent,
- UserPromptMessage,
-)
-from graphon.model_runtime.entities.model_entities import AIModelEntity, ParameterRule, ParameterType
from core.llm_generator.output_parser.errors import OutputParserError
from core.llm_generator.output_parser.structured_output import (
@@ -30,6 +16,20 @@ from core.llm_generator.output_parser.structured_output import (
remove_additional_properties,
)
from core.model_manager import ModelInstance
+from graphon.model_runtime.entities.llm_entities import (
+ LLMResult,
+ LLMResultChunk,
+ LLMResultChunkDelta,
+ LLMResultWithStructuredOutput,
+ LLMUsage,
+)
+from graphon.model_runtime.entities.message_entities import (
+ AssistantPromptMessage,
+ SystemPromptMessage,
+ TextPromptMessageContent,
+ UserPromptMessage,
+)
+from graphon.model_runtime.entities.model_entities import AIModelEntity, ParameterRule, ParameterType
class TestStructuredOutput:
diff --git a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
index 7cdfb31189..2716f4712c 100644
--- a/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
+++ b/api/tests/unit_tests/core/llm_generator/test_llm_generator.py
@@ -2,12 +2,12 @@ import json
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMMode, LLMResult
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
from core.app.app_config.entities import ModelConfig
from core.llm_generator.entities import RuleCodeGeneratePayload, RuleGeneratePayload, RuleStructuredOutputPayload
from core.llm_generator.llm_generator import LLMGenerator
+from graphon.model_runtime.entities.llm_entities import LLMMode, LLMResult
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
class TestLLMGenerator:
diff --git a/api/tests/unit_tests/core/mcp/server/test_streamable_http.py b/api/tests/unit_tests/core/mcp/server/test_streamable_http.py
index 9a815fb94d..57456085c3 100644
--- a/api/tests/unit_tests/core/mcp/server/test_streamable_http.py
+++ b/api/tests/unit_tests/core/mcp/server/test_streamable_http.py
@@ -3,7 +3,6 @@ from unittest.mock import Mock, patch
import jsonschema
import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
from core.mcp import types
@@ -19,6 +18,7 @@ from core.mcp.server.streamable_http import (
prepare_tool_arguments,
process_mapping_response,
)
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
from models.model import App, AppMCPServer, AppMode, EndUser
diff --git a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
index 9a5fb319d7..f459250b8e 100644
--- a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
+++ b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
@@ -4,6 +4,8 @@ from unittest.mock import MagicMock, patch
from uuid import uuid4
import pytest
+
+from core.memory.token_buffer_memory import TokenBufferMemory
from graphon.model_runtime.entities import (
AssistantPromptMessage,
ImagePromptMessageContent,
@@ -11,8 +13,6 @@ from graphon.model_runtime.entities import (
TextPromptMessageContent,
UserPromptMessage,
)
-
-from core.memory.token_buffer_memory import TokenBufferMemory
from models.model import AppMode
# ---------------------------------------------------------------------------
diff --git a/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py b/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
index 6a672fdfd5..c4fd970562 100644
--- a/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
+++ b/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
@@ -1,6 +1,7 @@
from unittest.mock import Mock
import pytest
+
from graphon.model_runtime.entities.common_entities import I18nObject
from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
from graphon.model_runtime.entities.provider_entities import (
@@ -12,12 +13,12 @@ from graphon.model_runtime.entities.provider_entities import (
ProviderCredentialSchema,
ProviderEntity,
)
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from graphon.model_runtime.model_providers.__base.moderation_model import ModerationModel
-from graphon.model_runtime.model_providers.__base.rerank_model import RerankModel
-from graphon.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
-from graphon.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
-from graphon.model_runtime.model_providers.__base.tts_model import TTSModel
+from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
+from graphon.model_runtime.model_providers.base.moderation_model import ModerationModel
+from graphon.model_runtime.model_providers.base.rerank_model import RerankModel
+from graphon.model_runtime.model_providers.base.speech2text_model import Speech2TextModel
+from graphon.model_runtime.model_providers.base.text_embedding_model import TextEmbeddingModel
+from graphon.model_runtime.model_providers.base.tts_model import TTSModel
from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
diff --git a/api/tests/unit_tests/core/ops/test_config_entity.py b/api/tests/unit_tests/core/ops/test_config_entity.py
index 2cbff54c42..69650c85cc 100644
--- a/api/tests/unit_tests/core/ops/test_config_entity.py
+++ b/api/tests/unit_tests/core/ops/test_config_entity.py
@@ -1,16 +1,11 @@
-import pytest
-from pydantic import ValidationError
+from dify_trace_aliyun.config import AliyunConfig
+from dify_trace_arize_phoenix.config import ArizeConfig, PhoenixConfig
+from dify_trace_langfuse.config import LangfuseConfig
+from dify_trace_langsmith.config import LangSmithConfig
+from dify_trace_opik.config import OpikConfig
+from dify_trace_weave.config import WeaveConfig
-from core.ops.entities.config_entity import (
- AliyunConfig,
- ArizeConfig,
- LangfuseConfig,
- LangSmithConfig,
- OpikConfig,
- PhoenixConfig,
- TracingProviderEnum,
- WeaveConfig,
-)
+from core.ops.entities.config_entity import TracingProviderEnum
class TestTracingProviderEnum:
@@ -27,349 +22,8 @@ class TestTracingProviderEnum:
assert TracingProviderEnum.ALIYUN == "aliyun"
-class TestArizeConfig:
- """Test cases for ArizeConfig"""
-
- def test_valid_config(self):
- """Test valid Arize configuration"""
- config = ArizeConfig(
- api_key="test_key", space_id="test_space", project="test_project", endpoint="https://custom.arize.com"
- )
- assert config.api_key == "test_key"
- assert config.space_id == "test_space"
- assert config.project == "test_project"
- assert config.endpoint == "https://custom.arize.com"
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = ArizeConfig()
- assert config.api_key is None
- assert config.space_id is None
- assert config.project is None
- assert config.endpoint == "https://otlp.arize.com"
-
- def test_project_validation_empty(self):
- """Test project validation with empty value"""
- config = ArizeConfig(project="")
- assert config.project == "default"
-
- def test_project_validation_none(self):
- """Test project validation with None value"""
- config = ArizeConfig(project=None)
- assert config.project == "default"
-
- def test_endpoint_validation_empty(self):
- """Test endpoint validation with empty value"""
- config = ArizeConfig(endpoint="")
- assert config.endpoint == "https://otlp.arize.com"
-
- def test_endpoint_validation_with_path(self):
- """Test endpoint validation normalizes URL by removing path"""
- config = ArizeConfig(endpoint="https://custom.arize.com/api/v1")
- assert config.endpoint == "https://custom.arize.com"
-
- def test_endpoint_validation_invalid_scheme(self):
- """Test endpoint validation rejects invalid schemes"""
- with pytest.raises(ValidationError, match="URL scheme must be one of"):
- ArizeConfig(endpoint="ftp://invalid.com")
-
- def test_endpoint_validation_no_scheme(self):
- """Test endpoint validation rejects URLs without scheme"""
- with pytest.raises(ValidationError, match="URL scheme must be one of"):
- ArizeConfig(endpoint="invalid.com")
-
-
-class TestPhoenixConfig:
- """Test cases for PhoenixConfig"""
-
- def test_valid_config(self):
- """Test valid Phoenix configuration"""
- config = PhoenixConfig(api_key="test_key", project="test_project", endpoint="https://custom.phoenix.com")
- assert config.api_key == "test_key"
- assert config.project == "test_project"
- assert config.endpoint == "https://custom.phoenix.com"
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = PhoenixConfig()
- assert config.api_key is None
- assert config.project is None
- assert config.endpoint == "https://app.phoenix.arize.com"
-
- def test_project_validation_empty(self):
- """Test project validation with empty value"""
- config = PhoenixConfig(project="")
- assert config.project == "default"
-
- def test_endpoint_validation_with_path(self):
- """Test endpoint validation with path"""
- config = PhoenixConfig(endpoint="https://app.phoenix.arize.com/s/dify-integration")
- assert config.endpoint == "https://app.phoenix.arize.com/s/dify-integration"
-
- def test_endpoint_validation_without_path(self):
- """Test endpoint validation without path"""
- config = PhoenixConfig(endpoint="https://app.phoenix.arize.com")
- assert config.endpoint == "https://app.phoenix.arize.com"
-
-
-class TestLangfuseConfig:
- """Test cases for LangfuseConfig"""
-
- def test_valid_config(self):
- """Test valid Langfuse configuration"""
- config = LangfuseConfig(public_key="public_key", secret_key="secret_key", host="https://custom.langfuse.com")
- assert config.public_key == "public_key"
- assert config.secret_key == "secret_key"
- assert config.host == "https://custom.langfuse.com"
-
- def test_valid_config_with_path(self):
- host = "https://custom.langfuse.com/api/v1"
- config = LangfuseConfig(public_key="public_key", secret_key="secret_key", host=host)
- assert config.public_key == "public_key"
- assert config.secret_key == "secret_key"
- assert config.host == host
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = LangfuseConfig(public_key="public", secret_key="secret")
- assert config.host == "https://api.langfuse.com"
-
- def test_missing_required_fields(self):
- """Test that required fields are enforced"""
- with pytest.raises(ValidationError):
- LangfuseConfig()
-
- with pytest.raises(ValidationError):
- LangfuseConfig(public_key="public")
-
- with pytest.raises(ValidationError):
- LangfuseConfig(secret_key="secret")
-
- def test_host_validation_empty(self):
- """Test host validation with empty value"""
- config = LangfuseConfig(public_key="public", secret_key="secret", host="")
- assert config.host == "https://api.langfuse.com"
-
-
-class TestLangSmithConfig:
- """Test cases for LangSmithConfig"""
-
- def test_valid_config(self):
- """Test valid LangSmith configuration"""
- config = LangSmithConfig(api_key="test_key", project="test_project", endpoint="https://custom.smith.com")
- assert config.api_key == "test_key"
- assert config.project == "test_project"
- assert config.endpoint == "https://custom.smith.com"
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = LangSmithConfig(api_key="key", project="project")
- assert config.endpoint == "https://api.smith.langchain.com"
-
- def test_missing_required_fields(self):
- """Test that required fields are enforced"""
- with pytest.raises(ValidationError):
- LangSmithConfig()
-
- with pytest.raises(ValidationError):
- LangSmithConfig(api_key="key")
-
- with pytest.raises(ValidationError):
- LangSmithConfig(project="project")
-
- def test_endpoint_validation_https_only(self):
- """Test endpoint validation only allows HTTPS"""
- with pytest.raises(ValidationError, match="URL scheme must be one of"):
- LangSmithConfig(api_key="key", project="project", endpoint="http://insecure.com")
-
-
-class TestOpikConfig:
- """Test cases for OpikConfig"""
-
- def test_valid_config(self):
- """Test valid Opik configuration"""
- config = OpikConfig(
- api_key="test_key",
- project="test_project",
- workspace="test_workspace",
- url="https://custom.comet.com/opik/api/",
- )
- assert config.api_key == "test_key"
- assert config.project == "test_project"
- assert config.workspace == "test_workspace"
- assert config.url == "https://custom.comet.com/opik/api/"
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = OpikConfig()
- assert config.api_key is None
- assert config.project is None
- assert config.workspace is None
- assert config.url == "https://www.comet.com/opik/api/"
-
- def test_project_validation_empty(self):
- """Test project validation with empty value"""
- config = OpikConfig(project="")
- assert config.project == "Default Project"
-
- def test_url_validation_empty(self):
- """Test URL validation with empty value"""
- config = OpikConfig(url="")
- assert config.url == "https://www.comet.com/opik/api/"
-
- def test_url_validation_missing_suffix(self):
- """Test URL validation requires /api/ suffix"""
- with pytest.raises(ValidationError, match="URL should end with /api/"):
- OpikConfig(url="https://custom.comet.com/opik/")
-
- def test_url_validation_invalid_scheme(self):
- """Test URL validation rejects invalid schemes"""
- with pytest.raises(ValidationError, match="URL must start with https:// or http://"):
- OpikConfig(url="ftp://custom.comet.com/opik/api/")
-
-
-class TestWeaveConfig:
- """Test cases for WeaveConfig"""
-
- def test_valid_config(self):
- """Test valid Weave configuration"""
- config = WeaveConfig(
- api_key="test_key",
- entity="test_entity",
- project="test_project",
- endpoint="https://custom.wandb.ai",
- host="https://custom.host.com",
- )
- assert config.api_key == "test_key"
- assert config.entity == "test_entity"
- assert config.project == "test_project"
- assert config.endpoint == "https://custom.wandb.ai"
- assert config.host == "https://custom.host.com"
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = WeaveConfig(api_key="key", project="project")
- assert config.entity is None
- assert config.endpoint == "https://trace.wandb.ai"
- assert config.host is None
-
- def test_missing_required_fields(self):
- """Test that required fields are enforced"""
- with pytest.raises(ValidationError):
- WeaveConfig()
-
- with pytest.raises(ValidationError):
- WeaveConfig(api_key="key")
-
- with pytest.raises(ValidationError):
- WeaveConfig(project="project")
-
- def test_endpoint_validation_https_only(self):
- """Test endpoint validation only allows HTTPS"""
- with pytest.raises(ValidationError, match="URL scheme must be one of"):
- WeaveConfig(api_key="key", project="project", endpoint="http://insecure.wandb.ai")
-
- def test_host_validation_optional(self):
- """Test host validation is optional but validates when provided"""
- config = WeaveConfig(api_key="key", project="project", host=None)
- assert config.host is None
-
- config = WeaveConfig(api_key="key", project="project", host="")
- assert config.host == ""
-
- config = WeaveConfig(api_key="key", project="project", host="https://valid.host.com")
- assert config.host == "https://valid.host.com"
-
- def test_host_validation_invalid_scheme(self):
- """Test host validation rejects invalid schemes when provided"""
- with pytest.raises(ValidationError, match="URL scheme must be one of"):
- WeaveConfig(api_key="key", project="project", host="ftp://invalid.host.com")
-
-
-class TestAliyunConfig:
- """Test cases for AliyunConfig"""
-
- def test_valid_config(self):
- """Test valid Aliyun configuration"""
- config = AliyunConfig(
- app_name="test_app",
- license_key="test_license_key",
- endpoint="https://custom.tracing-analysis-dc-hz.aliyuncs.com",
- )
- assert config.app_name == "test_app"
- assert config.license_key == "test_license_key"
- assert config.endpoint == "https://custom.tracing-analysis-dc-hz.aliyuncs.com"
-
- def test_default_values(self):
- """Test default values are set correctly"""
- config = AliyunConfig(license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com")
- assert config.app_name == "dify_app"
-
- def test_missing_required_fields(self):
- """Test that required fields are enforced"""
- with pytest.raises(ValidationError):
- AliyunConfig()
-
- with pytest.raises(ValidationError):
- AliyunConfig(license_key="test_license")
-
- with pytest.raises(ValidationError):
- AliyunConfig(endpoint="https://tracing-analysis-dc-hz.aliyuncs.com")
-
- def test_app_name_validation_empty(self):
- """Test app_name validation with empty value"""
- config = AliyunConfig(
- license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com", app_name=""
- )
- assert config.app_name == "dify_app"
-
- def test_endpoint_validation_empty(self):
- """Test endpoint validation with empty value"""
- config = AliyunConfig(license_key="test_license", endpoint="")
- assert config.endpoint == "https://tracing-analysis-dc-hz.aliyuncs.com"
-
- def test_endpoint_validation_with_path(self):
- """Test endpoint validation preserves path for Aliyun endpoints"""
- config = AliyunConfig(
- license_key="test_license", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com/api/v1/traces"
- )
- assert config.endpoint == "https://tracing-analysis-dc-hz.aliyuncs.com/api/v1/traces"
-
- def test_endpoint_validation_invalid_scheme(self):
- """Test endpoint validation rejects invalid schemes"""
- with pytest.raises(ValidationError, match="URL must start with https:// or http://"):
- AliyunConfig(license_key="test_license", endpoint="ftp://invalid.tracing-analysis-dc-hz.aliyuncs.com")
-
- def test_endpoint_validation_no_scheme(self):
- """Test endpoint validation rejects URLs without scheme"""
- with pytest.raises(ValidationError, match="URL must start with https:// or http://"):
- AliyunConfig(license_key="test_license", endpoint="invalid.tracing-analysis-dc-hz.aliyuncs.com")
-
- def test_license_key_required(self):
- """Test that license_key is required and cannot be empty"""
- with pytest.raises(ValidationError):
- AliyunConfig(license_key="", endpoint="https://tracing-analysis-dc-hz.aliyuncs.com")
-
- def test_valid_endpoint_format_examples(self):
- """Test valid endpoint format examples from comments"""
- valid_endpoints = [
- # cms2.0 public endpoint
- "https://proj-xtrace-123456-cn-heyuan.cn-heyuan.log.aliyuncs.com/apm/trace/opentelemetry",
- # cms2.0 intranet endpoint
- "https://proj-xtrace-123456-cn-heyuan.cn-heyuan-intranet.log.aliyuncs.com/apm/trace/opentelemetry",
- # xtrace public endpoint
- "http://tracing-cn-heyuan.arms.aliyuncs.com",
- # xtrace intranet endpoint
- "http://tracing-cn-heyuan-internal.arms.aliyuncs.com",
- ]
-
- for endpoint in valid_endpoints:
- config = AliyunConfig(license_key="test_license", endpoint=endpoint)
- assert config.endpoint == endpoint
-
-
class TestConfigIntegration:
- """Integration tests for configuration classes"""
+ """Cross-provider configuration sanity checks"""
def test_all_configs_can_be_instantiated(self):
"""Test that all config classes can be instantiated with valid data"""
@@ -388,7 +42,6 @@ class TestConfigIntegration:
def test_url_normalization_consistency(self):
"""Test that URL normalization works consistently across configs"""
- # Test that paths are removed from endpoints
arize_config = ArizeConfig(endpoint="https://arize.com/api/v1/test")
phoenix_with_path_config = PhoenixConfig(endpoint="https://app.phoenix.arize.com/s/dify-integration")
phoenix_without_path_config = PhoenixConfig(endpoint="https://app.phoenix.arize.com")
diff --git a/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py b/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
index 543b278715..c24d3ac012 100644
--- a/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
+++ b/api/tests/unit_tests/core/plugin/test_backwards_invocation_model.py
@@ -1,10 +1,9 @@
from types import SimpleNamespace
from unittest.mock import patch
-from graphon.model_runtime.entities.message_entities import UserPromptMessage
-
from core.plugin.backwards_invocation.model import PluginModelBackwardsInvocation
from core.plugin.entities.request import RequestInvokeSummary
+from graphon.model_runtime.entities.message_entities import UserPromptMessage
def test_system_model_helpers_forward_user_id():
diff --git a/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py b/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
index f8d0e127b1..88bf555594 100644
--- a/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
+++ b/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
@@ -6,15 +6,15 @@ from types import SimpleNamespace
from unittest.mock import Mock, sentinel
import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
-from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
from core.plugin.impl import model_runtime as model_runtime_module
from core.plugin.impl.model import PluginModelClient
from core.plugin.impl.model_runtime import TENANT_SCOPE_SCHEMA_CACHE_USER_ID, PluginModelRuntime
from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
+from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
def _build_model_schema() -> AIModelEntity:
@@ -56,7 +56,7 @@ class TestPluginModelRuntime:
assert len(providers) == 1
assert providers[0].provider == "langgenius/openai/openai"
assert providers[0].provider_name == "openai"
- assert providers[0].label.en_US == "OpenAI"
+ assert providers[0].label.en_us == "OpenAI"
client.fetch_model_providers.assert_called_once_with("tenant")
def test_fetch_model_providers_only_exposes_short_name_for_canonical_provider(self) -> None:
diff --git a/api/tests/unit_tests/core/plugin/test_plugin_entities.py b/api/tests/unit_tests/core/plugin/test_plugin_entities.py
index a812b01c5b..f1c4c7e700 100644
--- a/api/tests/unit_tests/core/plugin/test_plugin_entities.py
+++ b/api/tests/unit_tests/core/plugin/test_plugin_entities.py
@@ -4,12 +4,6 @@ from enum import StrEnum
import pytest
from flask import Response
-from graphon.model_runtime.entities.message_entities import (
- AssistantPromptMessage,
- SystemPromptMessage,
- ToolPromptMessage,
- UserPromptMessage,
-)
from pydantic import ValidationError
from core.plugin.entities.endpoint import EndpointEntityWithInstance
@@ -31,6 +25,12 @@ from core.plugin.entities.request import (
)
from core.plugin.utils.http_parser import serialize_response
from core.tools.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.message_entities import (
+ AssistantPromptMessage,
+ SystemPromptMessage,
+ ToolPromptMessage,
+ UserPromptMessage,
+)
class TestEndpointEntity:
diff --git a/api/tests/unit_tests/core/plugin/test_plugin_runtime.py b/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
index a3b1e5f6b0..704b82adc0 100644
--- a/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
+++ b/api/tests/unit_tests/core/plugin/test_plugin_runtime.py
@@ -17,14 +17,6 @@ from unittest.mock import MagicMock, patch
import httpx
import pytest
-from graphon.model_runtime.errors.invoke import (
- InvokeAuthorizationError,
- InvokeBadRequestError,
- InvokeConnectionError,
- InvokeRateLimitError,
- InvokeServerUnavailableError,
-)
-from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
from pydantic import BaseModel
from core.plugin.entities.plugin_daemon import (
@@ -45,6 +37,14 @@ from core.plugin.impl.exc import (
)
from core.plugin.impl.plugin import PluginInstaller
from core.plugin.impl.tool import PluginToolManager
+from graphon.model_runtime.errors.invoke import (
+ InvokeAuthorizationError,
+ InvokeBadRequestError,
+ InvokeConnectionError,
+ InvokeRateLimitError,
+ InvokeServerUnavailableError,
+)
+from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
@pytest.fixture(autouse=True)
diff --git a/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py b/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py
index 90730dff5a..00a4207786 100644
--- a/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py
+++ b/api/tests/unit_tests/core/plugin/utils/test_chunk_merger.py
@@ -1,12 +1,12 @@
from collections.abc import Generator
import pytest
-from graphon.file import File, FileTransferMethod, FileType
from core.agent.entities import AgentInvokeMessage
from core.plugin.utils.chunk_merger import FileChunk, merge_blob_chunks
from core.plugin.utils.converter import convert_parameters_to_plugin_format
from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter, ToolSelector
+from graphon.file import File, FileTransferMethod, FileType
class TestChunkMerger:
@@ -466,7 +466,7 @@ class TestConverter:
def test_convert_parameters_to_plugin_format_with_single_file_and_selector(self):
file_param = File(
tenant_id="tenant-1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/file.png",
storage_key="",
@@ -499,14 +499,14 @@ class TestConverter:
def test_convert_parameters_to_plugin_format_with_lists_and_passthrough_values(self):
file_one = File(
tenant_id="tenant-1",
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/a.txt",
storage_key="",
)
file_two = File(
tenant_id="tenant-1",
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/b.txt",
storage_key="",
diff --git a/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py
index 2b280dd674..e536c0831f 100644
--- a/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py
@@ -2,6 +2,13 @@ from typing import cast
from unittest.mock import MagicMock, patch
import pytest
+
+from configs import dify_config
+from core.app.app_config.entities import ModelConfigEntity
+from core.memory.token_buffer_memory import TokenBufferMemory
+from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
+from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
+from core.prompt.utils.prompt_template_parser import PromptTemplateParser
from graphon.file import File, FileTransferMethod, FileType
from graphon.model_runtime.entities.message_entities import (
AssistantPromptMessage,
@@ -11,13 +18,6 @@ from graphon.model_runtime.entities.message_entities import (
TextPromptMessageContent,
UserPromptMessage,
)
-
-from configs import dify_config
-from core.app.app_config.entities import ModelConfigEntity
-from core.memory.token_buffer_memory import TokenBufferMemory
-from core.prompt.advanced_prompt_transform import AdvancedPromptTransform
-from core.prompt.entities.advanced_prompt_entities import ChatModelMessage, CompletionModelPromptTemplate, MemoryConfig
-from core.prompt.utils.prompt_template_parser import PromptTemplateParser
from models.model import Conversation
@@ -134,9 +134,9 @@ def test__get_chat_model_prompt_messages_with_files_no_memory(get_chat_model_arg
files = [
File(
- id="file1",
+ file_id="file1",
tenant_id="tenant1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/image1.jpg",
storage_key="",
@@ -245,9 +245,9 @@ def test_completion_prompt_jinja2_with_files():
completion_template = CompletionModelPromptTemplate(text="Hi {{name}}", edition_type="jinja2")
file = File(
- id="file1",
+ file_id="file1",
tenant_id="tenant1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/image.jpg",
storage_key="",
@@ -379,9 +379,9 @@ def test_chat_prompt_memory_with_files_and_query():
memory = MagicMock(spec=TokenBufferMemory)
prompt_template = [ChatModelMessage(text="sys", role=PromptMessageRole.SYSTEM)]
file = File(
- id="file1",
+ file_id="file1",
tenant_id="tenant1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/image.jpg",
storage_key="",
@@ -413,9 +413,9 @@ def test_chat_prompt_files_without_query_updates_last_user_or_appends_new():
transform = AdvancedPromptTransform()
model_config_mock = MagicMock(spec=ModelConfigEntity)
file = File(
- id="file1",
+ file_id="file1",
tenant_id="tenant1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/image.jpg",
storage_key="",
@@ -463,9 +463,9 @@ def test_chat_prompt_files_with_query_branch():
transform = AdvancedPromptTransform()
model_config_mock = MagicMock(spec=ModelConfigEntity)
file = File(
- id="file1",
+ file_id="file1",
tenant_id="tenant1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/image.jpg",
storage_key="",
diff --git a/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
index 4a54649b28..28966242d8 100644
--- a/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
@@ -1,19 +1,18 @@
from unittest.mock import MagicMock
-from graphon.model_runtime.entities.message_entities import (
- AssistantPromptMessage,
- SystemPromptMessage,
- ToolPromptMessage,
- UserPromptMessage,
-)
-from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-
from core.app.entities.app_invoke_entities import (
ModelConfigWithCredentialsEntity,
)
from core.entities.provider_configuration import ProviderModelBundle
from core.memory.token_buffer_memory import TokenBufferMemory
from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
+from graphon.model_runtime.entities.message_entities import (
+ AssistantPromptMessage,
+ SystemPromptMessage,
+ ToolPromptMessage,
+ UserPromptMessage,
+)
+from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
from models.model import Conversation
diff --git a/api/tests/unit_tests/core/prompt/test_prompt_message.py b/api/tests/unit_tests/core/prompt/test_prompt_message.py
index a4b3960b0a..5d865d934c 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_message.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_message.py
@@ -1,3 +1,5 @@
+from core.prompt.simple_prompt_transform import ModelMode
+from core.prompt.utils.prompt_message_util import PromptMessageUtil
from graphon.model_runtime.entities.message_entities import (
AssistantPromptMessage,
AudioPromptMessageContent,
@@ -7,9 +9,6 @@ from graphon.model_runtime.entities.message_entities import (
UserPromptMessage,
)
-from core.prompt.simple_prompt_transform import ModelMode
-from core.prompt.utils.prompt_message_util import PromptMessageUtil
-
def test_build_prompt_message_with_prompt_message_contents():
prompt = UserPromptMessage(content=[TextPromptMessageContent(data="Hello, World!")])
diff --git a/api/tests/unit_tests/core/prompt/test_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
index e35ce2c48a..5308c8e7b3 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
@@ -2,16 +2,16 @@ from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from core.prompt.prompt_transform import PromptTransform
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
# from core.app.app_config.entities import ModelConfigEntity
# from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
# from graphon.model_runtime.entities.message_entities import UserPromptMessage
# from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelPropertyKey, ParameterRule
# from graphon.model_runtime.entities.provider_entities import ProviderEntity
-# from graphon.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
+# from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
# from core.prompt.prompt_transform import PromptTransform
diff --git a/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
index 3f188cfbb4..0dc74b33df 100644
--- a/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_simple_prompt_transform.py
@@ -2,12 +2,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.entities.message_entities import (
- AssistantPromptMessage,
- ImagePromptMessageContent,
- TextPromptMessageContent,
- UserPromptMessage,
-)
from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
from core.memory.token_buffer_memory import TokenBufferMemory
@@ -24,6 +18,12 @@ from core.prompt.prompt_templates.advanced_prompt_templates import (
CONTEXT,
)
from core.prompt.simple_prompt_transform import SimplePromptTransform
+from graphon.model_runtime.entities.message_entities import (
+ AssistantPromptMessage,
+ ImagePromptMessageContent,
+ TextPromptMessageContent,
+ UserPromptMessage,
+)
from models.model import AppMode, Conversation
diff --git a/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py b/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py
index 006b4e7345..1f3247590c 100644
--- a/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py
+++ b/api/tests/unit_tests/core/rag/data_post_processor/test_data_post_processor.py
@@ -1,13 +1,12 @@
from unittest.mock import MagicMock, patch
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
-
from core.rag.data_post_processor.data_post_processor import DataPostProcessor
from core.rag.data_post_processor.reorder import ReorderRunner
from core.rag.index_processor.constant.query_type import QueryType
from core.rag.models.document import Document
from core.rag.rerank.rerank_type import RerankMode
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
def _doc(content: str) -> Document:
diff --git a/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py b/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py
index 3563186186..051a1455ae 100644
--- a/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py
+++ b/api/tests/unit_tests/core/rag/embedding/test_cached_embedding.py
@@ -12,11 +12,11 @@ from unittest.mock import Mock, patch
import numpy as np
import pytest
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
-from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
from sqlalchemy.exc import IntegrityError
from core.rag.embedding.cached_embedding import CacheEmbedding
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
+from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
from models.dataset import Embedding
diff --git a/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py b/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py
index 408cf14a51..4b8175b0b4 100644
--- a/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py
+++ b/api/tests/unit_tests/core/rag/embedding/test_embedding_service.py
@@ -49,6 +49,10 @@ from unittest.mock import Mock, patch
import numpy as np
import pytest
+from sqlalchemy.exc import IntegrityError
+
+from core.entities.embedding_type import EmbeddingInputType
+from core.rag.embedding.cached_embedding import CacheEmbedding
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from graphon.model_runtime.entities.text_embedding_entities import EmbeddingResult, EmbeddingUsage
from graphon.model_runtime.errors.invoke import (
@@ -56,10 +60,6 @@ from graphon.model_runtime.errors.invoke import (
InvokeConnectionError,
InvokeRateLimitError,
)
-from sqlalchemy.exc import IntegrityError
-
-from core.entities.embedding_type import EmbeddingInputType
-from core.rag.embedding.cached_embedding import CacheEmbedding
from models.dataset import Embedding
diff --git a/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py
index 64eb89590a..0220fb6d4a 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py
@@ -1,12 +1,14 @@
"""Primarily used for testing merged cell scenarios"""
+import gc
import io
import os
import tempfile
+import warnings
from collections import UserDict
from pathlib import Path
from types import SimpleNamespace
-from unittest.mock import MagicMock
+from unittest.mock import AsyncMock, MagicMock
import pytest
from docx import Document
@@ -354,15 +356,46 @@ def test_init_expands_home_path_and_invalid_local_path(monkeypatch, tmp_path):
WordExtractor("not-a-file", "tenant", "user")
-def test_del_closes_temp_file():
+def test_close_closes_temp_file():
extractor = object.__new__(WordExtractor)
+ extractor._closed = False
extractor.temp_file = MagicMock()
- WordExtractor.__del__(extractor)
+ extractor.close()
extractor.temp_file.close.assert_called_once()
+def test_close_is_idempotent():
+ extractor = object.__new__(WordExtractor)
+ extractor._closed = False
+ extractor.temp_file = MagicMock()
+
+ extractor.close()
+ extractor.close()
+
+ extractor.temp_file.close.assert_called_once()
+
+
+def test_close_handles_async_close_mock():
+ extractor = object.__new__(WordExtractor)
+ extractor._closed = False
+ extractor.temp_file = MagicMock()
+ extractor.temp_file.close = AsyncMock()
+
+ with warnings.catch_warnings(record=True) as caught:
+ warnings.simplefilter("always")
+ extractor.close()
+ gc.collect()
+
+ extractor.temp_file.close.assert_called_once()
+ assert not [
+ warning
+ for warning in caught
+ if issubclass(warning.category, RuntimeWarning) and "AsyncMockMixin._execute_mock_call" in str(warning.message)
+ ]
+
+
def test_extract_images_handles_invalid_external_cases(monkeypatch):
class FakeTargetRef:
def __contains__(self, item):
diff --git a/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py b/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py
index 7ae0da03ff..4ba4d54fa0 100644
--- a/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py
+++ b/api/tests/unit_tests/core/rag/indexing/processor/test_paragraph_index_processor.py
@@ -3,14 +3,14 @@ from typing import Any
from unittest.mock import Mock, patch
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, ImagePromptMessageContent
-from graphon.model_runtime.entities.model_entities import ModelFeature
from core.entities.knowledge_entities import PreviewDetail
from core.rag.index_processor.constant.index_type import IndexTechniqueType
from core.rag.index_processor.processor.paragraph_index_processor import ParagraphIndexProcessor
from core.rag.models.document import AttachmentDocument, Document
+from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
+from graphon.model_runtime.entities.message_entities import AssistantPromptMessage, ImagePromptMessageContent
+from graphon.model_runtime.entities.model_entities import ModelFeature
class TestParagraphIndexProcessor:
diff --git a/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py b/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
index 641c5d9ba0..7c4defc180 100644
--- a/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
+++ b/api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
@@ -53,7 +53,6 @@ from typing import Any
from unittest.mock import MagicMock, Mock, patch
import pytest
-from graphon.model_runtime.entities.model_entities import ModelType
from sqlalchemy.orm.exc import ObjectDeletedError
from core.errors.error import ProviderTokenNotInitError
@@ -64,6 +63,7 @@ from core.indexing_runner import (
)
from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
from core.rag.models.document import ChildDocument, Document
+from graphon.model_runtime.entities.model_entities import ModelType
from libs.datetime_utils import naive_utc_now
from models.dataset import Dataset, DatasetProcessRule
from models.dataset import Document as DatasetDocument
diff --git a/api/tests/unit_tests/core/rag/rerank/test_reranker.py b/api/tests/unit_tests/core/rag/rerank/test_reranker.py
index c279b00d3b..8bc7dbf70d 100644
--- a/api/tests/unit_tests/core/rag/rerank/test_reranker.py
+++ b/api/tests/unit_tests/core/rag/rerank/test_reranker.py
@@ -17,7 +17,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock, Mock, patch
import pytest
-from graphon.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
from core.model_manager import ModelInstance
from core.rag.index_processor.constant.doc_type import DocType
@@ -29,6 +28,7 @@ from core.rag.rerank.rerank_factory import RerankRunnerFactory
from core.rag.rerank.rerank_model import RerankModelRunner
from core.rag.rerank.rerank_type import RerankMode
from core.rag.rerank.weight_rerank import WeightRerankRunner
+from graphon.model_runtime.entities.rerank_entities import RerankDocument, RerankResult
def create_mock_model_instance() -> ModelInstance:
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
index 508fe80e2b..89830f7517 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
@@ -7,8 +7,6 @@ from uuid import uuid4
import pytest
from flask import Flask, current_app
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.model_runtime.entities.model_entities import ModelFeature
from core.app.app_config.entities import (
DatasetEntity,
@@ -35,6 +33,8 @@ from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
from core.rag.retrieval.retrieval_methods import RetrievalMethod
from core.workflow.nodes.knowledge_retrieval import exc
from core.workflow.nodes.knowledge_retrieval.retrieval import KnowledgeRetrievalRequest
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.entities.model_entities import ModelFeature
from models.dataset import Dataset
from models.enums import CreatorUserRole
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py
index 5a2ecb8220..43c521dcfd 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_function_call_router.py
@@ -1,8 +1,7 @@
from unittest.mock import Mock
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-
from core.rag.retrieval.router.multi_dataset_function_call_router import FunctionCallMultiDatasetRouter
+from graphon.model_runtime.entities.llm_entities import LLMUsage
class TestFunctionCallMultiDatasetRouter:
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py
index 539ac0f849..c56528cf55 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_multi_dataset_react_route.py
@@ -1,13 +1,12 @@
from types import SimpleNamespace
from unittest.mock import Mock, patch
+from core.rag.retrieval.output_parser.react_output import ReactAction, ReactFinish
+from core.rag.retrieval.router.multi_dataset_react_route import ReactMultiDatasetRouter
from graphon.model_runtime.entities.llm_entities import LLMUsage
from graphon.model_runtime.entities.message_entities import PromptMessageRole
from graphon.model_runtime.entities.model_entities import ModelType
-from core.rag.retrieval.output_parser.react_output import ReactAction, ReactFinish
-from core.rag.retrieval.router.multi_dataset_react_route import ReactMultiDatasetRouter
-
class TestReactMultiDatasetRouter:
def test_invoke_returns_none_when_no_tools(self) -> None:
diff --git a/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py b/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py
index e229d5fc1a..3d3322094e 100644
--- a/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py
@@ -9,10 +9,10 @@ from unittest.mock import Mock, patch
from uuid import uuid4
import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowType
from core.repositories.celery_workflow_execution_repository import CeleryWorkflowExecutionRepository
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowType
from libs.datetime_utils import naive_utc_now
from models import Account, EndUser
from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py b/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py
index 7dbf78d0f0..05b4f3a053 100644
--- a/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py
@@ -9,14 +9,14 @@ from unittest.mock import Mock, patch
from uuid import uuid4
import pytest
+
+from core.repositories.celery_workflow_node_execution_repository import CeleryWorkflowNodeExecutionRepository
+from core.repositories.factory import OrderConfig
from graphon.entities.workflow_node_execution import (
WorkflowNodeExecution,
WorkflowNodeExecutionStatus,
)
from graphon.enums import BuiltinNodeTypes
-
-from core.repositories.celery_workflow_node_execution_repository import CeleryWorkflowNodeExecutionRepository
-from core.repositories.factory import OrderConfig
from libs.datetime_utils import naive_utc_now
from models import Account, EndUser
from models.workflow import WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py b/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
index 0fc82dda53..18ae9fafc8 100644
--- a/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
+++ b/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
@@ -7,11 +7,6 @@ from datetime import datetime
from types import SimpleNamespace
import pytest
-from graphon.nodes.human_input.entities import (
- FormDefinition,
- UserAction,
-)
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
from core.repositories.human_input_repository import (
HumanInputFormRecord,
@@ -19,13 +14,18 @@ from core.repositories.human_input_repository import (
HumanInputFormSubmissionRepository,
_WorkspaceMemberInfo,
)
-from core.workflow.human_input_compat import (
+from core.workflow.human_input_adapter import (
EmailDeliveryConfig,
EmailDeliveryMethod,
EmailRecipients,
ExternalRecipient,
MemberRecipient,
)
+from graphon.nodes.human_input.entities import (
+ FormDefinition,
+ UserAction,
+)
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
from libs.datetime_utils import naive_utc_now
from models.human_input import (
EmailExternalRecipientPayload,
diff --git a/api/tests/unit_tests/core/repositories/test_human_input_repository.py b/api/tests/unit_tests/core/repositories/test_human_input_repository.py
index 8ff0e40587..4248782d93 100644
--- a/api/tests/unit_tests/core/repositories/test_human_input_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_human_input_repository.py
@@ -9,8 +9,6 @@ from typing import Any
from unittest.mock import MagicMock
import pytest
-from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
-from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
from core.repositories.human_input_repository import (
FormCreateParams,
@@ -23,7 +21,7 @@ from core.repositories.human_input_repository import (
_InvalidTimeoutStatusError,
_WorkspaceMemberInfo,
)
-from core.workflow.human_input_compat import (
+from core.workflow.human_input_adapter import (
EmailDeliveryConfig,
EmailDeliveryMethod,
EmailRecipients,
@@ -31,6 +29,8 @@ from core.workflow.human_input_compat import (
MemberRecipient,
WebAppDeliveryMethod,
)
+from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
+from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
from libs.datetime_utils import naive_utc_now
from models.human_input import HumanInputFormRecipient, RecipientType
diff --git a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
index e5c3e85487..a08c5729cb 100644
--- a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py
@@ -3,12 +3,12 @@ from unittest.mock import MagicMock
from uuid import uuid4
import pytest
-from graphon.entities import WorkflowExecution
-from graphon.enums import WorkflowExecutionStatus, WorkflowType
from sqlalchemy.engine import Engine
from sqlalchemy.orm import sessionmaker
from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
+from graphon.entities import WorkflowExecution
+from graphon.enums import WorkflowExecutionStatus, WorkflowType
from models import Account, CreatorUserRole, EndUser, WorkflowRun
from models.enums import WorkflowRunTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
index 5b4d26b780..6af7b02d4c 100644
--- a/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py
@@ -10,12 +10,6 @@ from unittest.mock import MagicMock, Mock
import psycopg2.errors
import pytest
-from graphon.entities import WorkflowNodeExecution
-from graphon.enums import (
- BuiltinNodeTypes,
- WorkflowNodeExecutionMetadataKey,
- WorkflowNodeExecutionStatus,
-)
from sqlalchemy import Engine, create_engine
from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import sessionmaker
@@ -29,6 +23,12 @@ from core.repositories.sqlalchemy_workflow_node_execution_repository import (
_find_first,
_replace_or_append_offload,
)
+from graphon.entities import WorkflowNodeExecution
+from graphon.enums import (
+ BuiltinNodeTypes,
+ WorkflowNodeExecutionMetadataKey,
+ WorkflowNodeExecutionStatus,
+)
from models import Account, EndUser
from models.enums import ExecutionOffLoadType
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
index 84fe522388..abdbc72085 100644
--- a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
+++ b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py
@@ -4,17 +4,17 @@ from unittest.mock import MagicMock, Mock
import psycopg2.errors
import pytest
-from graphon.entities.workflow_node_execution import (
- WorkflowNodeExecution,
- WorkflowNodeExecutionStatus,
-)
-from graphon.enums import BuiltinNodeTypes
from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import sessionmaker
from core.repositories.sqlalchemy_workflow_node_execution_repository import (
SQLAlchemyWorkflowNodeExecutionRepository,
)
+from graphon.entities.workflow_node_execution import (
+ WorkflowNodeExecution,
+ WorkflowNodeExecutionStatus,
+)
+from graphon.enums import BuiltinNodeTypes
from libs.datetime_utils import naive_utc_now
from models import Account, WorkflowNodeExecutionTriggeredFrom
diff --git a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py
index 27729e7f06..5af1376a0a 100644
--- a/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py
+++ b/api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py
@@ -11,17 +11,17 @@ from datetime import UTC, datetime
from typing import Any
from unittest.mock import MagicMock
-from graphon.entities.workflow_node_execution import (
- WorkflowNodeExecution,
- WorkflowNodeExecutionStatus,
-)
-from graphon.enums import BuiltinNodeTypes
from sqlalchemy import Engine
from configs import dify_config
from core.repositories.sqlalchemy_workflow_node_execution_repository import (
SQLAlchemyWorkflowNodeExecutionRepository,
)
+from graphon.entities.workflow_node_execution import (
+ WorkflowNodeExecution,
+ WorkflowNodeExecutionStatus,
+)
+from graphon.enums import BuiltinNodeTypes
from models import Account, WorkflowNodeExecutionTriggeredFrom
from models.enums import ExecutionOffLoadType
from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload
diff --git a/api/tests/unit_tests/core/test_file.py b/api/tests/unit_tests/core/test_file.py
index ac65d0c02b..eab0176f41 100644
--- a/api/tests/unit_tests/core/test_file.py
+++ b/api/tests/unit_tests/core/test_file.py
@@ -1,15 +1,14 @@
import json
from graphon.file import File, FileTransferMethod, FileType, FileUploadConfig
-
from models.workflow import Workflow
def test_file_to_dict():
file = File(
- id="file1",
+ file_id="file1",
tenant_id="tenant1",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url="https://example.com/image1.jpg",
storage_key="storage_key",
diff --git a/api/tests/unit_tests/core/test_model_manager.py b/api/tests/unit_tests/core/test_model_manager.py
index f5efb78b61..afea9144c0 100644
--- a/api/tests/unit_tests/core/test_model_manager.py
+++ b/api/tests/unit_tests/core/test_model_manager.py
@@ -2,12 +2,12 @@ from unittest.mock import MagicMock, patch
import pytest
import redis
-from graphon.model_runtime.entities.model_entities import ModelType
from pytest_mock import MockerFixture
from core.entities.provider_entities import ModelLoadBalancingConfiguration
from core.model_manager import LBModelManager
from extensions.ext_redis import redis_client
+from graphon.model_runtime.entities.model_entities import ModelType
@pytest.fixture
diff --git a/api/tests/unit_tests/core/test_provider_configuration.py b/api/tests/unit_tests/core/test_provider_configuration.py
index 331166fe63..b19a21d7f4 100644
--- a/api/tests/unit_tests/core/test_provider_configuration.py
+++ b/api/tests/unit_tests/core/test_provider_configuration.py
@@ -1,15 +1,6 @@
from unittest.mock import Mock, patch
import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import ModelType
-from graphon.model_runtime.entities.provider_entities import (
- ConfigurateMethod,
- CredentialFormSchema,
- FormOption,
- FormType,
- ProviderEntity,
-)
from core.entities.provider_configuration import ProviderConfiguration, SystemConfigurationStatus
from core.entities.provider_entities import (
@@ -21,6 +12,15 @@ from core.entities.provider_entities import (
RestrictModel,
SystemConfiguration,
)
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.provider_entities import (
+ ConfigurateMethod,
+ CredentialFormSchema,
+ FormOption,
+ FormType,
+ ProviderEntity,
+)
from models.provider import Provider, ProviderType
diff --git a/api/tests/unit_tests/core/test_provider_manager.py b/api/tests/unit_tests/core/test_provider_manager.py
index ee26172459..f45b43082c 100644
--- a/api/tests/unit_tests/core/test_provider_manager.py
+++ b/api/tests/unit_tests/core/test_provider_manager.py
@@ -2,12 +2,12 @@ from types import SimpleNamespace
from unittest.mock import MagicMock, Mock, PropertyMock, patch
import pytest
-from graphon.model_runtime.entities.common_entities import I18nObject
-from graphon.model_runtime.entities.model_entities import ModelType
from pytest_mock import MockerFixture
from core.entities.provider_entities import ModelSettings
from core.provider_manager import ProviderManager
+from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.model_entities import ModelType
from models.provider import LoadBalancingModelConfig, ProviderModelSetting, TenantDefaultModel
from models.provider_ids import ModelProviderID
diff --git a/api/tests/unit_tests/core/tools/test_builtin_tool_base.py b/api/tests/unit_tests/core/tools/test_builtin_tool_base.py
index 5d744f88c9..1ff81f6120 100644
--- a/api/tests/unit_tests/core/tools/test_builtin_tool_base.py
+++ b/api/tests/unit_tests/core/tools/test_builtin_tool_base.py
@@ -6,13 +6,13 @@ from typing import Any
from unittest.mock import patch
import pytest
-from graphon.model_runtime.entities.message_entities import UserPromptMessage
from core.app.entities.app_invoke_entities import InvokeFrom
from core.tools.__base.tool_runtime import ToolRuntime
from core.tools.builtin_tool.tool import BuiltinTool
from core.tools.entities.common_entities import I18nObject
from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage, ToolProviderType
+from graphon.model_runtime.entities.message_entities import UserPromptMessage
class _BuiltinDummyTool(BuiltinTool):
diff --git a/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py b/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
index ee0ce51eec..c7829fc0d7 100644
--- a/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
+++ b/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
@@ -6,8 +6,6 @@ from datetime import date
from types import SimpleNamespace
import pytest
-from graphon.file import FileType
-from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from core.app.entities.app_invoke_entities import InvokeFrom
from core.tools.__base.tool_runtime import ToolRuntime
@@ -29,6 +27,8 @@ from core.tools.builtin_tool.tool import BuiltinTool
from core.tools.entities.common_entities import I18nObject
from core.tools.entities.tool_entities import ToolEntity, ToolIdentity, ToolInvokeMessage
from core.tools.errors import ToolInvokeError
+from graphon.file import FileType
+from graphon.model_runtime.entities.model_entities import ModelPropertyKey
def _build_builtin_tool(tool_cls: type[BuiltinTool]) -> BuiltinTool:
diff --git a/api/tests/unit_tests/core/tools/test_tool_file_manager.py b/api/tests/unit_tests/core/tools/test_tool_file_manager.py
index 2889cb9db1..ccffdf16d1 100644
--- a/api/tests/unit_tests/core/tools/test_tool_file_manager.py
+++ b/api/tests/unit_tests/core/tools/test_tool_file_manager.py
@@ -12,9 +12,9 @@ from unittest.mock import MagicMock, Mock, patch
import httpx
import pytest
-from graphon.file import FileTransferMethod
from core.tools.tool_file_manager import ToolFileManager
+from graphon.file import FileTransferMethod
def _setup_tool_file_signing(monkeypatch: pytest.MonkeyPatch) -> dict[str, str]:
diff --git a/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py b/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py
index 84b3f71d5e..44785f939c 100644
--- a/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py
+++ b/api/tests/unit_tests/core/tools/utils/test_model_invocation_utils.py
@@ -14,6 +14,8 @@ from typing import Any
from unittest.mock import Mock, patch
import pytest
+
+from core.tools.utils.model_invocation_utils import InvokeModelError, ModelInvocationUtils
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
from graphon.model_runtime.errors.invoke import (
InvokeAuthorizationError,
@@ -23,8 +25,6 @@ from graphon.model_runtime.errors.invoke import (
InvokeServerUnavailableError,
)
-from core.tools.utils.model_invocation_utils import InvokeModelError, ModelInvocationUtils
-
def _mock_model_instance(*, schema: dict[str, Any] | None = None) -> SimpleNamespace:
model_type_instance = Mock()
diff --git a/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py b/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py
index 0e3a7e623a..43f3fbd5c9 100644
--- a/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py
+++ b/api/tests/unit_tests/core/tools/utils/test_workflow_configuration_sync.py
@@ -1,9 +1,9 @@
import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
from core.tools.entities.tool_entities import ToolParameter, WorkflowToolParameterConfiguration
from core.tools.errors import WorkflowToolHumanInputNotSupportedError
from core.tools.utils.workflow_configuration_sync import WorkflowToolConfigurationUtils
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
def test_ensure_no_human_input_nodes_passes_for_non_human_input():
diff --git a/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py b/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py
index 4767480a5a..5a585c609a 100644
--- a/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py
+++ b/api/tests/unit_tests/core/tools/workflow_as_tool/test_provider.py
@@ -4,7 +4,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock, Mock, patch
import pytest
-from graphon.variables.input_entities import VariableEntity, VariableEntityType
from core.tools.entities.common_entities import I18nObject
from core.tools.entities.tool_entities import (
@@ -14,6 +13,7 @@ from core.tools.entities.tool_entities import (
ToolProviderType,
)
from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
+from graphon.variables.input_entities import VariableEntity, VariableEntityType
def _controller() -> WorkflowToolProviderController:
diff --git a/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py b/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
index c20edd7400..72a73dd936 100644
--- a/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
+++ b/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
@@ -11,7 +11,6 @@ from typing import Any
from unittest.mock import MagicMock, Mock, patch
import pytest
-from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod, FileType
from core.app.entities.app_invoke_entities import InvokeFrom
from core.tools.__base.tool_runtime import ToolRuntime
@@ -25,6 +24,7 @@ from core.tools.entities.tool_entities import (
)
from core.tools.errors import ToolInvokeError
from core.tools.workflow_as_tool.tool import WorkflowTool
+from graphon.file import FILE_MODEL_IDENTITY, FileTransferMethod, FileType
class StubScalars:
diff --git a/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py b/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py
index 0c67effe90..fb7dc52838 100644
--- a/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py
+++ b/api/tests/unit_tests/core/trigger/debug/test_debug_event_selectors.py
@@ -12,7 +12,6 @@ from typing import Any
from unittest.mock import MagicMock, patch
import pytest
-from graphon.enums import BuiltinNodeTypes, NodeType
from core.plugin.entities.request import TriggerInvokeEventResponse
from core.trigger.constants import (
@@ -28,6 +27,7 @@ from core.trigger.debug.event_selectors import (
select_trigger_debug_events,
)
from core.trigger.debug.events import PluginTriggerDebugEvent, WebhookDebugEvent
+from graphon.enums import BuiltinNodeTypes, NodeType
from tests.unit_tests.core.trigger.conftest import VALID_PROVIDER_ID
diff --git a/api/tests/unit_tests/core/variables/test_segment.py b/api/tests/unit_tests/core/variables/test_segment.py
index 7406b88270..9e07ea1b6d 100644
--- a/api/tests/unit_tests/core/variables/test_segment.py
+++ b/api/tests/unit_tests/core/variables/test_segment.py
@@ -1,23 +1,30 @@
import dataclasses
+from typing import Annotated
import orjson
import pytest
+from pydantic import BaseModel, Discriminator, Tag
+
+from core.helper import encrypter
+from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
+from core.workflow.variable_pool_initializer import add_variables_to_pool
from graphon.file import File, FileTransferMethod, FileType
from graphon.runtime import VariablePool
from graphon.variables.segment_group import SegmentGroup
from graphon.variables.segments import (
ArrayAnySegment,
+ ArrayBooleanSegment,
ArrayFileSegment,
ArrayNumberSegment,
ArrayObjectSegment,
ArrayStringSegment,
+ BooleanSegment,
FileSegment,
FloatSegment,
IntegerSegment,
NoneSegment,
ObjectSegment,
Segment,
- SegmentUnion,
StringSegment,
get_segment_discriminator,
)
@@ -42,11 +49,26 @@ from graphon.variables.variables import (
StringVariable,
Variable,
)
-from pydantic import BaseModel
+from models.utils.file_input_compat import rebuild_serialized_graph_files_without_lookup
-from core.helper import encrypter
-from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
-from core.workflow.variable_pool_initializer import add_variables_to_pool
+type SegmentUnion = Annotated[
+ (
+ Annotated[NoneSegment, Tag(SegmentType.NONE)]
+ | Annotated[StringSegment, Tag(SegmentType.STRING)]
+ | Annotated[FloatSegment, Tag(SegmentType.FLOAT)]
+ | Annotated[IntegerSegment, Tag(SegmentType.INTEGER)]
+ | Annotated[ObjectSegment, Tag(SegmentType.OBJECT)]
+ | Annotated[FileSegment, Tag(SegmentType.FILE)]
+ | Annotated[BooleanSegment, Tag(SegmentType.BOOLEAN)]
+ | Annotated[ArrayAnySegment, Tag(SegmentType.ARRAY_ANY)]
+ | Annotated[ArrayStringSegment, Tag(SegmentType.ARRAY_STRING)]
+ | Annotated[ArrayNumberSegment, Tag(SegmentType.ARRAY_NUMBER)]
+ | Annotated[ArrayObjectSegment, Tag(SegmentType.ARRAY_OBJECT)]
+ | Annotated[ArrayFileSegment, Tag(SegmentType.ARRAY_FILE)]
+ | Annotated[ArrayBooleanSegment, Tag(SegmentType.ARRAY_BOOLEAN)]
+ ),
+ Discriminator(get_segment_discriminator),
+]
def _build_variable_pool(
@@ -123,7 +145,7 @@ def create_test_file(
) -> File:
"""Factory function to create File objects for testing"""
return File(
- type=file_type,
+ file_type=file_type,
transfer_method=transfer_method,
filename=filename,
extension=extension,
@@ -160,7 +182,7 @@ class TestSegmentDumpAndLoad:
assert restored == model
def test_all_segments_serialization(self):
- """Test serialization/deserialization of all segment types"""
+ """Test file-aware segment serialization through Dify's model boundary."""
# Create one instance of each segment type
test_file = create_test_file()
@@ -181,7 +203,7 @@ class TestSegmentDumpAndLoad:
# Test serialization and deserialization
model = _Segments(segments=all_segments)
json_str = model.model_dump_json()
- loaded = _Segments.model_validate_json(json_str)
+ loaded = _Segments.model_validate(rebuild_serialized_graph_files_without_lookup(orjson.loads(json_str)))
# Verify all segments are preserved
assert len(loaded.segments) == len(all_segments)
@@ -202,7 +224,7 @@ class TestSegmentDumpAndLoad:
assert loaded_segment.value == original.value
def test_all_variables_serialization(self):
- """Test serialization/deserialization of all variable types"""
+ """Test file-aware variable serialization through Dify's model boundary."""
# Create one instance of each variable type
test_file = create_test_file()
@@ -223,7 +245,7 @@ class TestSegmentDumpAndLoad:
# Test serialization and deserialization
model = _Variables(variables=all_variables)
json_str = model.model_dump_json()
- loaded = _Variables.model_validate_json(json_str)
+ loaded = _Variables.model_validate(rebuild_serialized_graph_files_without_lookup(orjson.loads(json_str)))
# Verify all variables are preserved
assert len(loaded.variables) == len(all_variables)
diff --git a/api/tests/unit_tests/core/variables/test_segment_type.py b/api/tests/unit_tests/core/variables/test_segment_type.py
index 37ecd2890b..d4e862220a 100644
--- a/api/tests/unit_tests/core/variables/test_segment_type.py
+++ b/api/tests/unit_tests/core/variables/test_segment_type.py
@@ -1,4 +1,5 @@
import pytest
+
from graphon.variables.segment_group import SegmentGroup
from graphon.variables.segments import StringSegment
from graphon.variables.types import ArrayValidation, SegmentType
diff --git a/api/tests/unit_tests/core/variables/test_segment_type_validation.py b/api/tests/unit_tests/core/variables/test_segment_type_validation.py
index 09254e17a3..317fe99d37 100644
--- a/api/tests/unit_tests/core/variables/test_segment_type_validation.py
+++ b/api/tests/unit_tests/core/variables/test_segment_type_validation.py
@@ -9,6 +9,7 @@ from dataclasses import dataclass
from typing import Any
import pytest
+
from graphon.file import File, FileTransferMethod, FileType
from graphon.variables.segment_group import SegmentGroup
from graphon.variables.segments import (
@@ -34,7 +35,7 @@ def create_test_file(
"""Factory function to create File objects for testing."""
return File(
tenant_id="test-tenant",
- type=file_type,
+ file_type=file_type,
transfer_method=transfer_method,
filename=filename,
extension=extension,
diff --git a/api/tests/unit_tests/core/variables/test_variables.py b/api/tests/unit_tests/core/variables/test_variables.py
index 75b01bf42e..dae5e1ce98 100644
--- a/api/tests/unit_tests/core/variables/test_variables.py
+++ b/api/tests/unit_tests/core/variables/test_variables.py
@@ -1,4 +1,6 @@
import pytest
+from pydantic import ValidationError
+
from graphon.variables import (
ArrayFileVariable,
ArrayVariable,
@@ -10,7 +12,6 @@ from graphon.variables import (
StringVariable,
)
from graphon.variables.variables import VariableBase
-from pydantic import ValidationError
def test_frozen_variables():
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py
index 41627f5e0b..025d79b25d 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/conftest.py
@@ -5,12 +5,13 @@ Shared fixtures for ObservabilityLayer tests.
from unittest.mock import MagicMock, patch
import pytest
-from graphon.enums import BuiltinNodeTypes
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import SimpleSpanProcessor
from opentelemetry.sdk.trace.export.in_memory_span_exporter import InMemorySpanExporter
from opentelemetry.trace import set_tracer_provider
+from graphon.enums import BuiltinNodeTypes
+
@pytest.fixture
def memory_span_exporter():
@@ -61,9 +62,8 @@ def mock_llm_node():
@pytest.fixture
def mock_tool_node():
"""Create a mock Tool Node with tool-specific attributes."""
- from graphon.nodes.tool.entities import ToolNodeData
-
from core.tools.entities.tool_entities import ToolProviderType
+ from graphon.nodes.tool.entities import ToolNodeData
node = MagicMock()
node.id = "test-tool-node-id"
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
index 99d131737e..5d6667257f 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
@@ -3,17 +3,16 @@ from datetime import datetime
from types import SimpleNamespace
from unittest.mock import MagicMock, patch
+from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, UserFrom
+from core.app.workflow.layers.llm_quota import LLMQuotaLayer
+from core.errors.error import QuotaExceededError
+from core.model_manager import ModelInstance
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
from graphon.graph_engine.entities.commands import CommandType
from graphon.graph_events import NodeRunSucceededEvent
from graphon.model_runtime.entities.llm_entities import LLMUsage
from graphon.node_events import NodeRunResult
-from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, UserFrom
-from core.app.workflow.layers.llm_quota import LLMQuotaLayer
-from core.errors.error import QuotaExceededError
-from core.model_manager import ModelInstance
-
def _build_dify_context() -> DifyRunContext:
return DifyRunContext(
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py
index 9cf72763ee..919f15efd0 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_observability.py
@@ -13,10 +13,10 @@ Test coverage:
from unittest.mock import patch
import pytest
-from graphon.enums import BuiltinNodeTypes
from opentelemetry.trace import StatusCode
from core.app.workflow.layers.observability import ObservabilityLayer
+from graphon.enums import BuiltinNodeTypes
class TestObservabilityLayerInitialization:
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
index 88989db856..9f3e3b00b9 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
@@ -1,18 +1,18 @@
-"""
-Mock node factory for testing workflows with third-party service dependencies.
+"""Mock node factory for third-party-service workflow tests.
-This module provides a MockNodeFactory that automatically detects and mocks nodes
-requiring external services (LLM, Agent, Tool, Knowledge Retrieval, HTTP Request).
+The factory follows the same config adaptation path as production
+`DifyNodeFactory.create_node()`, but swaps selected node classes for mock
+implementations before instantiation.
"""
from typing import TYPE_CHECKING, Any
+from core.workflow.human_input_adapter import adapt_node_config_for_graph
+from core.workflow.node_factory import DifyNodeFactory
from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
from graphon.enums import BuiltinNodeTypes, NodeType
from graphon.nodes.base.node import Node
-from core.workflow.node_factory import DifyNodeFactory
-
from .test_mock_nodes import (
MockAgentNode,
MockCodeNode,
@@ -83,20 +83,20 @@ class MockNodeFactory(DifyNodeFactory):
:param node_config: Node configuration dictionary
:return: Node instance (real or mocked)
"""
- typed_node_config = NodeConfigDictAdapter.validate_python(node_config)
+ typed_node_config = NodeConfigDictAdapter.validate_python(adapt_node_config_for_graph(node_config))
+ node_id = typed_node_config["id"]
node_data = typed_node_config["data"]
node_type = node_data.type
# Check if this node type should be mocked
if node_type in self._mock_node_types:
- node_id = typed_node_config["id"]
-
# Create mock node instance
mock_class = self._mock_node_types[node_type]
+ resolved_node_data = self._validate_resolved_node_data(mock_class, node_data)
if node_type == BuiltinNodeTypes.CODE:
mock_instance = mock_class(
- id=node_id,
- config=typed_node_config,
+ node_id=node_id,
+ config=resolved_node_data,
graph_init_params=self.graph_init_params,
graph_runtime_state=self.graph_runtime_state,
mock_config=self.mock_config,
@@ -105,8 +105,8 @@ class MockNodeFactory(DifyNodeFactory):
)
elif node_type == BuiltinNodeTypes.HTTP_REQUEST:
mock_instance = mock_class(
- id=node_id,
- config=typed_node_config,
+ node_id=node_id,
+ config=resolved_node_data,
graph_init_params=self.graph_init_params,
graph_runtime_state=self.graph_runtime_state,
mock_config=self.mock_config,
@@ -121,8 +121,8 @@ class MockNodeFactory(DifyNodeFactory):
BuiltinNodeTypes.PARAMETER_EXTRACTOR,
}:
mock_instance = mock_class(
- id=node_id,
- config=typed_node_config,
+ node_id=node_id,
+ config=resolved_node_data,
graph_init_params=self.graph_init_params,
graph_runtime_state=self.graph_runtime_state,
mock_config=self.mock_config,
@@ -131,8 +131,8 @@ class MockNodeFactory(DifyNodeFactory):
)
else:
mock_instance = mock_class(
- id=node_id,
- config=typed_node_config,
+ node_id=node_id,
+ config=resolved_node_data,
graph_init_params=self.graph_init_params,
graph_runtime_state=self.graph_runtime_state,
mock_config=self.mock_config,
@@ -141,7 +141,7 @@ class MockNodeFactory(DifyNodeFactory):
return mock_instance
# For non-mocked node types, use parent implementation
- return super().create_node(typed_node_config)
+ return super().create_node(node_config)
def should_mock_node(self, node_type: NodeType) -> bool:
"""
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
index 8b7fbd1b30..f9819c47ec 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
@@ -10,6 +10,10 @@ from collections.abc import Generator, Mapping
from typing import TYPE_CHECKING, Any, Optional
from unittest.mock import MagicMock
+from core.model_manager import ModelInstance
+from core.workflow.node_runtime import DifyToolNodeRuntime
+from core.workflow.nodes.agent import AgentNode
+from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
from graphon.model_runtime.entities.llm_entities import LLMUsage
from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
@@ -27,11 +31,6 @@ from graphon.nodes.template_transform import TemplateTransformNode
from graphon.nodes.tool import ToolNode
from graphon.template_rendering import Jinja2TemplateRenderer, TemplateRenderError
-from core.model_manager import ModelInstance
-from core.workflow.node_runtime import DifyToolNodeRuntime
-from core.workflow.nodes.agent import AgentNode
-from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
-
if TYPE_CHECKING:
from graphon.entities import GraphInitParams
from graphon.runtime import GraphRuntimeState
@@ -56,13 +55,14 @@ class MockNodeMixin:
def __init__(
self,
- id: str,
- config: Mapping[str, Any],
+ node_id: str,
+ config: Any,
+ *,
graph_init_params: "GraphInitParams",
graph_runtime_state: "GraphRuntimeState",
mock_config: Optional["MockConfig"] = None,
**kwargs: Any,
- ):
+ ) -> None:
if isinstance(self, (LLMNode, QuestionClassifierNode, ParameterExtractorNode)):
kwargs.setdefault("credentials_provider", MagicMock(spec=CredentialsProvider))
kwargs.setdefault("model_factory", MagicMock(spec=ModelFactory))
@@ -97,7 +97,7 @@ class MockNodeMixin:
kwargs.setdefault("message_transformer", MagicMock())
super().__init__(
- id=id,
+ node_id=node_id,
config=config,
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
index 8311a1e847..75bc6d05f7 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
@@ -4,6 +4,13 @@ from dataclasses import dataclass
from datetime import datetime, timedelta
from typing import Any, Protocol
+from core.repositories.human_input_repository import (
+ FormCreateParams,
+ HumanInputFormEntity,
+ HumanInputFormRepository,
+)
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import build_system_variables
from graphon.entities import WorkflowStartReason
from graphon.graph import Graph
from graphon.graph_engine import GraphEngine, GraphEngineConfig
@@ -23,14 +30,6 @@ from graphon.nodes.human_input.human_input_node import HumanInputNode
from graphon.nodes.start.entities import StartNodeData
from graphon.nodes.start.start_node import StartNode
from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.repositories.human_input_repository import (
- FormCreateParams,
- HumanInputFormEntity,
- HumanInputFormRepository,
-)
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import build_system_variables
from libs.datetime_utils import naive_utc_now
from tests.workflow_test_utils import build_test_graph_init_params
@@ -140,8 +139,8 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
start_config = {"id": "start", "data": StartNodeData(title="Start", variables=[]).model_dump()}
start_node = StartNode(
- id=start_config["id"],
- config=start_config,
+ node_id=start_config["id"],
+ config=StartNodeData(title="Start", variables=[]),
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
)
@@ -155,8 +154,8 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
human_a_config = {"id": "human_a", "data": human_data.model_dump()}
human_a = HumanInputNode(
- id=human_a_config["id"],
- config=human_a_config,
+ node_id=human_a_config["id"],
+ config=human_data,
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
form_repository=repo,
@@ -165,8 +164,8 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
human_b_config = {"id": "human_b", "data": human_data.model_dump()}
human_b = HumanInputNode(
- id=human_b_config["id"],
- config=human_b_config,
+ node_id=human_b_config["id"],
+ config=human_data,
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
form_repository=repo,
@@ -183,8 +182,8 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
)
end_config = {"id": "end", "data": end_data.model_dump()}
end_node = EndNode(
- id=end_config["id"],
- config=end_config,
+ node_id=end_config["id"],
+ config=end_data,
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py b/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
index b11f957677..7d23b63049 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
@@ -19,6 +19,11 @@ from functools import lru_cache
from pathlib import Path
from typing import Any
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+from core.tools.utils.yaml_utils import _load_yaml_file
+from core.workflow.node_factory import DifyNodeFactory, get_default_root_node_id
+from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
+from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
from graphon.entities import GraphInitParams
from graphon.graph import Graph
from graphon.graph_engine import GraphEngine, GraphEngineConfig
@@ -39,12 +44,6 @@ from graphon.variables import (
StringVariable,
)
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.tools.utils.yaml_utils import _load_yaml_file
-from core.workflow.node_factory import DifyNodeFactory, get_default_root_node_id
-from core.workflow.system_variables import build_bootstrap_variables, build_system_variables
-from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
-
from .test_mock_config import MockConfig
from .test_mock_factory import MockNodeFactory
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py b/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py
index cbc920705c..1f4509af9a 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent/test_message_transformer.py
@@ -1,9 +1,8 @@
from unittest.mock import patch
-from graphon.enums import BuiltinNodeTypes
-
from core.tools.utils.message_transformer import ToolFileMessageTransformer
from core.workflow.nodes.agent.message_transformer import AgentMessageTransformer
+from graphon.enums import BuiltinNodeTypes
def test_transform_passes_conversation_id_to_tool_file_message_transformer() -> None:
diff --git a/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py b/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py
index 59dd763b59..c86de7f6e6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py
+++ b/api/tests/unit_tests/core/workflow/nodes/agent/test_runtime_support.py
@@ -1,9 +1,8 @@
from types import SimpleNamespace
from unittest.mock import Mock, patch
-from graphon.model_runtime.entities.model_entities import ModelType
-
from core.workflow.nodes.agent.runtime_support import AgentRuntimeSupport
+from graphon.model_runtime.entities.model_entities import ModelType
def test_fetch_model_reuses_single_model_assembly():
diff --git a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
index 7195471eb6..76b4cd1ef4 100644
--- a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
@@ -2,15 +2,15 @@ import time
import uuid
from unittest.mock import MagicMock
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
-from graphon.nodes.answer.answer_node import AnswerNode
-from graphon.runtime import GraphRuntimeState, VariablePool
-
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.workflow.node_factory import DifyNodeFactory
from core.workflow.system_variables import build_system_variables
from extensions.ext_database import db
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.graph import Graph
+from graphon.nodes.answer.answer_node import AnswerNode
+from graphon.nodes.answer.entities import AnswerNodeData
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_graph_init_params
@@ -67,20 +67,15 @@ def test_execute_answer():
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
- node_config = {
- "id": "answer",
- "data": {
- "title": "123",
- "type": "answer",
- "answer": "Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
- },
- }
-
node = AnswerNode(
- id=str(uuid.uuid4()),
+ node_id=str(uuid.uuid4()),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
- config=node_config,
+ config=AnswerNodeData(
+ title="123",
+ type="answer",
+ answer="Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
+ ),
)
# Mock db.session.close()
diff --git a/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py b/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
index 343bcd3919..ec4cef1955 100644
--- a/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/base/test_base_node.py
@@ -1,10 +1,10 @@
import pytest
+
+from core.workflow.node_factory import get_node_type_classes_mapping
from graphon.entities.base_node_data import BaseNodeData
from graphon.enums import BuiltinNodeTypes, NodeType
from graphon.nodes.base.node import Node
-from core.workflow.node_factory import get_node_type_classes_mapping
-
# Ensures that all production node classes are imported and registered.
_ = get_node_type_classes_mapping()
diff --git a/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py b/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py
index b9371a34f4..ef0df55995 100644
--- a/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py
+++ b/api/tests/unit_tests/core/workflow/nodes/base/test_get_node_type_classes_mapping.py
@@ -1,6 +1,7 @@
import types
from collections.abc import Mapping
+from core.workflow.node_factory import get_node_type_classes_mapping
from graphon.entities.base_node_data import BaseNodeData
from graphon.enums import BuiltinNodeTypes, NodeType
from graphon.nodes.base.node import Node
@@ -13,8 +14,6 @@ from graphon.nodes.variable_assigner.v2.node import (
VariableAssignerNode as VariableAssignerV2,
)
-from core.workflow.node_factory import get_node_type_classes_mapping
-
def test_variable_assigner_latest_prefers_highest_numeric_version():
# Act
diff --git a/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py b/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py
index d155124c50..ce0c9b79c6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/code/code_node_spec.py
@@ -1,3 +1,4 @@
+from configs import dify_config
from graphon.nodes.code.code_node import CodeNode
from graphon.nodes.code.entities import CodeLanguage, CodeNodeData
from graphon.nodes.code.exc import (
@@ -8,8 +9,6 @@ from graphon.nodes.code.exc import (
from graphon.nodes.code.limits import CodeNodeLimits
from graphon.variables.types import SegmentType
-from configs import dify_config
-
CodeNode._limits = CodeNodeLimits(
max_string_length=dify_config.CODE_MAX_STRING_LENGTH,
max_number=dify_config.CODE_MAX_NUMBER,
diff --git a/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py b/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
index fb03ae9998..d7ef781732 100644
--- a/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
@@ -1,8 +1,8 @@
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
-
from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
from core.workflow.nodes.datasource.datasource_node import DatasourceNode
+from core.workflow.nodes.datasource.entities import DatasourceNodeData
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult, StreamChunkEvent, StreamCompletedEvent
class _VarSeg:
@@ -78,19 +78,16 @@ def test_datasource_node_delegates_to_manager_stream(mocker):
mocker.patch("core.workflow.nodes.datasource.datasource_node.DatasourceManager", new=_Mgr)
node = DatasourceNode(
- id="n",
- config={
- "id": "n",
- "data": {
- "type": "datasource",
- "version": "1",
- "title": "Datasource",
- "provider_type": "plugin",
- "provider_name": "p",
- "plugin_id": "plug",
- "datasource_name": "ds",
- },
- },
+ node_id="n",
+ config=DatasourceNodeData(
+ type="datasource",
+ version="1",
+ title="Datasource",
+ provider_type="plugin",
+ provider_name="p",
+ plugin_id="plug",
+ datasource_name="ds",
+ ),
graph_init_params=gp,
graph_runtime_state=gs,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
index a5026b40cf..be7cc073db 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
@@ -1,4 +1,8 @@
import pytest
+
+from configs import dify_config
+from core.helper.ssrf_proxy import ssrf_proxy
+from core.workflow.system_variables import default_system_variables
from graphon.file.file_manager import file_manager
from graphon.nodes.http_request import (
BodyData,
@@ -12,10 +16,6 @@ from graphon.nodes.http_request.exc import AuthorizationConfigError
from graphon.nodes.http_request.executor import Executor
from graphon.runtime import VariablePool
-from configs import dify_config
-from core.helper.ssrf_proxy import ssrf_proxy
-from core.workflow.system_variables import default_system_variables
-
HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
max_connect_timeout=dify_config.HTTP_REQUEST_MAX_CONNECT_TIMEOUT,
max_read_timeout=dify_config.HTTP_REQUEST_MAX_READ_TIMEOUT,
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
index 4705b3f76e..2e89a2da3c 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
@@ -3,17 +3,17 @@ from typing import Any
import httpx
import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file.file_manager import file_manager
-from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
-from graphon.nodes.http_request.entities import HttpRequestNodeTimeout, Response
-from graphon.runtime import GraphRuntimeState, VariablePool
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.helper.ssrf_proxy import ssrf_proxy
from core.tools.tool_file_manager import ToolFileManager
from core.workflow.node_runtime import DifyFileReferenceFactory
from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file.file_manager import file_manager
+from graphon.nodes.http_request import HTTP_REQUEST_CONFIG_FILTER_KEY, HttpRequestNode, HttpRequestNodeConfig
+from graphon.nodes.http_request.entities import HttpRequestNodeData, HttpRequestNodeTimeout, Response
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_graph_init_params
HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
@@ -66,8 +66,8 @@ def test_get_default_config_uses_injected_http_request_config():
assert default_config["retry_config"]["max_retries"] == 7
-def test_get_default_config_with_malformed_http_request_config_raises_value_error():
- with pytest.raises(ValueError, match="http_request_config must be an HttpRequestNodeConfig instance"):
+def test_get_default_config_with_malformed_http_request_config_raises_type_error():
+ with pytest.raises(TypeError, match="http_request_config must be an HttpRequestNodeConfig instance"):
HttpRequestNode.get_default_config(filters={HTTP_REQUEST_CONFIG_FILTER_KEY: "invalid"})
@@ -114,8 +114,8 @@ def _build_http_node(
start_at=time.perf_counter(),
)
return HttpRequestNode(
- id="http-node",
- config=node_config,
+ node_id="http-node",
+ config=HttpRequestNodeData.model_validate(node_data),
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
http_request_config=HTTP_REQUEST_CONFIG,
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
index d16e1233ac..07430498e5 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
@@ -1,7 +1,6 @@
+from core.workflow.human_input_adapter import EmailDeliveryConfig, EmailRecipients
from graphon.runtime import VariablePool
-from core.workflow.human_input_compat import EmailDeliveryConfig, EmailRecipients
-
def test_render_body_template_replaces_variable_values():
config = EmailDeliveryConfig(
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
index a2cdbbf132..0659984c76 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
@@ -10,6 +10,28 @@ from typing import Any
from unittest.mock import MagicMock
import pytest
+from pydantic import ValidationError
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
+from core.repositories.human_input_repository import (
+ FormCreateParams,
+ HumanInputFormEntity,
+ HumanInputFormRecipientEntity,
+ HumanInputFormRepository,
+)
+from core.workflow.human_input_adapter import (
+ DeliveryMethodType,
+ EmailDeliveryConfig,
+ EmailDeliveryMethod,
+ EmailRecipients,
+ EmailRecipientType,
+ ExternalRecipient,
+ MemberRecipient,
+ WebAppDeliveryMethod,
+ _WebAppDeliveryConfig,
+)
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import build_system_variables
from graphon.entities import GraphInitParams
from graphon.node_events import PauseRequestedEvent
from graphon.node_events.node import StreamCompletedEvent
@@ -28,28 +50,6 @@ from graphon.nodes.human_input.enums import (
)
from graphon.nodes.human_input.human_input_node import HumanInputNode
from graphon.runtime import GraphRuntimeState, VariablePool
-from pydantic import ValidationError
-
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
-from core.repositories.human_input_repository import (
- FormCreateParams,
- HumanInputFormEntity,
- HumanInputFormRecipientEntity,
- HumanInputFormRepository,
-)
-from core.workflow.human_input_compat import (
- DeliveryMethodType,
- EmailDeliveryConfig,
- EmailDeliveryMethod,
- EmailRecipients,
- EmailRecipientType,
- ExternalRecipient,
- MemberRecipient,
- WebAppDeliveryMethod,
- _WebAppDeliveryConfig,
-)
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import build_system_variables
from libs.datetime_utils import naive_utc_now
@@ -136,6 +136,26 @@ class InMemoryHumanInputFormRepository(HumanInputFormRepository):
entity.status_value = HumanInputFormStatus.SUBMITTED
+def _build_human_input_node(
+ *,
+ node_id: str,
+ node_data: HumanInputNodeData | Mapping[str, Any],
+ graph_init_params: GraphInitParams,
+ graph_runtime_state: GraphRuntimeState,
+ runtime: DifyHumanInputNodeRuntime,
+) -> HumanInputNode:
+ typed_node_data = (
+ node_data if isinstance(node_data, HumanInputNodeData) else HumanInputNodeData.model_validate(node_data)
+ )
+ return HumanInputNode(
+ node_id=node_id,
+ config=typed_node_data,
+ graph_init_params=graph_init_params,
+ graph_runtime_state=graph_runtime_state,
+ runtime=runtime,
+ )
+
+
class TestDeliveryMethod:
"""Test DeliveryMethod entity."""
@@ -239,7 +259,7 @@ class TestUserAction:
data[field_name] = value
with pytest.raises(ValidationError) as exc_info:
- UserAction(**data)
+ UserAction.model_validate(data)
errors = exc_info.value.errors()
assert any(error["loc"] == (field_name,) and error["type"] == "string_too_long" for error in errors)
@@ -465,9 +485,9 @@ class TestHumanInputNodeVariableResolution:
runtime = DifyHumanInputNodeRuntime(graph_init_params.run_context)
runtime._build_form_repository = MagicMock(return_value=mock_repo) # type: ignore[attr-defined]
- node = HumanInputNode(
- id=config["id"],
- config=config,
+ node = _build_human_input_node(
+ node_id=config["id"],
+ node_data=config["data"],
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
runtime=runtime,
@@ -530,9 +550,9 @@ class TestHumanInputNodeVariableResolution:
runtime = DifyHumanInputNodeRuntime(graph_init_params.run_context)
runtime._build_form_repository = MagicMock(return_value=mock_repo) # type: ignore[attr-defined]
- node = HumanInputNode(
- id=config["id"],
- config=config,
+ node = _build_human_input_node(
+ node_id=config["id"],
+ node_data=config["data"],
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
runtime=runtime,
@@ -595,9 +615,9 @@ class TestHumanInputNodeVariableResolution:
runtime = DifyHumanInputNodeRuntime(graph_init_params.run_context)
runtime._build_form_repository = MagicMock(return_value=mock_repo) # type: ignore[attr-defined]
- node = HumanInputNode(
- id=config["id"],
- config=config,
+ node = _build_human_input_node(
+ node_id=config["id"],
+ node_data=config["data"],
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
runtime=runtime,
@@ -671,9 +691,9 @@ class TestHumanInputNodeVariableResolution:
runtime = DifyHumanInputNodeRuntime(graph_init_params.run_context)
runtime._build_form_repository = MagicMock(return_value=mock_repo) # type: ignore[attr-defined]
- node = HumanInputNode(
- id=config["id"],
- config=config,
+ node = _build_human_input_node(
+ node_id=config["id"],
+ node_data=config["data"],
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
runtime=runtime,
@@ -770,9 +790,9 @@ class TestHumanInputNodeRenderedContent:
form_repository = InMemoryHumanInputFormRepository()
runtime = DifyHumanInputNodeRuntime(graph_init_params.run_context)
runtime._build_form_repository = MagicMock(return_value=form_repository) # type: ignore[attr-defined]
- node = HumanInputNode(
- id=config["id"],
- config=config,
+ node = _build_human_input_node(
+ node_id=config["id"],
+ node_data=config["data"],
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
runtime=runtime,
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
index 52802c7ce1..4a9438b14f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
@@ -1,6 +1,9 @@
import datetime
from types import SimpleNamespace
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.system_variables import default_system_variables
from graphon.entities import GraphInitParams
from graphon.enums import BuiltinNodeTypes
from graphon.graph_events import (
@@ -8,13 +11,10 @@ from graphon.graph_events import (
NodeRunHumanInputFormTimeoutEvent,
NodeRunStartedEvent,
)
+from graphon.nodes.human_input.entities import HumanInputNodeData
from graphon.nodes.human_input.enums import HumanInputFormStatus
from graphon.nodes.human_input.human_input_node import HumanInputNode
from graphon.runtime import GraphRuntimeState, VariablePool
-
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
-from core.workflow.system_variables import default_system_variables
from libs.datetime_utils import naive_utc_now
@@ -26,6 +26,28 @@ class _FakeFormRepository:
return self._form
+def _create_human_input_node(
+ *,
+ config: dict,
+ graph_init_params: GraphInitParams,
+ graph_runtime_state: GraphRuntimeState,
+ repo: _FakeFormRepository,
+) -> HumanInputNode:
+ node_data = (
+ config["data"]
+ if isinstance(config["data"], HumanInputNodeData)
+ else HumanInputNodeData.model_validate(config["data"])
+ )
+ return HumanInputNode(
+ node_id=config["id"],
+ config=node_data,
+ graph_init_params=graph_init_params,
+ graph_runtime_state=graph_runtime_state,
+ form_repository=repo,
+ runtime=DifyHumanInputNodeRuntime(graph_init_params.run_context),
+ )
+
+
def _build_node(form_content: str = "Please enter your name:\n\n{{#$output.name#}}") -> HumanInputNode:
system_variables = default_system_variables()
graph_runtime_state = GraphRuntimeState(
@@ -81,13 +103,11 @@ def _build_node(form_content: str = "Please enter your name:\n\n{{#$output.name#
)
repo = _FakeFormRepository(fake_form)
- return HumanInputNode(
- id="node-1",
+ return _create_human_input_node(
config=config,
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
- form_repository=repo,
- runtime=DifyHumanInputNodeRuntime(graph_init_params.run_context),
+ repo=repo,
)
@@ -146,13 +166,11 @@ def _build_timeout_node() -> HumanInputNode:
)
repo = _FakeFormRepository(fake_form)
- return HumanInputNode(
- id="node-1",
+ return _create_human_input_node(
config=config,
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
- form_repository=repo,
- runtime=DifyHumanInputNodeRuntime(graph_init_params.run_context),
+ repo=repo,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
index bbfe350f7e..8ffce39cd6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
+++ b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
@@ -2,7 +2,10 @@ from collections.abc import Mapping
from typing import Any
import pytest
+
+from core.workflow.system_variables import default_system_variables
from graphon.entities import GraphInitParams
+from graphon.nodes.iteration.entities import IterationNodeData
from graphon.nodes.iteration.exc import IterationGraphNotFoundError
from graphon.nodes.iteration.iteration_node import IterationNode
from graphon.runtime import (
@@ -11,8 +14,6 @@ from graphon.runtime import (
GraphRuntimeState,
VariablePool,
)
-
-from core.workflow.system_variables import default_system_variables
from tests.workflow_test_utils import build_test_graph_init_params
@@ -44,17 +45,14 @@ def _build_iteration_node(
) -> IterationNode:
init_params = build_test_graph_init_params(graph_config=graph_config)
return IterationNode(
- id="iteration-node",
- config={
- "id": "iteration-node",
- "data": {
- "type": "iteration",
- "title": "Iteration",
- "iterator_selector": ["start", "items"],
- "output_selector": ["iteration-node", "output"],
- "start_node_id": start_node_id,
- },
- },
+ node_id="iteration-node",
+ config=IterationNodeData(
+ type="iteration",
+ title="Iteration",
+ iterator_selector=["start", "items"],
+ output_selector=["iteration-node", "output"],
+ start_node_id=start_node_id,
+ ),
graph_init_params=init_params,
graph_runtime_state=runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
index f8802138b5..f254fc3d09 100644
--- a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
@@ -3,9 +3,6 @@ import uuid
from unittest.mock import Mock
import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variables.segments import StringSegment
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.rag.index_processor.constant.index_type import IndexTechniqueType
@@ -19,6 +16,9 @@ from core.workflow.nodes.knowledge_index.protocols import (
SummaryIndexServiceProtocol,
)
from core.workflow.system_variables import SystemVariableKey, build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variables.segments import StringSegment
from tests.workflow_test_utils import build_test_graph_init_params
@@ -93,6 +93,25 @@ def sample_chunks():
}
+def _build_node(
+ *,
+ node_id: str,
+ node_data: KnowledgeIndexNodeData | dict[str, object],
+ graph_init_params,
+ graph_runtime_state,
+) -> KnowledgeIndexNode:
+ return KnowledgeIndexNode(
+ node_id=node_id,
+ config=(
+ node_data
+ if isinstance(node_data, KnowledgeIndexNodeData)
+ else KnowledgeIndexNodeData.model_validate(node_data)
+ ),
+ graph_init_params=graph_init_params,
+ graph_runtime_state=graph_runtime_state,
+ )
+
+
class TestKnowledgeIndexNode:
"""
Test suite for KnowledgeIndexNode.
@@ -115,9 +134,9 @@ class TestKnowledgeIndexNode:
}
# Act
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -143,9 +162,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -176,9 +195,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -212,9 +231,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -269,9 +288,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -332,9 +351,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -383,9 +402,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -440,9 +459,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -498,9 +517,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -536,9 +555,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -583,9 +602,9 @@ class TestKnowledgeIndexNode:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -623,9 +642,9 @@ class TestInvokeKnowledgeIndex:
"data": sample_node_data.model_dump(),
}
- node = KnowledgeIndexNode(
- id=node_id,
- config=config,
+ node = _build_node(
+ node_id=node_id,
+ node_data=config["data"],
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
index ab64be59ad..e923ee761b 100644
--- a/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
@@ -3,10 +3,6 @@ import uuid
from unittest.mock import Mock
import pytest
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variables import StringSegment
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.workflow.nodes.knowledge_retrieval.entities import (
@@ -18,9 +14,17 @@ from core.workflow.nodes.knowledge_retrieval.entities import (
SingleRetrievalConfig,
)
from core.workflow.nodes.knowledge_retrieval.exc import RateLimitExceededError
-from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import KnowledgeRetrievalNode
+from core.workflow.nodes.knowledge_retrieval.knowledge_retrieval_node import (
+ KnowledgeRetrievalNode,
+ _normalize_metadata_filter_scalar,
+ _normalize_metadata_filter_sequence_item,
+)
from core.workflow.nodes.knowledge_retrieval.retrieval import RAGRetrievalProtocol, Source
from core.workflow.system_variables import build_system_variables
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variables import StringSegment
from tests.workflow_test_utils import build_test_graph_init_params
@@ -85,6 +89,12 @@ def sample_node_data():
)
+def test_metadata_filter_normalizers_preserve_numeric_scalars_and_stringify_other_values() -> None:
+ assert _normalize_metadata_filter_scalar(3) == 3
+ assert _normalize_metadata_filter_scalar(True) == "True"
+ assert _normalize_metadata_filter_sequence_item(4) == "4"
+
+
class TestKnowledgeRetrievalNode:
"""
Test suite for KnowledgeRetrievalNode.
@@ -106,8 +116,8 @@ class TestKnowledgeRetrievalNode:
# Act
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -135,8 +145,8 @@ class TestKnowledgeRetrievalNode:
}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -194,8 +204,8 @@ class TestKnowledgeRetrievalNode:
mock_rag_retrieval.llm_usage = LLMUsage.empty_usage()
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -238,8 +248,8 @@ class TestKnowledgeRetrievalNode:
mock_rag_retrieval.llm_usage = LLMUsage.empty_usage()
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -274,8 +284,8 @@ class TestKnowledgeRetrievalNode:
}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -309,8 +319,8 @@ class TestKnowledgeRetrievalNode:
}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -350,8 +360,8 @@ class TestKnowledgeRetrievalNode:
mock_rag_retrieval.llm_usage = LLMUsage.empty_usage()
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -389,8 +399,8 @@ class TestKnowledgeRetrievalNode:
mock_rag_retrieval.llm_usage = LLMUsage.empty_usage()
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -470,8 +480,8 @@ class TestFetchDatasetRetriever:
config = {"id": node_id, "data": node_data.model_dump()}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -507,8 +517,8 @@ class TestFetchDatasetRetriever:
}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -562,8 +572,8 @@ class TestFetchDatasetRetriever:
}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -610,8 +620,8 @@ class TestFetchDatasetRetriever:
mock_graph_runtime_state.variable_pool.add(["start", "query"], StringSegment(value="readme"))
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -671,8 +681,8 @@ class TestFetchDatasetRetriever:
node_id = str(uuid.uuid4())
config = {"id": node_id, "data": node_data.model_dump()}
node = KnowledgeRetrievalNode(
- id=node_id,
- config=config,
+ node_id=node_id,
+ config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
graph_init_params=mock_graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py b/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
index fdf1706765..388654f279 100644
--- a/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
@@ -1,23 +1,42 @@
+from types import SimpleNamespace
from unittest.mock import MagicMock
import pytest
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
from graphon.entities import GraphInitParams
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
+from graphon.nodes.list_operator.entities import ListOperatorNodeData
from graphon.nodes.list_operator.node import ListOperatorNode
from graphon.runtime import GraphRuntimeState
from graphon.variables import ArrayNumberSegment, ArrayStringSegment
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
-
class TestListOperatorNode:
"""Comprehensive tests for ListOperatorNode."""
+ @staticmethod
+ def _build_node(*, config, graph_init_params, graph_runtime_state):
+ return ListOperatorNode(
+ node_id="test",
+ config=config if isinstance(config, ListOperatorNodeData) else ListOperatorNodeData.model_validate(config),
+ graph_init_params=graph_init_params,
+ graph_runtime_state=graph_runtime_state,
+ )
+
+ @staticmethod
+ def _filter_by(comparison_operator: str, value: str) -> dict[str, object]:
+ return {
+ "enabled": True,
+ "conditions": [{"comparison_operator": comparison_operator, "value": value}],
+ }
+
@pytest.fixture
def mock_graph_runtime_state(self):
"""Create mock GraphRuntimeState."""
mock_state = MagicMock(spec=GraphRuntimeState)
mock_variable_pool = MagicMock()
+ mock_variable_pool.convert_template.side_effect = lambda value: SimpleNamespace(text=value)
mock_state.variable_pool = mock_variable_pool
return mock_state
@@ -45,9 +64,8 @@ class TestListOperatorNode:
def _create_node(config, mock_variable):
mock_graph_runtime_state.variable_pool.get.return_value = mock_variable
- return ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ return self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -64,9 +82,8 @@ class TestListOperatorNode:
"limit": {"enabled": False},
}
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -109,9 +126,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=[])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -128,11 +144,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "items"],
- "filter_by": {
- "enabled": True,
- "condition": "contains",
- "value": "app",
- },
+ "filter_by": self._filter_by("contains", "app"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -140,9 +152,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["apple", "banana", "pineapple", "cherry"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -157,11 +168,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "items"],
- "filter_by": {
- "enabled": True,
- "condition": "not contains",
- "value": "app",
- },
+ "filter_by": self._filter_by("not contains", "app"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -169,9 +176,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["apple", "banana", "pineapple", "cherry"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -186,11 +192,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "numbers"],
- "filter_by": {
- "enabled": True,
- "condition": ">",
- "value": "5",
- },
+ "filter_by": self._filter_by(">", "5"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -198,9 +200,8 @@ class TestListOperatorNode:
mock_var = ArrayNumberSegment(value=[1, 3, 5, 7, 9, 11])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -226,9 +227,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["cherry", "apple", "banana"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -254,9 +254,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["cherry", "apple", "banana"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -282,9 +281,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["apple", "banana", "cherry", "date"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -299,11 +297,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "numbers"],
- "filter_by": {
- "enabled": True,
- "condition": ">",
- "value": "3",
- },
+ "filter_by": self._filter_by(">", "3"),
"order_by": {
"enabled": True,
"value": "desc",
@@ -317,9 +311,8 @@ class TestListOperatorNode:
mock_var = ArrayNumberSegment(value=[1, 2, 3, 4, 5, 6, 7, 8, 9])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -341,9 +334,8 @@ class TestListOperatorNode:
mock_graph_runtime_state.variable_pool.get.return_value = None
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -366,9 +358,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["first", "middle", "last"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -384,11 +375,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "items"],
- "filter_by": {
- "enabled": True,
- "condition": "start with",
- "value": "app",
- },
+ "filter_by": self._filter_by("start with", "app"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -396,9 +383,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["apple", "application", "banana", "apricot"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -413,11 +399,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "items"],
- "filter_by": {
- "enabled": True,
- "condition": "end with",
- "value": "le",
- },
+ "filter_by": self._filter_by("end with", "le"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -425,9 +407,8 @@ class TestListOperatorNode:
mock_var = ArrayStringSegment(value=["apple", "banana", "pineapple", "table"])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -442,11 +423,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "numbers"],
- "filter_by": {
- "enabled": True,
- "condition": "=",
- "value": "5",
- },
+ "filter_by": self._filter_by("=", "5"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -454,9 +431,8 @@ class TestListOperatorNode:
mock_var = ArrayNumberSegment(value=[1, 3, 5, 5, 7, 9])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -471,11 +447,7 @@ class TestListOperatorNode:
config = {
"title": "Test",
"variable": ["sys", "numbers"],
- "filter_by": {
- "enabled": True,
- "condition": "≠",
- "value": "5",
- },
+ "filter_by": self._filter_by("≠", "5"),
"order_by": {"enabled": False},
"limit": {"enabled": False},
}
@@ -483,9 +455,8 @@ class TestListOperatorNode:
mock_var = ArrayNumberSegment(value=[1, 3, 5, 7, 9])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
@@ -511,9 +482,8 @@ class TestListOperatorNode:
mock_var = ArrayNumberSegment(value=[9, 3, 7, 1, 5])
mock_graph_runtime_state.variable_pool.get.return_value = mock_var
- node = ListOperatorNode(
- id="test",
- config={"id": "test", "data": config},
+ node = self._build_node(
+ config=config,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
index c784f805c0..212ad07bd3 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
@@ -1,6 +1,8 @@
from unittest import mock
import pytest
+
+from core.model_manager import ModelInstance
from graphon.file import File, FileTransferMethod, FileType
from graphon.model_runtime.entities import (
ImagePromptMessageContent,
@@ -33,8 +35,6 @@ from graphon.nodes.llm.exc import (
from graphon.runtime import VariablePool
from graphon.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
-from core.model_manager import ModelInstance
-
def _build_model_schema(
*,
@@ -71,8 +71,8 @@ def _build_image_file(
mime_type: str = "image/png",
) -> File:
return File(
- id=file_id,
- type=FileType.IMAGE,
+ file_id=file_id,
+ file_type=FileType.IMAGE,
filename=f"{file_id}{extension}",
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url=remote_url,
@@ -95,6 +95,8 @@ def variable_pool() -> VariablePool:
def _fetch_prompt_messages_with_mocked_content(content):
variable_pool = VariablePool.empty()
model_instance = mock.MagicMock(spec=ModelInstance)
+ model_schema = mock.MagicMock()
+ model_schema.supports_prompt_content_type.side_effect = lambda content_type: content_type == "text"
prompt_template = [
LLMNodeChatModelMessage(
text="You are a classifier.",
@@ -106,7 +108,7 @@ def _fetch_prompt_messages_with_mocked_content(content):
with (
mock.patch(
"graphon.nodes.llm.llm_utils.fetch_model_schema",
- return_value=mock.MagicMock(features=[]),
+ return_value=model_schema,
),
mock.patch(
"graphon.nodes.llm.llm_utils.handle_list_messages",
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
index 7841bf05ad..c707cf28cd 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
@@ -5,6 +5,19 @@ from collections.abc import Sequence
from unittest import mock
import pytest
+
+from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, ModelConfigWithCredentialsEntity, UserFrom
+from core.app.llm.model_access import (
+ DifyCredentialsProvider,
+ DifyModelFactory,
+ build_dify_model_access,
+ fetch_model_config,
+)
+from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
+from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
+from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
+from core.prompt.entities.advanced_prompt_entities import MemoryConfig
+from core.workflow.system_variables import default_system_variables
from graphon.entities import GraphInitParams
from graphon.file import File, FileTransferMethod, FileType
from graphon.model_runtime.entities.common_entities import I18nObject
@@ -67,19 +80,6 @@ from graphon.nodes.llm.runtime_protocols import PromptMessageSerializerProtocol
from graphon.runtime import GraphRuntimeState, VariablePool
from graphon.template_rendering import TemplateRenderError
from graphon.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
-
-from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, ModelConfigWithCredentialsEntity, UserFrom
-from core.app.llm.model_access import (
- DifyCredentialsProvider,
- DifyModelFactory,
- build_dify_model_access,
- fetch_model_config,
-)
-from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
-from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
-from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
-from core.prompt.entities.advanced_prompt_entities import MemoryConfig
-from core.workflow.system_variables import default_system_variables
from models.provider import ProviderType
from tests.workflow_test_utils import build_test_graph_init_params
@@ -140,8 +140,8 @@ def _build_image_file(
mime_type: str = "image/png",
) -> File:
return File(
- id=file_id,
- type=FileType.IMAGE,
+ file_id=file_id,
+ file_type=FileType.IMAGE,
filename=f"{file_id}{extension}",
transfer_method=FileTransferMethod.REMOTE_URL,
remote_url=remote_url,
@@ -205,14 +205,10 @@ def llm_node(
mock_credentials_provider = mock.MagicMock(spec=CredentialsProvider)
mock_model_factory = mock.MagicMock(spec=ModelFactory)
mock_prompt_message_serializer = mock.MagicMock(spec=PromptMessageSerializerProtocol)
- node_config = {
- "id": "1",
- "data": llm_node_data.model_dump(),
- }
http_client = mock.MagicMock()
node = LLMNode(
- id="1",
- config=node_config,
+ node_id="1",
+ config=llm_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
credentials_provider=mock_credentials_provider,
@@ -403,8 +399,8 @@ def test_dify_model_access_adapters_call_managers():
def test_fetch_files_with_file_segment():
file = File(
- id="1",
- type=FileType.IMAGE,
+ file_id="1",
+ file_type=FileType.IMAGE,
filename="test.jpg",
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="1",
@@ -420,16 +416,16 @@ def test_fetch_files_with_file_segment():
def test_fetch_files_with_array_file_segment():
files = [
File(
- id="1",
- type=FileType.IMAGE,
+ file_id="1",
+ file_type=FileType.IMAGE,
filename="test1.jpg",
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="1",
storage_key="",
),
File(
- id="2",
- type=FileType.IMAGE,
+ file_id="2",
+ file_type=FileType.IMAGE,
filename="test2.jpg",
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="2",
@@ -1174,14 +1170,10 @@ def llm_node_for_multimodal(llm_node_data, graph_init_params, graph_runtime_stat
mock_credentials_provider = mock.MagicMock(spec=CredentialsProvider)
mock_model_factory = mock.MagicMock(spec=ModelFactory)
mock_prompt_message_serializer = mock.MagicMock(spec=PromptMessageSerializerProtocol)
- node_config = {
- "id": "1",
- "data": llm_node_data.model_dump(),
- }
http_client = mock.MagicMock()
node = LLMNode(
- id="1",
- config=node_config,
+ node_id="1",
+ config=llm_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=graph_runtime_state,
credentials_provider=mock_credentials_provider,
@@ -1203,8 +1195,8 @@ class TestLLMNodeSaveMultiModalImageOutput:
mime_type="image/png",
)
mock_file = File(
- id=str(uuid.uuid4()),
- type=FileType.IMAGE,
+ file_id=str(uuid.uuid4()),
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id=str(uuid.uuid4()),
filename="test-file.png",
@@ -1233,8 +1225,8 @@ class TestLLMNodeSaveMultiModalImageOutput:
mime_type="image/jpg",
)
mock_file = File(
- id=str(uuid.uuid4()),
- type=FileType.IMAGE,
+ file_id=str(uuid.uuid4()),
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id=str(uuid.uuid4()),
filename="test-file.png",
@@ -1291,8 +1283,8 @@ class TestSaveMultimodalOutputAndConvertResultToMarkdown:
image_b64_data = base64.b64encode(image_raw_data).decode()
mock_saved_file = File(
- id=str(uuid.uuid4()),
- type=FileType.IMAGE,
+ file_id=str(uuid.uuid4()),
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.TOOL_FILE,
filename="test.png",
extension=".png",
@@ -1457,7 +1449,6 @@ def test_invoke_llm_dispatches_to_expected_model_method(structured_output_enable
file_saver=file_saver,
file_outputs=[],
node_id="node-1",
- node_type=LLMNode.node_type,
reasoning_format="separated",
)
)
@@ -1514,7 +1505,6 @@ def test_handle_invoke_result_streaming_collects_text_metrics_and_structured_out
file_saver=mock.MagicMock(spec=LLMFileSaver),
file_outputs=[],
node_id="node-1",
- node_type=LLMNode.node_type,
model_instance=_build_prepared_llm_mock(),
reasoning_format="separated",
request_start_time=1.0,
@@ -1552,7 +1542,6 @@ def test_handle_invoke_result_wraps_structured_output_parse_errors():
file_saver=mock.MagicMock(spec=LLMFileSaver),
file_outputs=[],
node_id="node-1",
- node_type=LLMNode.node_type,
model_instance=model_instance,
)
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
index 1c362a0a03..8f8ec49f14 100644
--- a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
@@ -6,6 +6,8 @@ from dataclasses import dataclass
from typing import Any
import pytest
+
+from factories.variable_factory import build_segment_with_type
from graphon.model_runtime.entities import LLMMode
from graphon.nodes.llm import ModelConfig, VisionConfig
from graphon.nodes.parameter_extractor.entities import ParameterConfig, ParameterExtractorNodeData
@@ -18,8 +20,6 @@ from graphon.nodes.parameter_extractor.exc import (
from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
from graphon.variables.types import SegmentType
-from factories.variable_factory import build_segment_with_type
-
@dataclass
class ValidTestCase:
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
index d86e0efe02..892f6cc586 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
@@ -1,6 +1,8 @@
from unittest.mock import MagicMock
import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from graphon.enums import BuiltinNodeTypes, ErrorStrategy, WorkflowNodeExecutionStatus
from graphon.graph import Graph
from graphon.nodes.base.entities import VariableSelector
@@ -8,11 +10,31 @@ from graphon.nodes.template_transform.entities import TemplateTransformNodeData
from graphon.nodes.template_transform.template_transform_node import TemplateTransformNode
from graphon.runtime import GraphRuntimeState
from graphon.template_rendering import TemplateRenderError
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from tests.workflow_test_utils import build_test_graph_init_params
+def _build_template_transform_node(
+ *,
+ node_data,
+ graph_init_params,
+ graph_runtime_state,
+ node_id: str = "test_node",
+ **kwargs,
+) -> TemplateTransformNode:
+ typed_node_data = (
+ node_data
+ if isinstance(node_data, TemplateTransformNodeData)
+ else TemplateTransformNodeData.model_validate(node_data)
+ )
+ return TemplateTransformNode(
+ node_id=node_id,
+ config=typed_node_data,
+ graph_init_params=graph_init_params,
+ graph_runtime_state=graph_runtime_state,
+ **kwargs,
+ )
+
+
class TestTemplateTransformNode:
"""Comprehensive test suite for TemplateTransformNode."""
@@ -59,9 +81,8 @@ class TestTemplateTransformNode:
def test_node_initialization(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
"""Test that TemplateTransformNode initializes correctly."""
mock_renderer = MagicMock()
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -75,9 +96,8 @@ class TestTemplateTransformNode:
def test_get_title(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
"""Test _get_title method."""
mock_renderer = MagicMock()
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -88,9 +108,8 @@ class TestTemplateTransformNode:
def test_get_description(self, basic_node_data, mock_graph_runtime_state, graph_init_params):
"""Test _get_description method."""
mock_renderer = MagicMock()
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -108,9 +127,8 @@ class TestTemplateTransformNode:
}
mock_renderer = MagicMock()
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -143,9 +161,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
with pytest.raises(ValueError, match="max_output_length must be a positive integer"):
- TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -170,9 +187,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "Hello Alice, you are 30 years old!"
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -198,9 +214,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "Value: "
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -218,9 +233,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.side_effect = TemplateRenderError("Template syntax error")
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -238,9 +252,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "This is a very long output that exceeds the limit"
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -260,9 +273,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "1234567890"
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": basic_node_data},
+ node = _build_template_transform_node(
+ node_data=basic_node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -302,9 +314,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "apple, banana, orange (Total: 3)"
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -375,8 +386,8 @@ class TestTemplateTransformNode:
)
assert mapping == {
- "node_123.var1": ["sys", "input1"],
- "node_123.empty_selector": [],
+ "node_123.var1": ("sys", "input1"),
+ "node_123.empty_selector": (),
}
def test_extract_variable_selector_to_variable_mapping_ignores_invalid_entries(self):
@@ -409,9 +420,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "This is a static message."
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -448,9 +458,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "Total: $31.5"
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -477,9 +486,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "Name: John Doe, Email: john@example.com"
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
@@ -507,9 +515,8 @@ class TestTemplateTransformNode:
mock_renderer = MagicMock()
mock_renderer.render_template.return_value = "Tags: #python #ai #workflow "
- node = TemplateTransformNode(
- id="test_node",
- config={"id": "test_node", "data": node_data},
+ node = _build_template_transform_node(
+ node_data=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=mock_renderer,
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
index bd22a8e318..a846efbb43 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
@@ -1,14 +1,15 @@
from unittest.mock import MagicMock
import pytest
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from graphon.nodes.base.entities import VariableSelector
+from graphon.nodes.template_transform.entities import TemplateTransformNodeData
from graphon.nodes.template_transform.template_transform_node import (
DEFAULT_TEMPLATE_TRANSFORM_MAX_OUTPUT_LENGTH,
TemplateTransformNode,
)
from graphon.runtime import GraphRuntimeState
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from tests.workflow_test_utils import build_test_graph_init_params
from .template_transform_node_spec import TestTemplateTransformNode # noqa: F401
@@ -37,15 +38,13 @@ def mock_graph_runtime_state():
def test_node_uses_default_max_output_length_when_not_overridden(graph_init_params, mock_graph_runtime_state):
node = TemplateTransformNode(
- id="test_node",
- config={
- "id": "test_node",
- "data": {
- "title": "Template Transform",
- "variables": [],
- "template": "hello",
- },
- },
+ node_id="test_node",
+ config=TemplateTransformNodeData(
+ title="Template Transform",
+ type="template-transform",
+ variables=[],
+ template="hello",
+ ),
graph_init_params=graph_init_params,
graph_runtime_state=mock_graph_runtime_state,
jinja2_template_renderer=MagicMock(),
@@ -70,5 +69,5 @@ def test_extract_variable_selector_to_variable_mapping_accepts_mixed_valid_entri
assert mapping == {
"node_123.validated": ["sys", "input1"],
- "node_123.raw": ["sys", "input2"],
+ "node_123.raw": ("sys", "input2"),
}
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_base_node.py b/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
index e11ebf6eb8..364408ead6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
@@ -1,16 +1,15 @@
from collections.abc import Mapping
import pytest
-from graphon.entities import GraphInitParams
-from graphon.entities.base_node_data import BaseNodeData
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from graphon.enums import BuiltinNodeTypes
-from graphon.nodes.base.node import Node
-from graphon.runtime import GraphRuntimeState, VariablePool
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from core.workflow.node_runtime import resolve_dify_run_context
from core.workflow.system_variables import build_system_variables
+from graphon.entities import GraphInitParams
+from graphon.entities.base_node_data import BaseNodeData
+from graphon.enums import BuiltinNodeTypes
+from graphon.nodes.base.node import Node
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_graph_init_params
@@ -42,17 +41,19 @@ def _build_context(graph_config: Mapping[str, object]) -> tuple[GraphInitParams,
return init_params, runtime_state
-def _build_node_config() -> NodeConfigDict:
- return NodeConfigDictAdapter.validate_python(
- {
- "id": "node-1",
- "data": {
- "type": BuiltinNodeTypes.ANSWER,
- "title": "Sample",
- "foo": "bar",
- },
- }
- )
+def _build_node_config() -> dict[str, object]:
+ return {
+ "id": "node-1",
+ "data": _SampleNodeData(
+ type=BuiltinNodeTypes.ANSWER,
+ title="Sample",
+ foo="bar",
+ ),
+ }
+
+
+def _build_node_data() -> _SampleNodeData:
+ return _build_node_config()["data"] # type: ignore[return-value]
def test_node_hydrates_data_during_initialization():
@@ -60,8 +61,8 @@ def test_node_hydrates_data_during_initialization():
init_params, runtime_state = _build_context(graph_config)
node = _SampleNode(
- id="node-1",
- config=_build_node_config(),
+ node_id="node-1",
+ config=_build_node_data(),
graph_init_params=init_params,
graph_runtime_state=runtime_state,
)
@@ -86,8 +87,8 @@ def test_node_accepts_invoke_from_enum():
)
node = _SampleNode(
- id="node-1",
- config=_build_node_config(),
+ node_id="node-1",
+ config=_build_node_data(),
graph_init_params=init_params,
graph_runtime_state=runtime_state,
)
@@ -117,13 +118,7 @@ def test_missing_generic_argument_raises_type_error():
def test_base_node_data_keeps_dict_style_access_compatibility():
- node_data = _SampleNodeData.model_validate(
- {
- "type": BuiltinNodeTypes.ANSWER,
- "title": "Sample",
- "foo": "bar",
- }
- )
+ node_data = _SampleNodeData(type=BuiltinNodeTypes.ANSWER, title="Sample", foo="bar")
assert node_data["foo"] == "bar"
assert node_data.get("foo") == "bar"
@@ -133,21 +128,19 @@ def test_base_node_data_keeps_dict_style_access_compatibility():
def test_node_hydration_preserves_compatibility_extra_fields():
graph_config: dict[str, object] = {}
init_params, runtime_state = _build_context(graph_config)
- node_config = NodeConfigDictAdapter.validate_python(
- {
- "id": "node-1",
- "data": {
- "type": BuiltinNodeTypes.ANSWER,
- "title": "Sample",
- "foo": "bar",
- "compat_flag": True,
- },
- }
- )
+ node_config = {
+ "id": "node-1",
+ "data": _SampleNodeData(
+ type=BuiltinNodeTypes.ANSWER,
+ title="Sample",
+ foo="bar",
+ compat_flag=True,
+ ),
+ }
node = _SampleNode(
- id="node-1",
- config=node_config,
+ node_id="node-1",
+ config=node_config["data"],
graph_init_params=init_params,
graph_runtime_state=runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
index 555ff0c945..dd75b32593 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
@@ -4,23 +4,25 @@ from unittest.mock import Mock, patch
import pandas as pd
import pytest
from docx.oxml.text.paragraph import CT_P
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from graphon.entities import GraphInitParams
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
from graphon.file import File, FileTransferMethod
from graphon.node_events import NodeRunResult
from graphon.nodes.document_extractor import DocumentExtractorNode, DocumentExtractorNodeData
+from graphon.nodes.document_extractor.exc import TextExtractionError, UnsupportedFileTypeError
from graphon.nodes.document_extractor.node import (
_extract_text_from_docx,
_extract_text_from_excel,
+ _extract_text_from_file,
_extract_text_from_pdf,
_extract_text_from_plain_text,
_normalize_docx_zip,
)
-from graphon.variables import ArrayFileSegment
+from graphon.variables import ArrayFileSegment, FileSegment
from graphon.variables.segments import ArrayStringSegment
from graphon.variables.variables import StringVariable
-
-from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
from tests.workflow_test_utils import build_test_graph_init_params
@@ -44,11 +46,10 @@ def document_extractor_node(graph_init_params):
title="Test Document Extractor",
variable_selector=["node_id", "variable_name"],
)
- node_config = {"id": "test_node_id", "data": node_data.model_dump()}
http_client = Mock()
node = DocumentExtractorNode(
- id="test_node_id",
- config=node_config,
+ node_id="test_node_id",
+ config=node_data,
graph_init_params=graph_init_params,
graph_runtime_state=Mock(),
http_client=http_client,
@@ -341,7 +342,7 @@ def test_extract_text_from_excel_sheet_parse_error(mock_excel_file):
# Mock ExcelFile
mock_excel_instance = Mock()
mock_excel_instance.sheet_names = ["GoodSheet", "BadSheet"]
- mock_excel_instance.parse.side_effect = [df, Exception("Parse error")]
+ mock_excel_instance.parse.side_effect = [df, TypeError("Parse error")]
mock_excel_file.return_value = mock_excel_instance
file_content = b"fake_excel_mixed_content"
@@ -386,7 +387,7 @@ def test_extract_text_from_excel_all_sheets_fail(mock_excel_file):
# Mock ExcelFile
mock_excel_instance = Mock()
mock_excel_instance.sheet_names = ["BadSheet1", "BadSheet2"]
- mock_excel_instance.parse.side_effect = [Exception("Error 1"), Exception("Error 2")]
+ mock_excel_instance.parse.side_effect = [TypeError("Error 1"), TypeError("Error 2")]
mock_excel_file.return_value = mock_excel_instance
file_content = b"fake_excel_all_bad_sheets"
@@ -397,6 +398,12 @@ def test_extract_text_from_excel_all_sheets_fail(mock_excel_file):
assert mock_excel_instance.parse.call_count == 2
+@patch("pandas.ExcelFile", side_effect=RuntimeError("broken workbook"))
+def test_extract_text_from_excel_wraps_workbook_open_errors(mock_excel_file):
+ with pytest.raises(TextExtractionError, match="Failed to extract text from Excel file: broken workbook"):
+ _extract_text_from_excel(b"broken")
+
+
@patch("pandas.ExcelFile")
def test_extract_text_from_excel_numeric_type_column(mock_excel_file):
"""Test extracting text from Excel file with numeric column names."""
@@ -420,6 +427,103 @@ def test_extract_text_from_excel_numeric_type_column(mock_excel_file):
assert expected_manual == result
+@pytest.mark.parametrize(
+ ("extension", "mime_type"),
+ [
+ (".xlsx", "text/plain"),
+ (None, "application/vnd.ms-excel"),
+ ],
+)
+def test_extract_text_from_file_routes_excel_inputs(document_extractor_node, extension, mime_type):
+ file = Mock(spec=File)
+ file.extension = extension
+ file.mime_type = mime_type
+
+ with (
+ patch(
+ "graphon.nodes.document_extractor.node._download_file_content",
+ return_value=b"excel",
+ ),
+ patch(
+ "graphon.nodes.document_extractor.node._extract_text_from_excel",
+ return_value="excel text",
+ ) as mock_extract,
+ ):
+ result = _extract_text_from_file(
+ document_extractor_node.http_client,
+ file,
+ unstructured_api_config=document_extractor_node._unstructured_api_config,
+ )
+
+ assert result == "excel text"
+ mock_extract.assert_called_once_with(b"excel")
+
+
+def test_extract_text_from_file_rejects_missing_extension_and_mime_type(document_extractor_node):
+ file = Mock(spec=File)
+ file.extension = None
+ file.mime_type = None
+
+ with patch(
+ "graphon.nodes.document_extractor.node._download_file_content",
+ return_value=b"unknown",
+ ):
+ with pytest.raises(UnsupportedFileTypeError, match="Unable to determine file type"):
+ _extract_text_from_file(
+ document_extractor_node.http_client,
+ file,
+ unstructured_api_config=document_extractor_node._unstructured_api_config,
+ )
+
+
+def test_run_list_file_extraction_error_returns_failed(document_extractor_node, mock_graph_runtime_state):
+ document_extractor_node.graph_runtime_state = mock_graph_runtime_state
+ file_list = Mock(spec=ArrayFileSegment)
+ file_list.value = [Mock(spec=File)]
+ mock_graph_runtime_state.variable_pool.get.return_value = file_list
+
+ with patch(
+ "graphon.nodes.document_extractor.node._extract_text_from_file",
+ side_effect=TextExtractionError("bad file"),
+ ):
+ result = document_extractor_node._run()
+
+ assert result.status == WorkflowNodeExecutionStatus.FAILED
+ assert result.error == "bad file"
+
+
+def test_run_single_file_segment_extraction_error_returns_failed(document_extractor_node, mock_graph_runtime_state):
+ document_extractor_node.graph_runtime_state = mock_graph_runtime_state
+ file_segment = Mock(spec=FileSegment)
+ file_segment.value = Mock(spec=File)
+ mock_graph_runtime_state.variable_pool.get.return_value = file_segment
+
+ with patch(
+ "graphon.nodes.document_extractor.node._extract_text_from_file",
+ side_effect=TextExtractionError("single file failed"),
+ ):
+ result = document_extractor_node._run()
+
+ assert result.status == WorkflowNodeExecutionStatus.FAILED
+ assert result.error == "single file failed"
+
+
+def test_run_single_file_segment_returns_string_output(document_extractor_node, mock_graph_runtime_state):
+ document_extractor_node.graph_runtime_state = mock_graph_runtime_state
+ file_segment = Mock(spec=FileSegment)
+ file_segment.value = Mock(spec=File)
+ mock_graph_runtime_state.variable_pool.get.return_value = file_segment
+
+ with patch(
+ "graphon.nodes.document_extractor.node._extract_text_from_file",
+ return_value="single file text",
+ ):
+ result = document_extractor_node._run()
+
+ assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
+ assert result.outputs == {"text": "single file text"}
+
+
def _make_docx_zip(use_backslash: bool) -> bytes:
"""Helper to build a minimal in-memory DOCX zip.
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
index 1b14f0ab13..aa9a1360b0 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
@@ -3,6 +3,11 @@ import uuid
from unittest.mock import MagicMock, Mock
import pytest
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+from core.workflow.node_factory import DifyNodeFactory
+from core.workflow.system_variables import build_system_variables
+from extensions.ext_database import db
from graphon.enums import WorkflowNodeExecutionStatus
from graphon.file import File, FileTransferMethod, FileType
from graphon.graph import Graph
@@ -11,14 +16,23 @@ from graphon.nodes.if_else.if_else_node import IfElseNode
from graphon.runtime import GraphRuntimeState, VariablePool
from graphon.utils.condition.entities import Condition, SubCondition, SubVariableCondition
from graphon.variables import ArrayFileSegment
-
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.workflow.node_factory import DifyNodeFactory
-from core.workflow.system_variables import build_system_variables
-from extensions.ext_database import db
from tests.workflow_test_utils import build_test_graph_init_params
+def _build_if_else_node(
+ *,
+ node_data: IfElseNodeData | dict[str, object],
+ init_params,
+ graph_runtime_state,
+) -> IfElseNode:
+ return IfElseNode(
+ node_id=str(uuid.uuid4()),
+ graph_init_params=init_params,
+ graph_runtime_state=graph_runtime_state,
+ config=node_data if isinstance(node_data, IfElseNodeData) else IfElseNodeData.model_validate(node_data),
+ )
+
+
def test_execute_if_else_result_true():
graph_config = {"edges": [], "nodes": [{"data": {"type": "start", "title": "Start"}, "id": "start"}]}
@@ -61,9 +75,8 @@ def test_execute_if_else_result_true():
)
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
- node_config = {
- "id": "if-else",
- "data": {
+ node = _build_if_else_node(
+ node_data={
"title": "123",
"type": "if-else",
"logical_operator": "and",
@@ -104,13 +117,8 @@ def test_execute_if_else_result_true():
{"comparison_operator": "not null", "variable_selector": ["start", "not_null"]},
],
},
- }
-
- node = IfElseNode(
- id=str(uuid.uuid4()),
- graph_init_params=init_params,
+ init_params=init_params,
graph_runtime_state=graph_runtime_state,
- config=node_config,
)
# Mock db.session.close()
@@ -155,9 +163,8 @@ def test_execute_if_else_result_false():
)
graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
- node_config = {
- "id": "if-else",
- "data": {
+ node = _build_if_else_node(
+ node_data={
"title": "123",
"type": "if-else",
"logical_operator": "or",
@@ -174,13 +181,8 @@ def test_execute_if_else_result_false():
},
],
},
- }
-
- node = IfElseNode(
- id=str(uuid.uuid4()),
- graph_init_params=init_params,
+ init_params=init_params,
graph_runtime_state=graph_runtime_state,
- config=node_config,
)
# Mock db.session.close()
@@ -222,11 +224,6 @@ def test_array_file_contains_file_name():
],
)
- node_config = {
- "id": "if-else",
- "data": node_data.model_dump(),
- }
-
# Create properly configured mock for graph_init_params
graph_init_params = Mock()
graph_init_params.workflow_id = "test_workflow"
@@ -242,17 +239,12 @@ def test_array_file_contains_file_name():
}
}
- node = IfElseNode(
- id=str(uuid.uuid4()),
- graph_init_params=graph_init_params,
- graph_runtime_state=Mock(),
- config=node_config,
- )
+ node = _build_if_else_node(node_data=node_data, init_params=graph_init_params, graph_runtime_state=Mock())
node.graph_runtime_state.variable_pool.get.return_value = ArrayFileSegment(
value=[
File(
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="1",
filename="ab",
@@ -334,11 +326,10 @@ def test_execute_if_else_boolean_conditions(condition: Condition):
"logical_operator": "and",
"conditions": [condition.model_dump()],
}
- node = IfElseNode(
- id=str(uuid.uuid4()),
- graph_init_params=init_params,
+ node = _build_if_else_node(
+ node_data=node_data,
+ init_params=init_params,
graph_runtime_state=graph_runtime_state,
- config={"id": "if-else", "data": node_data},
)
# Mock db.session.close()
@@ -400,14 +391,10 @@ def test_execute_if_else_boolean_false_conditions():
],
}
- node = IfElseNode(
- id=str(uuid.uuid4()),
- graph_init_params=init_params,
+ node = _build_if_else_node(
+ node_data=node_data,
+ init_params=init_params,
graph_runtime_state=graph_runtime_state,
- config={
- "id": "if-else",
- "data": node_data,
- },
)
# Mock db.session.close()
@@ -472,11 +459,10 @@ def test_execute_if_else_boolean_cases_structure():
}
],
}
- node = IfElseNode(
- id=str(uuid.uuid4()),
- graph_init_params=init_params,
+ node = _build_if_else_node(
+ node_data=node_data,
+ init_params=init_params,
graph_runtime_state=graph_runtime_state,
- config={"id": "if-else", "data": node_data},
)
# Mock db.session.close()
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
index d28c3e01e5..465a4c0ff4 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
@@ -1,6 +1,8 @@
from unittest.mock import MagicMock
import pytest
+
+from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
from graphon.enums import WorkflowNodeExecutionStatus
from graphon.file import File, FileTransferMethod, FileType
from graphon.nodes.list_operator.entities import (
@@ -16,7 +18,14 @@ from graphon.nodes.list_operator.exc import InvalidKeyError
from graphon.nodes.list_operator.node import ListOperatorNode, _get_file_extract_string_func
from graphon.variables import ArrayFileSegment
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
+
+def _build_list_operator_node(node_data: ListOperatorNodeData, graph_init_params) -> ListOperatorNode:
+ return ListOperatorNode(
+ node_id="test_node_id",
+ config=node_data,
+ graph_init_params=graph_init_params,
+ graph_runtime_state=MagicMock(),
+ )
@pytest.fixture
@@ -35,10 +44,6 @@ def list_operator_node():
"title": "Test Title",
}
node_data = ListOperatorNodeData.model_validate(config)
- node_config = {
- "id": "test_node_id",
- "data": node_data.model_dump(),
- }
# Create properly configured mock for graph_init_params
graph_init_params = MagicMock()
graph_init_params.workflow_id = "test_workflow"
@@ -54,12 +59,7 @@ def list_operator_node():
}
}
- node = ListOperatorNode(
- id="test_node_id",
- config=node_config,
- graph_init_params=graph_init_params,
- graph_runtime_state=MagicMock(),
- )
+ node = _build_list_operator_node(node_data, graph_init_params)
node.graph_runtime_state = MagicMock()
node.graph_runtime_state.variable_pool = MagicMock()
return node
@@ -70,28 +70,28 @@ def test_filter_files_by_type(list_operator_node):
files = [
File(
filename="image1.jpg",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="related1",
storage_key="",
),
File(
filename="document1.pdf",
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="related2",
storage_key="",
),
File(
filename="image2.png",
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="related3",
storage_key="",
),
File(
filename="audio1.mp3",
- type=FileType.AUDIO,
+ file_type=FileType.AUDIO,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="related4",
storage_key="",
@@ -136,7 +136,7 @@ def test_filter_files_by_type(list_operator_node):
def test_get_file_extract_string_func():
# Create a File object
file = File(
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.LOCAL_FILE,
filename="test_file.txt",
extension=".txt",
@@ -156,7 +156,7 @@ def test_get_file_extract_string_func():
# Test with empty values
empty_file = File(
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.LOCAL_FILE,
filename=None,
extension=None,
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py b/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
index 833c303052..5655f80737 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
@@ -2,16 +2,16 @@ import json
import time
import pytest
+from pydantic import ValidationError as PydanticValidationError
+
+from core.workflow.system_variables import build_system_variables
+from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
from graphon.nodes.start.entities import StartNodeData
from graphon.nodes.start.start_node import StartNode
from graphon.runtime import GraphRuntimeState
from graphon.variables import build_segment, segment_to_variable
from graphon.variables.input_entities import VariableEntity, VariableEntityType
from graphon.variables.variables import Variable
-from pydantic import ValidationError as PydanticValidationError
-
-from core.workflow.system_variables import build_system_variables
-from core.workflow.variable_prefixes import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID
from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
@@ -22,10 +22,7 @@ def make_start_node(user_inputs, variables):
inputs=user_inputs,
)
- config = {
- "id": "start",
- "data": StartNodeData(title="Start", variables=variables).model_dump(),
- }
+ node_data = StartNodeData(title="Start", variables=variables)
graph_runtime_state = GraphRuntimeState(
variable_pool=variable_pool,
@@ -33,8 +30,8 @@ def make_start_node(user_inputs, variables):
)
return StartNode(
- id="start",
- config=config,
+ node_id="start",
+ config=node_data,
graph_init_params=build_test_graph_init_params(
workflow_id="wf",
graph_config={},
@@ -109,7 +106,7 @@ def test_json_object_invalid_json_string():
node = make_start_node(user_inputs, variables)
- with pytest.raises(ValueError, match="JSON object for 'profile' must be an object"):
+ with pytest.raises(TypeError, match="JSON object for 'profile' must be an object"):
node._run()
@@ -248,25 +245,22 @@ def test_start_node_outputs_full_variable_pool_snapshot():
inputs={"profile": {"age": 20, "name": "Tom"}},
)
- config = {
- "id": "start",
- "data": StartNodeData(
- title="Start",
- variables=[
- VariableEntity(
- variable="profile",
- label="profile",
- type=VariableEntityType.JSON_OBJECT,
- required=True,
- )
- ],
- ).model_dump(),
- }
+ node_data = StartNodeData(
+ title="Start",
+ variables=[
+ VariableEntity(
+ variable="profile",
+ label="profile",
+ type=VariableEntityType.JSON_OBJECT,
+ required=True,
+ )
+ ],
+ )
graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
node = StartNode(
- id="start",
- config=config,
+ node_id="start",
+ config=node_data,
graph_init_params=build_test_graph_init_params(
workflow_id="wf",
graph_config={},
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
index 1587014802..284af68319 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
@@ -8,14 +8,15 @@ from typing import TYPE_CHECKING, Any
from unittest.mock import MagicMock
import pytest
+
+from core.workflow.system_variables import build_system_variables
from graphon.file import File, FileTransferMethod, FileType
from graphon.model_runtime.entities.llm_entities import LLMUsage
from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
+from graphon.nodes.tool.entities import ToolNodeData
from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
from graphon.runtime import GraphRuntimeState, VariablePool
from graphon.variables.segments import ArrayFileSegment
-
-from core.workflow.system_variables import build_system_variables
from tests.workflow_test_utils import build_test_graph_init_params
if TYPE_CHECKING: # pragma: no cover - imported for type checking only
@@ -108,8 +109,8 @@ def tool_node(monkeypatch) -> ToolNode:
runtime = _StubToolRuntime()
node = ToolNode(
- id="node-instance",
- config=config,
+ node_id="node-instance",
+ config=ToolNodeData.model_validate(config["data"]),
graph_init_params=init_params,
graph_runtime_state=graph_runtime_state,
tool_file_manager_factory=tool_file_manager_factory,
@@ -118,13 +119,13 @@ def tool_node(monkeypatch) -> ToolNode:
return node
-def _collect_events(generator: Generator) -> tuple[list[Any], LLMUsage]:
+def _collect_events(generator: Generator) -> list[Any]:
events: list[Any] = []
try:
while True:
events.append(next(generator))
- except StopIteration as stop:
- return events, stop.value
+ except StopIteration:
+ return events
def _run_transform(tool_node: ToolNode, message: ToolRuntimeMessage) -> tuple[list[Any], LLMUsage]:
@@ -135,12 +136,15 @@ def _run_transform(tool_node: ToolNode, message: ToolRuntimeMessage) -> tuple[li
node_id=tool_node._node_id,
tool_runtime=ToolRuntimeHandle(raw=object()),
)
- return _collect_events(generator)
+ events = _collect_events(generator)
+ completed_events = [event for event in events if isinstance(event, StreamCompletedEvent)]
+ assert completed_events
+ return events, completed_events[-1].node_run_result.llm_usage
def test_link_messages_with_file_populate_files_output(tool_node: ToolNode):
file_obj = File(
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id="file-id",
filename="demo.pdf",
@@ -195,7 +199,7 @@ def test_plain_link_messages_remain_links(tool_node: ToolNode):
def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode):
file_obj = File(
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.TOOL_FILE,
related_id="file-id",
filename="demo.pdf",
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
index c4dfc5a179..438af211f3 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
@@ -6,11 +6,6 @@ from types import SimpleNamespace
from unittest.mock import MagicMock, patch
import pytest
-from graphon.model_runtime.entities.llm_entities import LLMUsage
-from graphon.nodes.tool.entities import ToolNodeData, ToolProviderType
-from graphon.nodes.tool.exc import ToolRuntimeInvocationError
-from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
-from graphon.runtime import VariablePool
from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
from core.plugin.impl.exc import PluginDaemonClientSideError, PluginInvokeError
@@ -22,6 +17,11 @@ from core.tools.tool_manager import ToolManager
from core.tools.utils.message_transformer import ToolFileMessageTransformer
from core.workflow.node_runtime import DifyToolNodeRuntime
from core.workflow.system_variables import build_system_variables
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.nodes.tool.entities import ToolNodeData, ToolProviderType
+from graphon.nodes.tool.exc import ToolRuntimeInvocationError
+from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
+from graphon.runtime import VariablePool
from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
diff --git a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
index 952e798430..e3b5e3b591 100644
--- a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
@@ -1,13 +1,12 @@
from collections.abc import Mapping
-from graphon.entities import GraphInitParams
-from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
-from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState
-
from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE
+from core.workflow.nodes.trigger_plugin.entities import TriggerEventNodeData
from core.workflow.nodes.trigger_plugin.trigger_event_node import TriggerEventNode
from core.workflow.system_variables import build_system_variables
+from graphon.entities import GraphInitParams
+from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState
from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
@@ -28,29 +27,24 @@ def _build_context(graph_config: Mapping[str, object]) -> tuple[GraphInitParams,
return init_params, runtime_state
-def _build_node_config() -> NodeConfigDict:
- return NodeConfigDictAdapter.validate_python(
- {
- "id": "node-1",
- "data": {
- "type": TRIGGER_PLUGIN_NODE_TYPE,
- "title": "Trigger Event",
- "plugin_id": "plugin-id",
- "provider_id": "provider-id",
- "event_name": "event-name",
- "subscription_id": "subscription-id",
- "plugin_unique_identifier": "plugin-unique-identifier",
- "event_parameters": {},
- },
- }
+def _build_node_data() -> TriggerEventNodeData:
+ return TriggerEventNodeData(
+ type=TRIGGER_PLUGIN_NODE_TYPE,
+ title="Trigger Event",
+ plugin_id="plugin-id",
+ provider_id="provider-id",
+ event_name="event-name",
+ subscription_id="subscription-id",
+ plugin_unique_identifier="plugin-unique-identifier",
+ event_parameters={},
)
def test_trigger_event_node_run_populates_trigger_info_metadata() -> None:
init_params, runtime_state = _build_context(graph_config={})
node = TriggerEventNode(
- id="node-1",
- config=_build_node_config(),
+ node_id="node-1",
+ config=_build_node_data(),
graph_init_params=init_params,
graph_runtime_state=runtime_state,
)
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py
index f1132af02b..617554ee17 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_exceptions.py
@@ -1,5 +1,4 @@
import pytest
-from graphon.entities.exc import BaseNodeError
from core.workflow.nodes.trigger_webhook.exc import (
WebhookConfigError,
@@ -7,6 +6,7 @@ from core.workflow.nodes.trigger_webhook.exc import (
WebhookNotFoundError,
WebhookTimeoutError,
)
+from graphon.entities.exc import BaseNodeError
def test_webhook_node_error_inheritance():
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
index 8056217479..07d03bec05 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
@@ -9,10 +9,6 @@ when passing files to downstream LLM nodes.
from typing import Any
from unittest.mock import Mock, patch
-from graphon.entities import GraphInitParams
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.runtime import GraphRuntimeState, VariablePool
-
from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
from core.workflow.nodes.trigger_webhook.entities import (
ContentType,
@@ -22,6 +18,9 @@ from core.workflow.nodes.trigger_webhook.entities import (
)
from core.workflow.nodes.trigger_webhook.node import TriggerWebhookNode
from core.workflow.system_variables import default_system_variables
+from graphon.entities import GraphInitParams
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.runtime import GraphRuntimeState, VariablePool
from tests.workflow_test_utils import build_test_variable_pool
@@ -31,11 +30,6 @@ def create_webhook_node(
tenant_id: str = "test-tenant",
) -> TriggerWebhookNode:
"""Helper function to create a webhook node with proper initialization."""
- node_config = {
- "id": "webhook-node-1",
- "data": webhook_data.model_dump(),
- }
-
graph_init_params = GraphInitParams(
workflow_id="test-workflow",
graph_config={},
@@ -57,8 +51,8 @@ def create_webhook_node(
)
node = TriggerWebhookNode(
- id="webhook-node-1",
- config=node_config,
+ node_id="webhook-node-1",
+ config=webhook_data,
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
)
@@ -67,10 +61,6 @@ def create_webhook_node(
runtime_state.app_config = Mock()
runtime_state.app_config.tenant_id = tenant_id
- # Provide compatibility alias expected by node implementation
- # Some nodes reference `self.node_id`; expose it as an alias to `self.id` for tests
- node.node_id = node.id
-
return node
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
index c19e28bbd5..b839490d3c 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
@@ -2,11 +2,6 @@ from typing import Any
from unittest.mock import patch
import pytest
-from graphon.entities import GraphInitParams
-from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.file import File, FileTransferMethod, FileType
-from graphon.runtime import GraphRuntimeState, VariablePool
-from graphon.variables import FileVariable, StringVariable
from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
from core.trigger.constants import TRIGGER_WEBHOOK_NODE_TYPE
@@ -19,16 +14,16 @@ from core.workflow.nodes.trigger_webhook.entities import (
)
from core.workflow.nodes.trigger_webhook.node import TriggerWebhookNode
from core.workflow.system_variables import default_system_variables
+from graphon.entities import GraphInitParams
+from graphon.enums import WorkflowNodeExecutionStatus
+from graphon.file import File, FileTransferMethod, FileType
+from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.variables import FileVariable, StringVariable
from tests.workflow_test_utils import build_test_variable_pool
def create_webhook_node(webhook_data: WebhookData, variable_pool: VariablePool) -> TriggerWebhookNode:
"""Helper function to create a webhook node with proper initialization."""
- node_config = {
- "id": "1",
- "data": webhook_data.model_dump(),
- }
-
graph_init_params = GraphInitParams(
workflow_id="1",
graph_config={},
@@ -48,8 +43,8 @@ def create_webhook_node(webhook_data: WebhookData, variable_pool: VariablePool)
start_at=0,
)
node = TriggerWebhookNode(
- id="1",
- config=node_config,
+ node_id="1",
+ config=webhook_data,
graph_init_params=graph_init_params,
graph_runtime_state=runtime_state,
)
@@ -57,9 +52,6 @@ def create_webhook_node(webhook_data: WebhookData, variable_pool: VariablePool)
# Provide tenant_id for conversion path
runtime_state.app_config = type("_AppCfg", (), {"tenant_id": "1"})()
- # Compatibility alias for some nodes referencing `self.node_id`
- node.node_id = node.id
-
return node
@@ -225,7 +217,7 @@ def test_webhook_node_run_with_file_params():
"""Test webhook node execution with file parameter extraction."""
# Create mock file objects
file1 = File(
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="file1",
filename="image.jpg",
@@ -234,7 +226,7 @@ def test_webhook_node_run_with_file_params():
)
file2 = File(
- type=FileType.DOCUMENT,
+ file_type=FileType.DOCUMENT,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="file2",
filename="document.pdf",
@@ -269,8 +261,19 @@ def test_webhook_node_run_with_file_params():
# Mock the node's file reference boundary to avoid DB-dependent validation on upload_file_id
with patch.object(node._file_reference_factory, "build_from_mapping") as mock_file_factory:
- def _to_file(*, mapping):
- return File.model_validate(mapping)
+ def _to_file(*, mapping: dict[str, Any]) -> File:
+ return File(
+ file_id=mapping.get("id"),
+ file_type=FileType(mapping["type"]),
+ transfer_method=FileTransferMethod(mapping["transfer_method"]),
+ related_id=mapping.get("related_id"),
+ filename=mapping.get("filename"),
+ extension=mapping.get("extension"),
+ mime_type=mapping.get("mime_type"),
+ size=mapping.get("size", -1),
+ storage_key=mapping.get("storage_key", ""),
+ remote_url=mapping.get("url"),
+ )
mock_file_factory.side_effect = _to_file
result = node._run()
@@ -284,7 +287,7 @@ def test_webhook_node_run_with_file_params():
def test_webhook_node_run_mixed_parameters():
"""Test webhook node execution with mixed parameter types."""
file_obj = File(
- type=FileType.IMAGE,
+ file_type=FileType.IMAGE,
transfer_method=FileTransferMethod.LOCAL_FILE,
related_id="file1",
filename="test.jpg",
@@ -317,8 +320,19 @@ def test_webhook_node_run_mixed_parameters():
# Mock the node's file reference boundary to avoid DB-dependent validation on upload_file_id
with patch.object(node._file_reference_factory, "build_from_mapping") as mock_file_factory:
- def _to_file(*, mapping):
- return File.model_validate(mapping)
+ def _to_file(*, mapping: dict[str, Any]) -> File:
+ return File(
+ file_id=mapping.get("id"),
+ file_type=FileType(mapping["type"]),
+ transfer_method=FileTransferMethod(mapping["transfer_method"]),
+ related_id=mapping.get("related_id"),
+ filename=mapping.get("filename"),
+ extension=mapping.get("extension"),
+ mime_type=mapping.get("mime_type"),
+ size=mapping.get("size", -1),
+ storage_key=mapping.get("storage_key", ""),
+ remote_url=mapping.get("url"),
+ )
mock_file_factory.side_effect = _to_file
result = node._run()
diff --git a/api/tests/unit_tests/core/workflow/test_human_input_adapter.py b/api/tests/unit_tests/core/workflow/test_human_input_adapter.py
new file mode 100644
index 0000000000..8b5fceeb37
--- /dev/null
+++ b/api/tests/unit_tests/core/workflow/test_human_input_adapter.py
@@ -0,0 +1,350 @@
+from types import SimpleNamespace
+
+import pytest
+from pydantic import BaseModel
+
+from core.workflow.human_input_adapter import (
+ DeliveryMethodType,
+ EmailDeliveryConfig,
+ EmailDeliveryMethod,
+ EmailRecipients,
+ WebAppDeliveryMethod,
+ _WebAppDeliveryConfig,
+ adapt_human_input_node_data_for_graph,
+ adapt_node_config_for_graph,
+ adapt_node_data_for_graph,
+ is_human_input_webapp_enabled,
+ parse_human_input_delivery_methods,
+)
+from graphon.enums import BuiltinNodeTypes
+from graphon.nodes.base.variable_template_parser import VariableTemplateParser
+
+
+def test_email_delivery_config_helpers_render_and_sanitize_text() -> None:
+ variable_pool = SimpleNamespace(
+ convert_template=lambda body: SimpleNamespace(text=body.replace("{{#node.value#}}", "42"))
+ )
+
+ rendered = EmailDeliveryConfig.render_body_template(
+ body="Open {{#url#}} and use {{#node.value#}}",
+ url="https://example.com",
+ variable_pool=variable_pool,
+ )
+ sanitized = EmailDeliveryConfig.sanitize_subject("Hello\r\n Team")
+ html = EmailDeliveryConfig.render_markdown_body(
+ "**Hello** [mail](mailto:test@example.com)"
+ )
+
+ assert rendered == "Open https://example.com and use 42"
+ assert sanitized == "Hello alert(1) Team"
+ assert "Hello" in html
+ assert " Team")
- html = EmailDeliveryConfig.render_markdown_body(
- "**Hello** [mail](mailto:test@example.com)"
- )
-
- assert rendered == "Open https://example.com and use 42"
- assert sanitized == "Hello alert(1) Team"
- assert "Hello" in html
- assert ".txt' })
render(
+
+
+
+ 你在工作流评论中被提及
+
+
+ 你好，{{ mentioned_name }}：
+{{ commenter_name }} 在 {{ app_name }} 中提及了你。
+
+
+ {{ comment_content }}
+请在 {{ application_title }} 中查看并回复此评论。
+
-
-
+
+
|
e.stopPropagation()}>
diff --git a/web/app/components/datasets/documents/components/operations.tsx b/web/app/components/datasets/documents/components/operations.tsx
index e2bd6f7c92..8692da927d 100644
--- a/web/app/components/datasets/documents/components/operations.tsx
+++ b/web/app/components/datasets/documents/components/operations.tsx
@@ -1,18 +1,6 @@
import type { OperationName } from '../types'
import type { CommonResponse } from '@/models/common'
import type { DocumentDownloadResponse } from '@/service/datasets'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiArchive2Line, RiDeleteBinLine, RiDownload2Line, RiEditLine, RiEqualizer2Line, RiLoopLeftLine, RiMoreFill, RiPauseCircleLine, RiPlayCircleLine } from '@remixicon/react'
-import { useBoolean, useDebounceFn } from 'ahooks'
-import { noop } from 'es-toolkit/function'
-import * as React from 'react'
-import { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import Divider from '@/app/components/base/divider'
-import { SearchLinesSparkle } from '@/app/components/base/icons/src/vender/knowledge'
-import CustomPopover from '@/app/components/base/popover'
-import Switch from '@/app/components/base/switch'
-import Tooltip from '@/app/components/base/tooltip'
import {
AlertDialog,
AlertDialogActions,
@@ -21,8 +9,22 @@ import {
AlertDialogContent,
AlertDialogDescription,
AlertDialogTitle,
-} from '@/app/components/base/ui/alert-dialog'
-import { toast } from '@/app/components/base/ui/toast'
+} from '@langgenius/dify-ui/alert-dialog'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
+import { Switch } from '@langgenius/dify-ui/switch'
+import { toast } from '@langgenius/dify-ui/toast'
+import { useBoolean, useDebounceFn } from 'ahooks'
+import { noop } from 'es-toolkit/function'
+import * as React from 'react'
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Divider from '@/app/components/base/divider'
+import Tooltip from '@/app/components/base/tooltip'
import { IS_CE_EDITION } from '@/config'
import { DataSourceType, DocumentActionType } from '@/models/datasets'
import { useRouter } from '@/next/navigation'
@@ -53,6 +55,7 @@ type OperationsProps = {
const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSelectedIdChange, onUpdate, scene = 'list', className = '' }: OperationsProps) => {
const { id, name, enabled = false, archived = false, data_source_type, display_status } = detail || {}
const [showModal, setShowModal] = useState(false)
+ const [isOperationsMenuOpen, setIsOperationsMenuOpen] = useState(false)
const [deleting, setDeleting] = useState(false)
const { t } = useTranslation()
const router = useRouter()
@@ -68,7 +71,7 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
const { mutateAsync: pauseDocument } = useDocumentPause()
const { mutateAsync: resumeDocument } = useDocumentResume()
const isListScene = scene === 'list'
- const onOperate = async (operationName: OperationName) => {
+ const onOperate = useCallback(async (operationName: OperationName) => {
let opApi
switch (operationName) {
case 'archive':
@@ -116,7 +119,25 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
}
if (operationName === DocumentActionType.delete)
setDeleting(false)
- }
+ }, [
+ archiveDocument,
+ data_source_type,
+ datasetId,
+ deleteDocument,
+ disableDocument,
+ enableDocument,
+ generateSummary,
+ id,
+ onSelectedIdChange,
+ onUpdate,
+ pauseDocument,
+ resumeDocument,
+ selectedIds,
+ syncDocument,
+ syncWebsite,
+ t,
+ unArchiveDocument,
+ ])
const { run: handleSwitch } = useDebounceFn((operationName: OperationName) => {
if (operationName === DocumentActionType.enable && enabled)
return
@@ -139,6 +160,9 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
const handleRenamed = useCallback(() => {
onUpdate()
}, [onUpdate])
+ const closeOperationsMenu = useCallback(() => {
+ setIsOperationsMenuOpen(false)
+ }, [])
const handleDownload = useCallback(async () => {
// Avoid repeated clicks while the signed URL request is in-flight.
if (isDownloading)
@@ -152,6 +176,28 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
// Trigger download without navigating away (helps avoid duplicate downloads in some browsers).
downloadUrl({ url: res.url, fileName: name })
}, [datasetId, downloadDocument, id, isDownloading, name, t])
+ const handleShowRename = useCallback(() => {
+ closeOperationsMenu()
+ handleShowRenameModal({
+ id: detail.id,
+ name: detail.name,
+ })
+ }, [closeOperationsMenu, detail.id, detail.name, handleShowRenameModal])
+ const handleMenuOperation = useCallback((operationName: OperationName) => {
+ closeOperationsMenu()
+ void onOperate(operationName)
+ }, [closeOperationsMenu, onOperate])
+ const handleDeleteClick = useCallback(() => {
+ closeOperationsMenu()
+ setShowModal(true)
+ }, [closeOperationsMenu])
+ const handleDownloadClick = useCallback((evt: React.MouseEvent e.stopPropagation()}>
{isListScene && !embeddingAvailable && (
+
+
+
{!archived && (
<>
- {
- handleShowRenameModal({
- id: detail.id,
- name: detail.name,
- })
- }}
- >
-
+
{t('list.table.rename', { ns: 'datasetDocuments' })}
{data_source_type === DataSourceType.FILE && (
- {
- evt.preventDefault()
- evt.stopPropagation()
- evt.nativeEvent.stopImmediatePropagation?.()
- handleDownload()
- }}
- >
-
+
{t('list.action.download', { ns: 'datasetDocuments' })}
)}
{['notion_import', DataSourceType.WEB].includes(data_source_type) && (
- onOperate('sync')}>
- handleMenuOperation('sync')}>
+
{t('list.action.sync', { ns: 'datasetDocuments' })}
)}
{IS_CE_EDITION && (
- onOperate('summary')}>
- handleMenuOperation('summary')}>
+
{t('list.action.summary', { ns: 'datasetDocuments' })}
)}
@@ -230,62 +283,44 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
)}
{archived && data_source_type === DataSourceType.FILE && (
<>
- {
- evt.preventDefault()
- evt.stopPropagation()
- evt.nativeEvent.stopImmediatePropagation?.()
- handleDownload()
- }}
- >
-
+
{t('list.action.download', { ns: 'datasetDocuments' })}
onOperate('pause')}>
- handleMenuOperation('pause')}>
+
{t('list.action.pause', { ns: 'datasetDocuments' })}
)}
{!archived && display_status?.toLowerCase() === 'paused' && (
- onOperate('resume')}>
- handleMenuOperation('resume')}>
+
{t('list.action.resume', { ns: 'datasetDocuments' })}
)}
{!archived && (
- onOperate('archive')}>
- handleMenuOperation('archive')}>
+
{t('list.action.archive', { ns: 'datasetDocuments' })}
)}
{archived && (
- onOperate('un_archive')}>
- handleMenuOperation('un_archive')}>
+
{t('list.action.unarchive', { ns: 'datasetDocuments' })}
)}
- setShowModal(true)}>
-
- )}
- trigger="click"
- position="br"
- btnElement={(
-
+
{t('list.action.delete', { ns: 'datasetDocuments' })}
-
- )}
- btnClassName={open => cn(isListScene ? s.actionIconWrapperList : s.actionIconWrapperDetail, open ? '!hover:bg-state-base-hover !shadow-none' : '!bg-transparent')}
- popupClassName="!w-full"
- className={`!z-20 flex h-fit !w-[200px] justify-end ${className}`}
- />
+
+
)}
+
{t('onlineDocument.pageSelectorTitle', { ns: 'datasetPipeline', name })}
)
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx
index 7c1941afd9..c8fdf49fd1 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/__tests__/index.spec.tsx
@@ -49,8 +49,8 @@ const { mockToastError } = vi.hoisted(() => ({
mockToastError: vi.fn(),
}))
-vi.mock('@/app/components/base/ui/toast', async (importOriginal) => {
- const actual = await importOriginal
{name}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
index 714b393d03..1dfa0443d0 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/breadcrumbs/index.tsx
@@ -83,7 +83,7 @@ const Breadcrumbs = ({
return (
{showSearchResult && (
-
+
{t('onlineDrive.breadcrumbs.searchResult', {
ns: 'datasetPipeline',
searchResultsLength,
@@ -92,7 +92,7 @@ const Breadcrumbs = ({
)}
{!showSearchResult && showBucketListTitle && (
-
+
{t('onlineDrive.breadcrumbs.allBuckets', { ns: 'datasetPipeline' })}
)}
@@ -152,7 +152,7 @@ const Breadcrumbs = ({
+
+ {t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}
- {`${fileName}.${file.extension || ''}`}
-
+ {`${fileName}.${file.extension || ''}`}
+
+
{fileData.content}
)}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx b/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx
index ff2f9f46a4..793ba1f22b 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/preview/online-document-preview.tsx
@@ -1,12 +1,12 @@
'use client'
import type { NotionPage } from '@/models/common'
+import { toast } from '@langgenius/dify-ui/toast'
import { RiCloseLine } from '@remixicon/react'
import * as React from 'react'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Notion } from '@/app/components/base/icons/src/public/common'
import { Markdown } from '@/app/components/base/markdown'
-import { toast } from '@/app/components/base/ui/toast'
import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
import { usePreviewOnlineDocument } from '@/service/use-pipeline'
import { formatNumberAbbreviated } from '@/utils/format'
@@ -50,12 +50,12 @@ const OnlineDocumentPreview = ({
}, [currentPage.page_id])
return (
-
-
+
+ {t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}
- {currentPage?.page_name}
-
+ {currentPage?.page_name}
+
+
-
+
+ {t('addDocuments.stepOne.preview', { ns: 'datasetPipeline' })}
- {currentWebsite.title}
-
+ {currentWebsite.title}
+
+
diff --git a/web/app/components/datasets/documents/create-from-pipeline/process-documents/__tests__/components.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/process-documents/__tests__/components.spec.tsx
index ff5f8afa66..16b6ef1373 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/process-documents/__tests__/components.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/process-documents/__tests__/components.spec.tsx
@@ -11,8 +11,8 @@ const { mockToastError } = vi.hoisted(() => ({
mockToastError: vi.fn(),
}))
-vi.mock('@/app/components/base/ui/toast', async (importOriginal) => {
- const actual = await importOriginal
{currentWebsite.markdown}
|
{{ comment_content }}
+