mirror of
https://github.com/langgenius/dify.git
synced 2026-05-06 02:18:08 +08:00
refactor(api): rename dify_graph to graphon (#34095)
This commit is contained in:
@ -10,8 +10,8 @@ from core.errors.error import (
|
||||
ProviderTokenNotInitError,
|
||||
QuotaExceededError,
|
||||
)
|
||||
from dify_graph.model_runtime.entities.llm_entities import LLMMode
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
|
||||
from graphon.model_runtime.entities.llm_entities import LLMMode
|
||||
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
|
||||
|
||||
|
||||
class TestModelConfigConverter:
|
||||
|
||||
@ -3,7 +3,7 @@ import pytest
|
||||
from core.app.app_config.easy_ui_based_app.variables.manager import (
|
||||
BasicVariablesConfigManager,
|
||||
)
|
||||
from dify_graph.variables.input_entities import VariableEntityType
|
||||
from graphon.variables.input_entities import VariableEntityType
|
||||
|
||||
|
||||
class TestBasicVariablesConfigManagerConvert:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
from core.app.app_config.features.file_upload.manager import FileUploadConfigManager
|
||||
from dify_graph.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
|
||||
from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
|
||||
from graphon.file.models import FileTransferMethod, FileUploadConfig, ImageConfig
|
||||
from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
|
||||
|
||||
|
||||
def test_convert_with_vision():
|
||||
|
||||
@ -4,7 +4,7 @@ from core.app.app_config.entities import (
|
||||
DatasetRetrieveConfigEntity,
|
||||
PromptTemplateEntity,
|
||||
)
|
||||
from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
|
||||
from graphon.variables.input_entities import VariableEntity, VariableEntityType
|
||||
|
||||
|
||||
class TestAppConfigEntities:
|
||||
|
||||
@ -1053,7 +1053,7 @@ class TestAdvancedChatAppGeneratorInternals:
|
||||
_ = kwargs
|
||||
|
||||
def run(self):
|
||||
from dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
|
||||
raise InvokeAuthorizationError("bad key")
|
||||
|
||||
|
||||
@ -7,8 +7,8 @@ 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 dify_graph.variables import SegmentType
|
||||
from factories import variable_factory
|
||||
from graphon.variables import SegmentType
|
||||
from models import ConversationVariable, Workflow
|
||||
|
||||
MINIMAL_GRAPH = {
|
||||
|
||||
@ -10,7 +10,7 @@ from core.app.entities.task_entities import (
|
||||
NodeStartStreamResponse,
|
||||
PingStreamResponse,
|
||||
)
|
||||
from dify_graph.enums import WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowNodeExecutionStatus
|
||||
|
||||
|
||||
class TestAdvancedChatGenerateResponseConverter:
|
||||
|
||||
@ -17,8 +17,8 @@ from core.app.entities.queue_entities import (
|
||||
QueueWorkflowSucceededEvent,
|
||||
)
|
||||
from core.app.entities.task_entities import StreamEvent
|
||||
from dify_graph.entities.pause_reason import HumanInputRequired
|
||||
from dify_graph.enums import WorkflowExecutionStatus
|
||||
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 EndUser
|
||||
|
||||
@ -43,8 +43,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 dify_graph.enums import BuiltinNodeTypes
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
from graphon.runtime import GraphRuntimeState, VariablePool
|
||||
from models.enums import MessageStatus
|
||||
from models.model import AppMode, EndUser
|
||||
from tests.workflow_test_utils import build_test_variable_pool
|
||||
|
||||
@ -6,7 +6,7 @@ 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 dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
|
||||
|
||||
class DummyAccount:
|
||||
|
||||
@ -3,8 +3,8 @@ import pytest
|
||||
from core.agent.entities import AgentEntity
|
||||
from core.app.apps.agent_chat.app_runner import AgentChatAppRunner
|
||||
from core.moderation.base import ModerationError
|
||||
from dify_graph.model_runtime.entities.llm_entities import LLMMode
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
|
||||
from graphon.model_runtime.entities.llm_entities import LLMMode
|
||||
from graphon.model_runtime.entities.model_entities import ModelFeature, ModelPropertyKey
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@ -9,7 +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 dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
from models.model import AppMode
|
||||
|
||||
|
||||
|
||||
@ -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 dify_graph.file.enums import FileTransferMethod, FileType
|
||||
from dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
|
||||
from graphon.file.enums import FileTransferMethod, FileType
|
||||
from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
|
||||
from models.enums import CreatorUserRole
|
||||
|
||||
|
||||
|
||||
@ -5,8 +5,8 @@ import pytest
|
||||
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 dify_graph.runtime import GraphRuntimeState
|
||||
from dify_graph.runtime.variable_pool import VariablePool
|
||||
from graphon.runtime import GraphRuntimeState
|
||||
from graphon.runtime.variable_pool import VariablePool
|
||||
|
||||
|
||||
def _make_state(workflow_run_id: str | None) -> GraphRuntimeState:
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
from collections.abc import Mapping, Sequence
|
||||
|
||||
from core.app.apps.common.workflow_response_converter import WorkflowResponseConverter
|
||||
from dify_graph.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
|
||||
from dify_graph.variables.segments import ArrayFileSegment, FileSegment
|
||||
from graphon.file import FILE_MODEL_IDENTITY, File, FileTransferMethod, FileType
|
||||
from graphon.variables.segments import ArrayFileSegment, FileSegment
|
||||
|
||||
|
||||
class TestWorkflowResponseConverterFetchFilesFromVariableValue:
|
||||
|
||||
@ -5,8 +5,8 @@ from core.app.apps.common.workflow_response_converter import WorkflowResponseCon
|
||||
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 dify_graph.entities.workflow_start_reason import WorkflowStartReason
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.entities.workflow_start_reason import WorkflowStartReason
|
||||
from graphon.runtime import GraphRuntimeState, VariablePool
|
||||
|
||||
|
||||
def _build_converter():
|
||||
|
||||
@ -3,8 +3,8 @@ from types import SimpleNamespace
|
||||
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 dify_graph.entities.workflow_start_reason import WorkflowStartReason
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.entities.workflow_start_reason import WorkflowStartReason
|
||||
from graphon.runtime import GraphRuntimeState, VariablePool
|
||||
|
||||
|
||||
def _build_converter() -> WorkflowResponseConverter:
|
||||
|
||||
@ -25,8 +25,8 @@ from core.app.entities.queue_entities import (
|
||||
QueueNodeSucceededEvent,
|
||||
)
|
||||
from core.workflow.system_variables import build_system_variables
|
||||
from dify_graph.entities.workflow_start_reason import WorkflowStartReason
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from graphon.entities.workflow_start_reason import WorkflowStartReason
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
from libs.datetime_utils import naive_utc_now
|
||||
from models import Account
|
||||
from models.model import AppMode
|
||||
|
||||
@ -6,7 +6,7 @@ import pytest
|
||||
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 dify_graph.model_runtime.entities.message_entities import ImagePromptMessageContent
|
||||
from graphon.model_runtime.entities.message_entities import ImagePromptMessageContent
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@ -9,7 +9,7 @@ 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 dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
|
||||
from services.errors.app import MoreLikeThisDisabledError
|
||||
from services.errors.message import MessageNotExistsError
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ from core.app.entities.task_entities import (
|
||||
WorkflowAppBlockingResponse,
|
||||
WorkflowAppStreamResponse,
|
||||
)
|
||||
from dify_graph.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
|
||||
|
||||
|
||||
def test_convert_blocking_full_and_simple_response():
|
||||
|
||||
@ -13,7 +13,7 @@ from core.app.entities.queue_entities import (
|
||||
QueueWorkflowPartialSuccessEvent,
|
||||
QueueWorkflowSucceededEvent,
|
||||
)
|
||||
from dify_graph.model_runtime.entities.llm_entities import LLMResult
|
||||
from graphon.model_runtime.entities.llm_entities import LLMResult
|
||||
|
||||
|
||||
def test_publish_sets_stop_listen_and_raises_on_stopped(mocker):
|
||||
|
||||
@ -26,7 +26,7 @@ import pytest
|
||||
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 dify_graph.graph_events import GraphRunFailedEvent
|
||||
from graphon.graph_events import GraphRunFailedEvent
|
||||
|
||||
|
||||
def _build_app_generate_entity() -> SimpleNamespace:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import pytest
|
||||
|
||||
from core.app.apps.base_app_generator import BaseAppGenerator
|
||||
from dify_graph.variables.input_entities import VariableEntity, VariableEntityType
|
||||
from graphon.variables.input_entities import VariableEntity, VariableEntityType
|
||||
|
||||
|
||||
def test_validate_inputs_with_zero():
|
||||
@ -477,7 +477,7 @@ class TestBaseAppGeneratorExtras:
|
||||
|
||||
def test_get_draft_var_saver_factory_debugger(self):
|
||||
from core.app.entities.app_invoke_entities import InvokeFrom
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
from models import Account
|
||||
|
||||
base_app_generator = BaseAppGenerator()
|
||||
|
||||
@ -14,15 +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 dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
|
||||
from dify_graph.model_runtime.entities.message_entities import (
|
||||
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 dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
|
||||
from dify_graph.model_runtime.errors.invoke import InvokeBadRequestError
|
||||
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
|
||||
from graphon.model_runtime.errors.invoke import InvokeBadRequestError
|
||||
from models.model import AppMode
|
||||
|
||||
|
||||
|
||||
@ -3,33 +3,33 @@ import time
|
||||
from types import ModuleType, SimpleNamespace
|
||||
from typing import Any
|
||||
|
||||
import dify_graph.nodes.human_input.entities # noqa: F401
|
||||
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.node_factory import DifyNodeFactory
|
||||
from core.workflow.system_variables import build_system_variables
|
||||
from dify_graph.entities.base_node_data import BaseNodeData, RetryConfig
|
||||
from dify_graph.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
|
||||
from dify_graph.entities.pause_reason import SchedulingPause
|
||||
from dify_graph.entities.workflow_start_reason import WorkflowStartReason
|
||||
from dify_graph.enums import BuiltinNodeTypes, NodeType, WorkflowNodeExecutionStatus
|
||||
from dify_graph.graph import Graph
|
||||
from dify_graph.graph_engine import GraphEngine
|
||||
from dify_graph.graph_engine.command_channels.in_memory_channel import InMemoryChannel
|
||||
from dify_graph.graph_events import (
|
||||
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.entities.workflow_start_reason import WorkflowStartReason
|
||||
from graphon.enums import BuiltinNodeTypes, NodeType, WorkflowNodeExecutionStatus
|
||||
from graphon.graph import Graph
|
||||
from graphon.graph_engine import GraphEngine
|
||||
from graphon.graph_engine.command_channels.in_memory_channel import InMemoryChannel
|
||||
from graphon.graph_events import (
|
||||
GraphEngineEvent,
|
||||
GraphRunPausedEvent,
|
||||
GraphRunStartedEvent,
|
||||
GraphRunSucceededEvent,
|
||||
NodeRunSucceededEvent,
|
||||
)
|
||||
from dify_graph.node_events import NodeRunResult, PauseRequestedEvent
|
||||
from dify_graph.nodes.base.entities import OutputVariableEntity
|
||||
from dify_graph.nodes.base.node import Node
|
||||
from dify_graph.nodes.end.entities import EndNodeData
|
||||
from dify_graph.nodes.start.entities import StartNodeData
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.node_events import NodeRunResult, PauseRequestedEvent
|
||||
from graphon.nodes.base.entities import OutputVariableEntity
|
||||
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 tests.workflow_test_utils import build_test_graph_init_params
|
||||
|
||||
if "core.ops.ops_trace_manager" not in sys.modules:
|
||||
|
||||
@ -21,9 +21,9 @@ from core.app.entities.queue_entities import (
|
||||
QueueWorkflowSucceededEvent,
|
||||
)
|
||||
from core.workflow.system_variables import default_system_variables
|
||||
from dify_graph.entities.pause_reason import HumanInputRequired
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from dify_graph.graph_events import (
|
||||
from graphon.entities.pause_reason import HumanInputRequired
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
from graphon.graph_events import (
|
||||
GraphRunPausedEvent,
|
||||
GraphRunStartedEvent,
|
||||
GraphRunSucceededEvent,
|
||||
@ -37,9 +37,9 @@ from dify_graph.graph_events import (
|
||||
NodeRunStreamChunkEvent,
|
||||
NodeRunSucceededEvent,
|
||||
)
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from dify_graph.variables.variables import StringVariable
|
||||
from graphon.node_events import NodeRunResult
|
||||
from graphon.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.variables.variables import StringVariable
|
||||
|
||||
|
||||
class TestWorkflowBasedAppRunner:
|
||||
|
||||
@ -4,8 +4,8 @@ import pytest
|
||||
|
||||
from core.app.apps.workflow_app_runner import WorkflowBasedAppRunner
|
||||
from core.app.entities.queue_entities import QueueWorkflowPausedEvent
|
||||
from dify_graph.entities.pause_reason import HumanInputRequired
|
||||
from dify_graph.graph_events.graph import GraphRunPausedEvent
|
||||
from graphon.entities.pause_reason import HumanInputRequired
|
||||
from graphon.graph_events.graph import GraphRunPausedEvent
|
||||
|
||||
|
||||
class _DummyQueueManager:
|
||||
|
||||
@ -10,8 +10,8 @@ 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 dify_graph.entities.graph_config import NodeConfigDictAdapter
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.entities.graph_config import NodeConfigDictAdapter
|
||||
from graphon.runtime import GraphRuntimeState, VariablePool
|
||||
from models.workflow import Workflow
|
||||
|
||||
|
||||
|
||||
@ -11,11 +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 dify_graph.entities.pause_reason import HumanInputRequired
|
||||
from dify_graph.entities.workflow_start_reason import WorkflowStartReason
|
||||
from dify_graph.graph_events.graph import GraphRunPausedEvent
|
||||
from dify_graph.nodes.human_input.entities import FormInput, UserAction
|
||||
from dify_graph.nodes.human_input.enums import FormInputType
|
||||
from graphon.entities.pause_reason import HumanInputRequired
|
||||
from graphon.entities.workflow_start_reason import WorkflowStartReason
|
||||
from graphon.graph_events.graph 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
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ from core.app.entities.task_entities import (
|
||||
WorkflowAppBlockingResponse,
|
||||
WorkflowAppStreamResponse,
|
||||
)
|
||||
from dify_graph.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
|
||||
|
||||
|
||||
class TestWorkflowGenerateResponseConverter:
|
||||
|
||||
@ -8,8 +8,8 @@ from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTas
|
||||
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 dify_graph.entities.workflow_start_reason import WorkflowStartReason
|
||||
from dify_graph.runtime import GraphRuntimeState
|
||||
from graphon.entities.workflow_start_reason 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
|
||||
|
||||
@ -45,8 +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 dify_graph.enums import BuiltinNodeTypes, WorkflowExecutionStatus
|
||||
from dify_graph.runtime import GraphRuntimeState, VariablePool
|
||||
from graphon.enums import BuiltinNodeTypes, WorkflowExecutionStatus
|
||||
from graphon.runtime import GraphRuntimeState, VariablePool
|
||||
from models.enums import CreatorUserRole
|
||||
from models.model import AppMode, EndUser
|
||||
from tests.workflow_test_utils import build_test_variable_pool
|
||||
|
||||
@ -4,7 +4,7 @@ from core.app.entities.task_entities import (
|
||||
NodeStartStreamResponse,
|
||||
StreamEvent,
|
||||
)
|
||||
from dify_graph.enums import WorkflowNodeExecutionStatus
|
||||
from graphon.enums import WorkflowNodeExecutionStatus
|
||||
|
||||
|
||||
class TestTaskEntities:
|
||||
|
||||
@ -5,13 +5,13 @@ 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 dify_graph.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
|
||||
from dify_graph.graph_engine.protocols.command_channel import CommandChannel
|
||||
from dify_graph.graph_events.node import NodeRunSucceededEvent, NodeRunVariableUpdatedEvent
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from dify_graph.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
|
||||
from dify_graph.variables import StringVariable
|
||||
from dify_graph.variables.segments import Segment, StringSegment
|
||||
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
|
||||
from graphon.graph_engine.protocols.command_channel import CommandChannel
|
||||
from graphon.graph_events.node import NodeRunSucceededEvent, NodeRunVariableUpdatedEvent
|
||||
from graphon.node_events import NodeRunResult
|
||||
from graphon.runtime.graph_runtime_state_protocol import ReadOnlyGraphRuntimeState
|
||||
from graphon.variables import StringVariable
|
||||
from graphon.variables.segments import Segment, StringSegment
|
||||
|
||||
|
||||
class MockReadOnlyVariablePool:
|
||||
|
||||
@ -14,17 +14,17 @@ from core.app.layers.pause_state_persist_layer import (
|
||||
_WorkflowGenerateEntityWrapper,
|
||||
)
|
||||
from core.workflow.system_variables import SystemVariableKey
|
||||
from dify_graph.entities.pause_reason import SchedulingPause
|
||||
from dify_graph.graph_engine.entities.commands import GraphEngineCommand
|
||||
from dify_graph.graph_engine.layers.base import GraphEngineLayerNotInitializedError
|
||||
from dify_graph.graph_events.graph import (
|
||||
from graphon.entities.pause_reason import SchedulingPause
|
||||
from graphon.graph_engine.entities.commands import GraphEngineCommand
|
||||
from graphon.graph_engine.layers.base import GraphEngineLayerNotInitializedError
|
||||
from graphon.graph_events.graph import (
|
||||
GraphRunFailedEvent,
|
||||
GraphRunPausedEvent,
|
||||
GraphRunStartedEvent,
|
||||
GraphRunSucceededEvent,
|
||||
)
|
||||
from dify_graph.runtime.graph_runtime_state_protocol import ReadOnlyVariablePool
|
||||
from dify_graph.variables.segments import Segment
|
||||
from graphon.runtime.graph_runtime_state_protocol import ReadOnlyVariablePool
|
||||
from graphon.variables.segments import Segment
|
||||
from models.model import AppMode
|
||||
from repositories.factory import DifyAPIRepositoryFactory
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
from core.app.layers.suspend_layer import SuspendLayer
|
||||
from dify_graph.graph_events.graph import GraphRunPausedEvent
|
||||
from graphon.graph_events.graph import GraphRunPausedEvent
|
||||
|
||||
|
||||
class TestSuspendLayer:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
from unittest.mock import Mock, patch
|
||||
|
||||
from core.app.layers.timeslice_layer import TimeSliceLayer
|
||||
from dify_graph.graph_engine.entities.commands import CommandType, GraphEngineCommand
|
||||
from graphon.graph_engine.entities.commands import CommandType, GraphEngineCommand
|
||||
from services.workflow.entities import WorkflowScheduleCFSPlanEntity
|
||||
from services.workflow.scheduler import SchedulerCommand
|
||||
|
||||
|
||||
@ -4,8 +4,8 @@ from unittest.mock import Mock, patch
|
||||
|
||||
from core.app.layers.trigger_post_layer import TriggerPostLayer
|
||||
from core.workflow.system_variables import build_system_variables
|
||||
from dify_graph.graph_events.graph import GraphRunFailedEvent, GraphRunSucceededEvent
|
||||
from dify_graph.runtime import VariablePool
|
||||
from graphon.graph_events.graph import GraphRunFailedEvent, GraphRunSucceededEvent
|
||||
from graphon.runtime import VariablePool
|
||||
from models.enums import WorkflowTriggerStatus
|
||||
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ import pytest
|
||||
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 dify_graph.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
|
||||
from graphon.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError
|
||||
from models.enums import MessageStatus
|
||||
|
||||
|
||||
|
||||
@ -26,8 +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 dify_graph.model_runtime.entities.llm_entities import LLMResult as RuntimeLLMResult
|
||||
from dify_graph.model_runtime.entities.message_entities import TextPromptMessageContent
|
||||
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
|
||||
|
||||
|
||||
|
||||
@ -38,9 +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 dify_graph.file.enums import FileTransferMethod
|
||||
from dify_graph.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk, LLMResultChunkDelta, LLMUsage
|
||||
from dify_graph.model_runtime.entities.message_entities import AssistantPromptMessage, TextPromptMessageContent
|
||||
from graphon.file.enums 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
|
||||
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ 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 dify_graph.file.enums import FileTransferMethod, FileType
|
||||
from graphon.file.enums import FileTransferMethod, FileType
|
||||
from models.model import MessageFile, UploadFile
|
||||
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@ from unittest.mock import patch
|
||||
|
||||
from core.app.app_config.easy_ui_based_app.model_config.manager import ModelConfigManager
|
||||
from core.app.app_config.entities import ModelConfigEntity
|
||||
from dify_graph.model_runtime.entities.model_entities import ModelPropertyKey
|
||||
from graphon.model_runtime.entities.model_entities import ModelPropertyKey
|
||||
from models.provider_ids import ModelProviderID
|
||||
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ from core.app.workflow.layers.persistence import (
|
||||
WorkflowPersistenceLayer,
|
||||
_NodeRuntimeSnapshot,
|
||||
)
|
||||
from dify_graph.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus, WorkflowType
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus, WorkflowType
|
||||
from graphon.node_events import NodeRunResult
|
||||
|
||||
|
||||
def _build_layer() -> WorkflowPersistenceLayer:
|
||||
|
||||
@ -14,7 +14,7 @@ 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 dify_graph.file import File, FileTransferMethod, FileType
|
||||
from graphon.file import File, FileTransferMethod, FileType
|
||||
from models import ToolFile, UploadFile
|
||||
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import pytest
|
||||
|
||||
from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom, build_dify_run_context
|
||||
from core.workflow.node_factory import DifyNodeFactory
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
|
||||
|
||||
class DummyNode:
|
||||
|
||||
@ -3,7 +3,7 @@ from __future__ import annotations
|
||||
from types import SimpleNamespace
|
||||
|
||||
from core.app.workflow.layers.observability import ObservabilityLayer
|
||||
from dify_graph.enums import BuiltinNodeTypes
|
||||
from graphon.enums import BuiltinNodeTypes
|
||||
|
||||
|
||||
class TestObservabilityLayerExtras:
|
||||
|
||||
@ -8,15 +8,15 @@ 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 dify_graph.entities.pause_reason import SchedulingPause
|
||||
from dify_graph.entities.workflow_node_execution import WorkflowNodeExecution
|
||||
from dify_graph.enums import (
|
||||
from graphon.entities.pause_reason import SchedulingPause
|
||||
from graphon.entities.workflow_node_execution import WorkflowNodeExecution
|
||||
from graphon.enums import (
|
||||
BuiltinNodeTypes,
|
||||
WorkflowExecutionStatus,
|
||||
WorkflowNodeExecutionStatus,
|
||||
WorkflowType,
|
||||
)
|
||||
from dify_graph.graph_events.graph import (
|
||||
from graphon.graph_events.graph import (
|
||||
GraphRunAbortedEvent,
|
||||
GraphRunFailedEvent,
|
||||
GraphRunPartialSucceededEvent,
|
||||
@ -24,7 +24,7 @@ from dify_graph.graph_events.graph import (
|
||||
GraphRunStartedEvent,
|
||||
GraphRunSucceededEvent,
|
||||
)
|
||||
from dify_graph.graph_events.node import (
|
||||
from graphon.graph_events.node import (
|
||||
NodeRunExceptionEvent,
|
||||
NodeRunFailedEvent,
|
||||
NodeRunPauseRequestedEvent,
|
||||
@ -32,8 +32,8 @@ from dify_graph.graph_events.node import (
|
||||
NodeRunStartedEvent,
|
||||
NodeRunSucceededEvent,
|
||||
)
|
||||
from dify_graph.node_events import NodeRunResult
|
||||
from dify_graph.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
|
||||
from graphon.node_events import NodeRunResult
|
||||
from graphon.runtime import GraphRuntimeState, ReadOnlyGraphRuntimeStateWrapper, VariablePool
|
||||
|
||||
|
||||
class _RepoRecorder:
|
||||
|
||||
Reference in New Issue
Block a user