refactor(workflow-file): move core.file to core.workflow.file (#32252)

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

api/tests/conftest.py

@@ -0,0 +1,8 @@
+import pytest
+
+from core.app.workflow.file_runtime import bind_dify_workflow_file_runtime
+
+
+@pytest.fixture(autouse=True)
+def _bind_workflow_file_runtime() -> None:
+    bind_dify_workflow_file_runtime()

api/tests/integration_tests/factories/test_storage_key_loader.py

@@ -6,7 +6,7 @@ from uuid import uuid4
 import pytest
 from sqlalchemy.orm import Session
 
-from core.file import File, FileTransferMethod, FileType
+from core.workflow.file import File, FileTransferMethod, FileType
 from extensions.ext_database import db
 from factories.file_factory import StorageKeyLoader
 from models import ToolFile, UploadFile

api/tests/test_containers_integration_tests/factories/test_storage_key_loader.py

@@ -6,7 +6,7 @@ from uuid import uuid4
 import pytest
 from sqlalchemy.orm import Session
 
-from core.file import File, FileTransferMethod, FileType
+from core.workflow.file import File, FileTransferMethod, FileType
 from extensions.ext_database import db
 from factories.file_factory import StorageKeyLoader
 from models import ToolFile, UploadFile

api/tests/test_containers_integration_tests/services/test_agent_service.py

@@ -841,7 +841,7 @@ class TestAgentService:
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         conversation, message = self._create_test_conversation_and_message(db_session_with_containers, app, account)
 
-        from core.file import FileTransferMethod, FileType
+        from core.workflow.file import FileTransferMethod, FileType
         from extensions.ext_database import db
         from models.enums import CreatorUserRole
 

api/tests/unit_tests/controllers/console/app/workflow_draft_variables_test.py

@@ -310,8 +310,8 @@ def test_workflow_node_variables_fields():
 
 def test_workflow_file_variable_with_signed_url():
     """Test that File type variables include signed URLs in API responses."""
-    from core.file.enums import FileTransferMethod, FileType
-    from core.file.models import File
+    from core.workflow.file.enums import FileTransferMethod, FileType
+    from core.workflow.file.models import File
 
     # Create a File object with LOCAL_FILE transfer method (which generates signed URLs)
     test_file = File(
@@ -368,8 +368,8 @@ def test_workflow_file_variable_with_signed_url():
 
 def test_workflow_file_variable_remote_url():
     """Test that File type variables with REMOTE_URL transfer method return the remote URL."""
-    from core.file.enums import FileTransferMethod, FileType
-    from core.file.models import File
+    from core.workflow.file.enums import FileTransferMethod, FileType
+    from core.workflow.file.models import File
 
     # Create a File object with REMOTE_URL transfer method
     test_file = File(

api/tests/unit_tests/controllers/console/datasets/test_datasets_document_download.py

@@ -49,8 +49,8 @@ def datasets_document_module(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(wraps, "account_initialization_required", _noop)
 
     # Bypass billing-related decorators used by other endpoints in this module.
-    monkeypatch.setattr(wraps, "cloud_edition_billing_resource_check", lambda *_args, **_kwargs: (lambda f: f))
-    monkeypatch.setattr(wraps, "cloud_edition_billing_rate_limit_check", lambda *_args, **_kwargs: (lambda f: f))
+    monkeypatch.setattr(wraps, "cloud_edition_billing_resource_check", lambda *_args, **_kwargs: lambda f: f)
+    monkeypatch.setattr(wraps, "cloud_edition_billing_rate_limit_check", lambda *_args, **_kwargs: lambda f: f)
 
     # Avoid Flask-RESTX route registration side effects during import.
     def _noop_route(*_args, **_kwargs):  # type: ignore[override]

api/tests/unit_tests/core/app/app_config/features/file_upload/test_manager.py

@@ -1,6 +1,6 @@
 from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
-from core.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
 from core.model_runtime.entities.message_entities import ImagePromptMessageContent
+from core.workflow.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
 
 
 def test_convert_with_vision():

api/tests/unit_tests/core/app/apps/chat/test_base_app_runner_multimodal.py

@@ -9,8 +9,8 @@ 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 core.file.enums import FileTransferMethod, FileType
 from core.model_runtime.entities.message_entities import ImagePromptMessageContent
+from core.workflow.file.enums import FileTransferMethod, FileType
 from models.enums import CreatorUserRole
 
 

api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter.py

@@ -1,8 +1,8 @@
 from collections.abc import Mapping, Sequence
 
 from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
-from core.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
 from core.variables.segments import ArrayFileSegment, FileSegment
+from core.workflow.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
 
 
 class TestWorkflowResponseConverterFetchFilesFromVariableValue:

api/tests/unit_tests/core/file/test_models.py

@@ -1,4 +1,4 @@
-from core.file import File, FileTransferMethod, FileType
+from core.workflow.file import File, FileTransferMethod, FileType
 
 
 def test_file():

api/tests/unit_tests/core/prompt/test_advanced_prompt_transform.py

@@ -4,7 +4,6 @@ import pytest
 
 from configs import dify_config
 from core.app.app_config.entities import ModelConfigEntity
-from core.file import File, FileTransferMethod, FileType
 from core.memory.token_buffer_memory import TokenBufferMemory
 from core.model_runtime.entities.message_entities import (
     AssistantPromptMessage,
@@ -15,6 +14,7 @@ from core.model_runtime.entities.message_entities import (
 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 core.workflow.file import File, FileTransferMethod, FileType
 from models.model import Conversation
 
 
@@ -142,7 +142,7 @@ def test__get_chat_model_prompt_messages_with_files_no_memory(get_chat_model_arg
 
     prompt_transform = AdvancedPromptTransform()
     prompt_transform._calculate_rest_token = MagicMock(return_value=2000)
-    with patch("core.file.file_manager.to_prompt_message_content") as mock_get_encoded_string:
+    with patch("core.workflow.file.file_manager.to_prompt_message_content") as mock_get_encoded_string:
         mock_get_encoded_string.return_value = ImagePromptMessageContent(
             url=str(files[0].remote_url), format="jpg", mime_type="image/jpg"
         )

api/tests/unit_tests/core/test_file.py

@@ -1,6 +1,6 @@
 import json
 
-from core.file import File, FileTransferMethod, FileType, FileUploadConfig
+from core.workflow.file import File, FileTransferMethod, FileType, FileUploadConfig
 from models.workflow import Workflow
 
 

api/tests/unit_tests/core/variables/test_segment.py

@@ -2,7 +2,6 @@ import dataclasses
 
 from pydantic import BaseModel
 
-from core.file import File, FileTransferMethod, FileType
 from core.helper import encrypter
 from core.variables.segments import (
     ArrayAnySegment,
@@ -36,6 +35,7 @@ from core.variables.variables import (
     StringVariable,
     Variable,
 )
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.runtime import VariablePool
 from core.workflow.system_variable import SystemVariable
 

api/tests/unit_tests/core/variables/test_segment_type_validation.py

@@ -10,8 +10,6 @@ from typing import Any
 
 import pytest
 
-from core.file.enums import FileTransferMethod, FileType
-from core.file.models import File
 from core.variables.segment_group import SegmentGroup
 from core.variables.segments import (
     ArrayFileSegment,
@@ -23,6 +21,8 @@ from core.variables.segments import (
     StringSegment,
 )
 from core.variables.types import ArrayValidation, SegmentType
+from core.workflow.file.enums import FileTransferMethod, FileType
+from core.workflow.file.models import File
 
 
 def create_test_file(

api/tests/unit_tests/core/workflow/nodes/llm/test_file_saver.py

@@ -6,10 +6,10 @@ import httpx
 import pytest
 from sqlalchemy import Engine
 
-from core.file import FileTransferMethod, FileType, models
 from core.helper import ssrf_proxy
 from core.tools import signature
 from core.tools.tool_file_manager import ToolFileManager
+from core.workflow.file import FileTransferMethod, FileType, models
 from core.workflow.nodes.llm.file_saver import (
     FileSaverImpl,
     _extract_content_type_and_extension,

api/tests/unit_tests/core/workflow/nodes/llm/test_node.py

@@ -8,7 +8,6 @@ import pytest
 from core.app.entities.app_invoke_entities import InvokeFrom, ModelConfigWithCredentialsEntity
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
-from core.file import File, FileTransferMethod, FileType
 from core.model_runtime.entities.common_entities import I18nObject
 from core.model_runtime.entities.message_entities import (
     ImagePromptMessageContent,
@@ -21,6 +20,7 @@ from core.model_runtime.entities.model_entities import AIModelEntity, FetchFrom,
 from core.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
 from core.variables import ArrayAnySegment, ArrayFileSegment, NoneSegment
 from core.workflow.entities import GraphInitParams
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.nodes.llm import llm_utils
 from core.workflow.nodes.llm.entities import (
     ContextConfig,

api/tests/unit_tests/core/workflow/nodes/llm/test_scenarios.py

@@ -2,9 +2,9 @@ from collections.abc import Mapping, Sequence
 
 from pydantic import BaseModel, Field
 
-from core.file import File
 from core.model_runtime.entities.message_entities import PromptMessage
 from core.model_runtime.entities.model_entities import ModelFeature
+from core.workflow.file import File
 from core.workflow.nodes.llm.entities import LLMNodeChatModelMessage
 
 

api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py

@@ -6,12 +6,12 @@ import pytest
 from docx.oxml.text.paragraph import CT_P
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.file import File, FileTransferMethod
 from core.variables import ArrayFileSegment
 from core.variables.segments import ArrayStringSegment
 from core.variables.variables import StringVariable
 from core.workflow.entities import GraphInitParams
 from core.workflow.enums import NodeType, WorkflowNodeExecutionStatus
+from core.workflow.file import File, FileTransferMethod
 from core.workflow.node_events import NodeRunResult
 from core.workflow.nodes.document_extractor import DocumentExtractorNode, DocumentExtractorNodeData
 from core.workflow.nodes.document_extractor.node import (
@@ -146,7 +146,7 @@ def test_run_extract_text(
     mock_ssrf_proxy_get.return_value.content = file_content
     mock_ssrf_proxy_get.return_value.raise_for_status = Mock()
 
-    monkeypatch.setattr("core.file.file_manager.download", mock_download)
+    monkeypatch.setattr("core.workflow.file.file_manager.download", mock_download)
     monkeypatch.setattr("core.helper.ssrf_proxy.get", mock_ssrf_proxy_get)
 
     if mime_type == "application/pdf":

api/tests/unit_tests/core/workflow/nodes/test_if_else.py

@@ -6,10 +6,10 @@ import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.workflow.node_factory import DifyNodeFactory
-from core.file import File, FileTransferMethod, FileType
 from core.variables import ArrayFileSegment
 from core.workflow.entities import GraphInitParams
 from core.workflow.enums import WorkflowNodeExecutionStatus
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.graph import Graph
 from core.workflow.nodes.if_else.entities import IfElseNodeData
 from core.workflow.nodes.if_else.if_else_node import IfElseNode

api/tests/unit_tests/core/workflow/nodes/test_list_operator.py

@@ -3,9 +3,9 @@ from unittest.mock import MagicMock
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.file import File, FileTransferMethod, FileType
 from core.variables import ArrayFileSegment
 from core.workflow.enums import WorkflowNodeExecutionStatus
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.nodes.list_operator.entities import (
     ExtractConfig,
     FilterBy,

api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py

@@ -8,12 +8,12 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from core.file import File, FileTransferMethod, FileType
 from core.model_runtime.entities.llm_entities import LLMUsage
 from core.tools.entities.tool_entities import ToolInvokeMessage
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
 from core.variables.segments import ArrayFileSegment
 from core.workflow.entities import GraphInitParams
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.node_events import StreamChunkEvent, StreamCompletedEvent
 from core.workflow.runtime import GraphRuntimeState, VariablePool
 from core.workflow.system_variable import SystemVariable

api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py

@@ -3,10 +3,10 @@ from unittest.mock import patch
 import pytest
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from core.file import File, FileTransferMethod, FileType
 from core.variables import FileVariable, StringVariable
 from core.workflow.entities.graph_init_params import GraphInitParams
 from core.workflow.entities.workflow_node_execution import WorkflowNodeExecutionStatus
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.nodes.trigger_webhook.entities import (
     ContentType,
     Method,

api/tests/unit_tests/core/workflow/test_system_variable.py

@@ -4,8 +4,8 @@ from typing import Any
 import pytest
 from pydantic import ValidationError
 
-from core.file.enums import FileTransferMethod, FileType
-from core.file.models import File
+from core.workflow.file.enums import FileTransferMethod, FileType
+from core.workflow.file.models import File
 from core.workflow.system_variable import SystemVariable
 
 # Test data constants for SystemVariable serialization tests

api/tests/unit_tests/core/workflow/test_system_variable_read_only_view.py

@@ -2,7 +2,7 @@ from typing import cast
 
 import pytest
 
-from core.file.models import File, FileTransferMethod, FileType
+from core.workflow.file.models import File, FileTransferMethod, FileType
 from core.workflow.system_variable import SystemVariable, SystemVariableReadOnlyView
 
 

api/tests/unit_tests/core/workflow/test_variable_pool.py

@@ -3,7 +3,6 @@ from collections import defaultdict
 
 import pytest
 
-from core.file import File, FileTransferMethod, FileType
 from core.variables import FileSegment, StringSegment
 from core.variables.segments import (
     ArrayAnySegment,
@@ -27,6 +26,7 @@ from core.variables.variables import (
     Variable,
 )
 from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, ENVIRONMENT_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from core.workflow.file import File, FileTransferMethod, FileType
 from core.workflow.runtime import VariablePool
 from core.workflow.system_variable import SystemVariable
 from factories.variable_factory import build_segment, segment_to_variable

api/tests/unit_tests/core/workflow/test_workflow_entry.py

@@ -3,14 +3,14 @@ from types import SimpleNamespace
 import pytest
 
 from configs import dify_config
-from core.file.enums import FileType
-from core.file.models import File, FileTransferMethod
 from core.helper.code_executor.code_executor import CodeLanguage
 from core.variables.variables import StringVariable
 from core.workflow.constants import (
     CONVERSATION_VARIABLE_NODE_ID,
     ENVIRONMENT_VARIABLE_NODE_ID,
 )
+from core.workflow.file.enums import FileType
+from core.workflow.file.models import File, FileTransferMethod
 from core.workflow.nodes.code.code_node import CodeNode
 from core.workflow.nodes.code.limits import CodeNodeLimits
 from core.workflow.runtime import VariablePool

api/tests/unit_tests/factories/test_variable_factory.py

@@ -7,7 +7,6 @@ import pytest
 from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
 
-from core.file import File, FileTransferMethod, FileType
 from core.variables import (
     ArrayNumberVariable,
     ArrayObjectVariable,
@@ -34,6 +33,7 @@ from core.variables.segments import (
     StringSegment,
 )
 from core.variables.types import SegmentType
+from core.workflow.file import File, FileTransferMethod, FileType
 from factories import variable_factory
 from factories.variable_factory import TypeMismatchError, build_segment, build_segment_with_type
 

api/tests/unit_tests/models/test_workflow.py

@@ -4,10 +4,10 @@ from unittest import mock
 from uuid import uuid4
 
 from constants import HIDDEN_VALUE
-from core.file.enums import FileTransferMethod, FileType
-from core.file.models import File
 from core.variables import FloatVariable, IntegerVariable, SecretVariable, StringVariable
 from core.variables.segments import IntegerSegment, Segment
+from core.workflow.file.enums import FileTransferMethod, FileType
+from core.workflow.file.models import File
 from factories.variable_factory import build_segment
 from models.workflow import Workflow, WorkflowDraftVariable, WorkflowNodeExecutionModel, is_system_variable_editable
 

api/tests/unit_tests/services/test_variable_truncator.py

@@ -17,8 +17,6 @@ from uuid import uuid4
 
 import pytest
 
-from core.file.enums import FileTransferMethod, FileType
-from core.file.models import File
 from core.variables.segments import (
     ArrayFileSegment,
     ArrayNumberSegment,
@@ -30,6 +28,8 @@ from core.variables.segments import (
     ObjectSegment,
     StringSegment,
 )
+from core.workflow.file.enums import FileTransferMethod, FileType
+from core.workflow.file.models import File
 from services.variable_truncator import (
     DummyVariableTruncator,
     MaxDepthExceededError,