chore: reorg imports (#35308)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

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]:

api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py

@@ -1,8 +1,7 @@
-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 graphon.enums import WorkflowNodeExecutionStatus
+from graphon.node_events import NodeRunResult, StreamCompletedEvent
 
 
 class _Seg:

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]:

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

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

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
 
 

api/tests/integration_tests/workflow/nodes/test_code.py

@@ -2,17 +2,17 @@ import time
 import uuid
 
 import pytest
+
+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.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 tests.workflow_test_utils import build_test_graph_init_params
 
 pytest_plugins = ("tests.integration_tests.workflow.nodes.__mock.code_executor",)

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
+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",)
@@ -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=[]),

api/tests/integration_tests/workflow/nodes/test_llm.py

@@ -4,6 +4,11 @@ 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.file_saver import LLMFileSaver
@@ -12,12 +17,6 @@ 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"""

api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py

@@ -3,17 +3,16 @@ 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.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
 

api/tests/integration_tests/workflow/nodes/test_template_transform.py

@@ -1,15 +1,14 @@
 import time
 import uuid
 
+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.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 tests.workflow_test_utils import build_test_graph_init_params
 
 

api/tests/integration_tests/workflow/nodes/test_tool.py

@@ -2,18 +2,17 @@ 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.tool_node import ToolNode
+from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params