style: auto-format after segment 3 import migrations

Made-with: Cursor
This commit is contained in:
Novice 2026-03-23 10:37:02 +08:00
parent 55095e70d2
commit b15a9bea21
No known key found for this signature in database
GPG Key ID: A253106A7475AA3E
27 changed files with 49 additions and 57 deletions

View File

@ -1,4 +1,3 @@
from dify_graph.file.helpers import get_signed_file_url_for_plugin
from flask import abort
from flask_restx import Resource
from pydantic import BaseModel
@ -23,6 +22,7 @@ from core.session.cli_api import CliContext
from core.skill.entities import ToolInvocationRequest
from core.tools.entities.tool_entities import ToolProviderType
from core.tools.tool_manager import ToolManager
from dify_graph.file.helpers import get_signed_file_url_for_plugin
from libs.helper import length_prefixed_response
from models.account import Account
from models.model import EndUser, Tenant

View File

@ -1,12 +1,12 @@
import logging
from dify_graph.model_runtime.utils.encoders import jsonable_encoder
from flask import request
from flask_restx import Resource, fields
from pydantic import BaseModel
from controllers.console import console_ns
from controllers.console.wraps import account_initialization_required, setup_required
from dify_graph.model_runtime.utils.encoders import jsonable_encoder
from libs.login import current_account_with_tenant, login_required
from services.sandbox.sandbox_provider_service import SandboxProviderService

View File

@ -8,6 +8,11 @@ from core.agent.entities import AgentEntity, AgentLog, AgentResult
from core.agent.patterns.strategy_factory import StrategyFactory
from core.app.apps.base_app_queue_manager import PublishFrom
from core.app.entities.queue_entities import QueueAgentThoughtEvent, QueueMessageEndEvent, QueueMessageFileEvent
from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
from core.tools.__base.tool import Tool
from core.tools.entities.tool_entities import ToolInvokeMeta
from core.tools.tool_engine import ToolEngine
from dify_graph.file import file_manager
from dify_graph.model_runtime.entities import (
AssistantPromptMessage,
LLMResult,
@ -20,11 +25,6 @@ from dify_graph.model_runtime.entities import (
UserPromptMessage,
)
from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent, PromptMessageContentUnionTypes
from core.prompt.agent_history_prompt_transform import AgentHistoryPromptTransform
from core.tools.__base.tool import Tool
from core.tools.entities.tool_entities import ToolInvokeMeta
from core.tools.tool_engine import ToolEngine
from dify_graph.file import file_manager
from models.model import Message
logger = logging.getLogger(__name__)

View File

@ -11,6 +11,8 @@ from typing import TYPE_CHECKING, Any
from core.agent.entities import AgentLog, AgentResult, ExecutionContext
from core.model_manager import ModelInstance
from core.tools.entities.tool_entities import ToolInvokeMessage, ToolInvokeMeta
from dify_graph.file import File
from dify_graph.model_runtime.entities import (
AssistantPromptMessage,
LLMResult,
@ -21,8 +23,6 @@ from dify_graph.model_runtime.entities import (
)
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
from dify_graph.model_runtime.entities.message_entities import TextPromptMessageContent
from core.tools.entities.tool_entities import ToolInvokeMessage, ToolInvokeMeta
from dify_graph.file import File
if TYPE_CHECKING:
from core.tools.__base.tool import Tool

View File

@ -12,6 +12,8 @@ from collections.abc import Generator
from typing import Any, Union
from core.agent.entities import AgentLog, AgentResult
from core.tools.entities.tool_entities import ToolInvokeMeta
from dify_graph.file import File
from dify_graph.model_runtime.entities import (
AssistantPromptMessage,
LLMResult,
@ -22,8 +24,6 @@ from dify_graph.model_runtime.entities import (
PromptMessageTool,
ToolPromptMessage,
)
from core.tools.entities.tool_entities import ToolInvokeMeta
from dify_graph.file import File
from .base import AgentPattern

View File

@ -9,6 +9,7 @@ from typing import TYPE_CHECKING, Any, Union
from core.agent.entities import AgentLog, AgentResult, AgentScratchpadUnit, ExecutionContext
from core.agent.output_parser.cot_output_parser import CotAgentOutputParser
from core.model_manager import ModelInstance
from dify_graph.file import File
from dify_graph.model_runtime.entities import (
AssistantPromptMessage,
LLMResult,
@ -17,7 +18,6 @@ from dify_graph.model_runtime.entities import (
PromptMessage,
SystemPromptMessage,
)
from dify_graph.file import File
from .base import AgentPattern, ToolInvokeHook

View File

@ -6,8 +6,8 @@ from typing import TYPE_CHECKING
from core.agent.entities import AgentEntity, ExecutionContext
from core.model_manager import ModelInstance
from dify_graph.model_runtime.entities.model_entities import ModelFeature
from dify_graph.file.models import File
from dify_graph.model_runtime.entities.model_entities import ModelFeature
from .base import AgentPattern, ToolInvokeHook
from .function_call import FunctionCallStrategy

View File

@ -1,10 +1,9 @@
import logging
from core.sandbox import Sandbox
from dify_graph.graph_engine.layers.base import GraphEngineLayer
from dify_graph.graph_events.base import GraphEngineEvent
from core.sandbox import Sandbox
logger = logging.getLogger(__name__)

View File

@ -22,6 +22,8 @@ from sqlalchemy.orm import Session
from core.memory.base import BaseMemory
from core.model_manager import ModelInstance
from core.prompt.utils.extract_thread_messages import extract_thread_messages
from dify_graph.file import file_manager
from dify_graph.model_runtime.entities import (
AssistantPromptMessage,
MultiModalPromptMessageContent,
@ -32,8 +34,6 @@ from dify_graph.model_runtime.entities import (
UserPromptMessage,
)
from dify_graph.model_runtime.entities.message_entities import PromptMessageContentUnionTypes
from core.prompt.utils.extract_thread_messages import extract_thread_messages
from dify_graph.file import file_manager
from extensions.ext_database import db
from models.model import Message
from models.workflow import WorkflowNodeExecutionModel

View File

@ -5,11 +5,11 @@ from typing import TYPE_CHECKING, Any
from pydantic import BaseModel, Field
from dify_graph.model_runtime.utils.encoders import jsonable_encoder
from core.session.cli_api import CliApiSession
from core.skill.entities import ToolDependencies, ToolReference
from core.tools.entities.tool_entities import ToolParameter, ToolProviderType
from core.virtual_environment.__base.entities import Arch, OperatingSystem
from dify_graph.model_runtime.utils.encoders import jsonable_encoder
from ..entities import DifyCli

View File

@ -8,8 +8,6 @@ from typing import TYPE_CHECKING, Any
if TYPE_CHECKING: # pragma: no cover
from models.model import File
from dify_graph.model_runtime.entities.message_entities import PromptMessageTool
from core.tools.__base.tool_runtime import ToolRuntime
from core.tools.entities.tool_entities import (
ToolEntity,
@ -17,6 +15,7 @@ from core.tools.entities.tool_entities import (
ToolParameter,
ToolProviderType,
)
from dify_graph.model_runtime.entities.message_entities import PromptMessageTool
class Tool(ABC):

View File

@ -2,19 +2,18 @@ import logging
from collections.abc import Mapping, Sequence
from typing import Any
from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
from dify_graph.nodes.base.entities import VariableSelector
from dify_graph.nodes.base.node import Node
from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
from core.sandbox import sandbox_debug
from core.sandbox.bash.session import SANDBOX_READY_TIMEOUT
from core.virtual_environment.__base.command_future import CommandCancelledError, CommandTimeoutError
from core.virtual_environment.__base.helpers import submit_command, with_connection
from dify_graph.node_events import NodeRunResult
from dify_graph.nodes.base import variable_template_parser
from core.workflow.nodes.command.entities import CommandNodeData
from core.workflow.nodes.command.exc import CommandExecutionError
from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
from dify_graph.node_events import NodeRunResult
from dify_graph.nodes.base import variable_template_parser
from dify_graph.nodes.base.entities import VariableSelector
from dify_graph.nodes.base.node import Node
from dify_graph.nodes.base.variable_template_parser import VariableTemplateParser
logger = logging.getLogger(__name__)

View File

@ -5,17 +5,16 @@ from collections.abc import Mapping, Sequence
from pathlib import PurePosixPath
from typing import Any, cast
from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
from dify_graph.nodes.base.node import Node
from dify_graph.variables.segments import ArrayStringSegment, FileSegment
from core.sandbox.bash.session import SANDBOX_READY_TIMEOUT
from core.virtual_environment.__base.command_future import CommandCancelledError, CommandTimeoutError
from core.virtual_environment.__base.helpers import pipeline
from core.zip_sandbox import SandboxDownloadItem
from dify_graph.enums import NodeType, WorkflowNodeExecutionStatus
from dify_graph.file import File, FileTransferMethod
from dify_graph.node_events import NodeRunResult
from dify_graph.nodes.base.node import Node
from dify_graph.variables import ArrayFileSegment
from core.zip_sandbox import SandboxDownloadItem
from dify_graph.variables.segments import ArrayStringSegment, FileSegment
from .entities import FileUploadNodeData
from .exc import FileUploadDownloadError, FileUploadNodeError

View File

@ -17,6 +17,7 @@ from dify_graph.context.execution_context import (
register_context_capturer,
reset_context_provider,
)
__all__ = [
"AppContext",
"ContextProviderNotFoundError",

View File

@ -517,9 +517,8 @@ class AgentNode(Node[AgentNodeData]):
Fetch memory instance for saving node memory.
This is a simplified version that doesn't require model_instance.
"""
from dify_graph.model_runtime.entities.model_entities import ModelType
from core.model_manager import ModelManager
from dify_graph.model_runtime.entities.model_entities import ModelType
node_data = self.node_data
if not node_data.memory:

View File

@ -18,8 +18,6 @@ from collections.abc import Mapping
from functools import reduce
from typing import Any, cast
from dify_graph.enums import NodeType
from core.app.entities.app_asset_entities import AppAssetFileTree, AppAssetNode
from core.sandbox.entities.config import AppAssets
from core.skill.assembler import SkillBundleAssembler, SkillDocumentAssembler
@ -28,6 +26,7 @@ from core.skill.entities.skill_document import SkillDocument
from core.skill.entities.skill_metadata import SkillMetadata
from core.skill.entities.tool_dependencies import ToolDependencies, ToolDependency
from core.skill.skill_manager import SkillManager
from dify_graph.enums import NodeType
from models.model import App
from services.app_asset_service import AppAssetService

View File

@ -7,9 +7,9 @@ extracting values from list[PromptMessage] variables.
from typing import Any
from dify_graph.enums import NodeType
from sqlalchemy.orm import Session
from dify_graph.enums import NodeType
from dify_graph.model_runtime.entities import LLMMode
from services.model_provider_service import ModelProviderService
from services.workflow.entities import NestedNodeGraphRequest, NestedNodeGraphResponse, NestedNodeParameterSchema

View File

@ -4,10 +4,10 @@ from decimal import Decimal
from unittest.mock import MagicMock
import pytest
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
from core.agent.entities import AgentLog, ExecutionContext
from core.agent.patterns.base import AgentPattern
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
class ConcreteAgentPattern(AgentPattern):

View File

@ -4,6 +4,8 @@ from decimal import Decimal
from unittest.mock import MagicMock
import pytest
from core.agent.entities import AgentLog, ExecutionContext
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
from dify_graph.model_runtime.entities.message_entities import (
PromptMessageTool,
@ -11,8 +13,6 @@ from dify_graph.model_runtime.entities.message_entities import (
UserPromptMessage,
)
from core.agent.entities import AgentLog, ExecutionContext
@pytest.fixture
def mock_model_instance():

View File

@ -3,12 +3,12 @@
from unittest.mock import MagicMock
import pytest
from dify_graph.model_runtime.entities.model_entities import ModelFeature
from core.agent.entities import AgentEntity, ExecutionContext
from core.agent.patterns.function_call import FunctionCallStrategy
from core.agent.patterns.react import ReActStrategy
from core.agent.patterns.strategy_factory import StrategyFactory
from dify_graph.model_runtime.entities.model_entities import ModelFeature
@pytest.fixture

View File

@ -4,10 +4,10 @@ from decimal import Decimal
from unittest.mock import MagicMock, patch
import pytest
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
from core.agent.entities import AgentEntity, AgentLog, AgentPromptEntity, AgentResult
from dify_graph.model_runtime.entities import SystemPromptMessage, UserPromptMessage
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
class TestOrganizePromptMessages:

View File

@ -2,8 +2,8 @@ from unittest.mock import MagicMock
from core.app.apps.base_app_queue_manager import PublishFrom
from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
from dify_graph.graph_events import NodeRunStreamChunkEvent
from dify_graph.enums import NodeType
from dify_graph.graph_events import NodeRunStreamChunkEvent
class DummyQueueManager:

View File

@ -2,14 +2,13 @@
from unittest.mock import patch
from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
from dify_graph.file import File, FileTransferMethod, FileType
from dify_graph.file.file_manager import (
_encode_file_ref,
restore_multimodal_content,
to_prompt_message_content,
)
from dify_graph.file import File, FileTransferMethod, FileType
from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
class TestEncodeFileRef:

View File

@ -3,7 +3,6 @@ Unit tests for sandbox file path detection and conversion.
"""
import pytest
from dify_graph.variables.segments import ArrayFileSegment, FileSegment
from core.llm_generator.output_parser.file_ref import (
FILE_PATH_DESCRIPTION_SUFFIX,
@ -14,6 +13,7 @@ from core.llm_generator.output_parser.file_ref import (
is_file_path_property,
)
from dify_graph.file import File, FileTransferMethod, FileType
from dify_graph.variables.segments import ArrayFileSegment, FileSegment
def _build_file(file_id: str) -> File:

View File

@ -7,15 +7,14 @@ from dify_graph.enums import NodeType
from dify_graph.graph.graph import Graph
from dify_graph.graph_engine.response_coordinator.coordinator import ResponseStreamCoordinator
from dify_graph.graph_engine.response_coordinator.session import ResponseSession
from dify_graph.nodes.base.entities import BaseNodeData
from dify_graph.nodes.base.template import Template, VariableSegment
from dify_graph.graph_events import (
ChunkType,
NodeRunStreamChunkEvent,
ToolCall,
ToolResult,
)
from dify_graph.nodes.base.entities import BaseNodeData
from dify_graph.nodes.base.template import Template, VariableSegment
from dify_graph.runtime import VariablePool

View File

@ -4,9 +4,6 @@ from io import BytesIO
from typing import Any
from unittest.mock import MagicMock
from dify_graph.enums import WorkflowNodeExecutionStatus
from dify_graph.system_variable import SystemVariable
from core.entities.provider_entities import BasicProviderConfig
from core.virtual_environment.__base.entities import (
Arch,
@ -19,10 +16,12 @@ from core.virtual_environment.__base.entities import (
from core.virtual_environment.__base.virtual_environment import VirtualEnvironment
from core.virtual_environment.channel.queue_transport import QueueTransportReadCloser
from core.virtual_environment.channel.transport import NopTransportWriteCloser
from core.workflow.nodes.command.node import CommandNode
from dify_graph.entities import GraphInitParams
from dify_graph.entities.graph_init_params import DIFY_RUN_CONTEXT_KEY
from core.workflow.nodes.command.node import CommandNode
from dify_graph.enums import WorkflowNodeExecutionStatus
from dify_graph.runtime import GraphRuntimeState, VariablePool
from dify_graph.system_variable import SystemVariable
class FakeVirtualEnvironment(VirtualEnvironment):

View File

@ -3,12 +3,12 @@ from collections.abc import Generator
from typing import Any
import pytest
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
from dify_graph.entities.tool_entities import ToolResultStatus
from dify_graph.nodes.llm.node import LLMNode
from dify_graph.entities import ToolCallResult
from dify_graph.entities.tool_entities import ToolResultStatus
from dify_graph.model_runtime.entities.llm_entities import LLMUsage
from dify_graph.node_events import ModelInvokeCompletedEvent, NodeEventBase
from dify_graph.nodes.llm.node import LLMNode
class _StubModelInstance: