diff --git a/api/controllers/console/evaluation/evaluation.py b/api/controllers/console/evaluation/evaluation.py index b9b64715d2..1767732f2e 100644 --- a/api/controllers/console/evaluation/evaluation.py +++ b/api/controllers/console/evaluation/evaluation.py @@ -21,7 +21,7 @@ from controllers.console.wraps import ( setup_required, ) from core.evaluation.entities.evaluation_entity import EvaluationCategory, EvaluationConfigData, EvaluationRunRequest -from dify_graph.file import helpers as file_helpers +from graphon.file import helpers as file_helpers from extensions.ext_database import db from extensions.ext_storage import storage from libs.helper import TimestampField diff --git a/api/controllers/console/snippets/snippet_workflow.py b/api/controllers/console/snippets/snippet_workflow.py index 67ec20690e..48420ed544 100644 --- a/api/controllers/console/snippets/snippet_workflow.py +++ b/api/controllers/console/snippets/snippet_workflow.py @@ -34,7 +34,7 @@ from controllers.console.wraps import ( ) from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from dify_graph.graph_engine.manager import GraphEngineManager +from graphon.graph_engine.manager import GraphEngineManager from extensions.ext_database import db from extensions.ext_redis import redis_client from factories import variable_factory diff --git a/api/core/evaluation/base_evaluation_instance.py b/api/core/evaluation/base_evaluation_instance.py index e419e9523e..2f114ec849 100644 --- a/api/core/evaluation/base_evaluation_instance.py +++ b/api/core/evaluation/base_evaluation_instance.py @@ -10,7 +10,7 @@ from core.evaluation.entities.evaluation_entity import ( EvaluationItemResult, EvaluationMetric, ) -from dify_graph.node_events.base import NodeRunResult +from graphon.node_events.base import NodeRunResult logger = logging.getLogger(__name__) @@ -162,7 +162,7 @@ class BaseEvaluationInstance(ABC): ``node_run_result_mapping``. """ - from dify_graph.nodes.base.variable_template_parser import REGEX as VARIABLE_REGEX + from graphon.nodes.base.variable_template_parser import REGEX as VARIABLE_REGEX workflow_inputs: dict[str, Any] = {} diff --git a/api/core/evaluation/judgment/processor.py b/api/core/evaluation/judgment/processor.py index 20ee03aa75..6b56f1cd7f 100644 --- a/api/core/evaluation/judgment/processor.py +++ b/api/core/evaluation/judgment/processor.py @@ -23,8 +23,8 @@ from core.evaluation.entities.judgment_entity import ( JudgmentConfig, JudgmentResult, ) -from dify_graph.utils.condition.entities import SupportedComparisonOperator -from dify_graph.utils.condition.processor import _evaluate_condition # pyright: ignore[reportPrivateUsage] +from graphon.utils.condition.entities import SupportedComparisonOperator +from graphon.utils.condition.processor import _evaluate_condition # pyright: ignore[reportPrivateUsage] logger = logging.getLogger(__name__) diff --git a/api/core/evaluation/runners/agent_evaluation_runner.py b/api/core/evaluation/runners/agent_evaluation_runner.py index b8b18cf20f..3d99bcf76e 100644 --- a/api/core/evaluation/runners/agent_evaluation_runner.py +++ b/api/core/evaluation/runners/agent_evaluation_runner.py @@ -12,7 +12,7 @@ from core.evaluation.entities.evaluation_entity import ( EvaluationItemResult, ) from core.evaluation.runners.base_evaluation_runner import BaseEvaluationRunner -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult from models.model import App logger = logging.getLogger(__name__) diff --git a/api/core/evaluation/runners/base_evaluation_runner.py b/api/core/evaluation/runners/base_evaluation_runner.py index 6f81b1d829..715853759d 100644 --- a/api/core/evaluation/runners/base_evaluation_runner.py +++ b/api/core/evaluation/runners/base_evaluation_runner.py @@ -26,7 +26,7 @@ from core.evaluation.entities.evaluation_entity import ( ) from core.evaluation.entities.judgment_entity import JudgmentConfig from core.evaluation.judgment.processor import JudgmentProcessor -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult from libs.datetime_utils import naive_utc_now from models.evaluation import EvaluationRun, EvaluationRunItem, EvaluationRunStatus diff --git a/api/core/evaluation/runners/llm_evaluation_runner.py b/api/core/evaluation/runners/llm_evaluation_runner.py index ee37cbbc08..0d8bb06d1e 100644 --- a/api/core/evaluation/runners/llm_evaluation_runner.py +++ b/api/core/evaluation/runners/llm_evaluation_runner.py @@ -12,7 +12,7 @@ from core.evaluation.entities.evaluation_entity import ( EvaluationItemResult, ) from core.evaluation.runners.base_evaluation_runner import BaseEvaluationRunner -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult logger = logging.getLogger(__name__) diff --git a/api/core/evaluation/runners/retrieval_evaluation_runner.py b/api/core/evaluation/runners/retrieval_evaluation_runner.py index 11f6be72fb..28c0968824 100644 --- a/api/core/evaluation/runners/retrieval_evaluation_runner.py +++ b/api/core/evaluation/runners/retrieval_evaluation_runner.py @@ -11,7 +11,7 @@ from core.evaluation.entities.evaluation_entity import ( EvaluationItemResult, ) from core.evaluation.runners.base_evaluation_runner import BaseEvaluationRunner -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult logger = logging.getLogger(__name__) diff --git a/api/core/evaluation/runners/snippet_evaluation_runner.py b/api/core/evaluation/runners/snippet_evaluation_runner.py index f36931c6f3..7893a3e796 100644 --- a/api/core/evaluation/runners/snippet_evaluation_runner.py +++ b/api/core/evaluation/runners/snippet_evaluation_runner.py @@ -22,7 +22,7 @@ from core.evaluation.entities.evaluation_entity import ( EvaluationItemResult, ) from core.evaluation.runners.base_evaluation_runner import BaseEvaluationRunner -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult from models.snippet import CustomizedSnippet from models.workflow import WorkflowNodeExecutionModel diff --git a/api/core/evaluation/runners/workflow_evaluation_runner.py b/api/core/evaluation/runners/workflow_evaluation_runner.py index a27dd226d6..4a4ec68828 100644 --- a/api/core/evaluation/runners/workflow_evaluation_runner.py +++ b/api/core/evaluation/runners/workflow_evaluation_runner.py @@ -12,7 +12,7 @@ from core.evaluation.entities.evaluation_entity import ( EvaluationItemResult, ) from core.evaluation.runners.base_evaluation_runner import BaseEvaluationRunner -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult logger = logging.getLogger(__name__) diff --git a/api/services/evaluation_service.py b/api/services/evaluation_service.py index d70217f555..13ffc9e3b2 100644 --- a/api/services/evaluation_service.py +++ b/api/services/evaluation_service.py @@ -22,8 +22,8 @@ from core.evaluation.entities.evaluation_entity import ( NodeInfo, ) from core.evaluation.evaluation_manager import EvaluationManager -from dify_graph.enums import WorkflowNodeExecutionMetadataKey -from dify_graph.node_events.base import NodeRunResult +from graphon.enums import WorkflowNodeExecutionMetadataKey +from graphon.node_events.base import NodeRunResult from models.evaluation import ( EvaluationConfiguration, EvaluationRun, @@ -727,7 +727,7 @@ class EvaluationService: """Query all node execution records for a workflow run.""" from sqlalchemy import asc, select - from dify_graph.enums import WorkflowNodeExecutionStatus + from graphon.enums import WorkflowNodeExecutionStatus from models.workflow import WorkflowNodeExecutionModel stmt = ( diff --git a/api/services/snippet_dsl_service.py b/api/services/snippet_dsl_service.py index ea770f61df..f4c0132337 100644 --- a/api/services/snippet_dsl_service.py +++ b/api/services/snippet_dsl_service.py @@ -14,8 +14,8 @@ from sqlalchemy.orm import Session from core.helper import ssrf_proxy from core.plugin.entities.plugin import PluginDependency -from dify_graph.enums import BuiltinNodeTypes -from dify_graph.model_runtime.utils.encoders import jsonable_encoder +from graphon.enums import BuiltinNodeTypes +from graphon.model_runtime.utils.encoders import jsonable_encoder from extensions.ext_redis import redis_client from factories import variable_factory from models import Account diff --git a/api/services/snippet_generate_service.py b/api/services/snippet_generate_service.py index e8648c7e6a..4075a708b7 100644 --- a/api/services/snippet_generate_service.py +++ b/api/services/snippet_generate_service.py @@ -28,7 +28,7 @@ from sqlalchemy.orm import make_transient from core.app.app_config.features.file_upload.manager import FileUploadConfigManager from core.app.apps.workflow.app_generator import WorkflowAppGenerator from core.app.entities.app_invoke_entities import InvokeFrom -from dify_graph.file.models import File +from graphon.file.models import File from factories import file_factory from models import Account from models.model import AppMode, EndUser diff --git a/api/services/snippet_service.py b/api/services/snippet_service.py index d7b7f7d6a0..34866016bf 100644 --- a/api/services/snippet_service.py +++ b/api/services/snippet_service.py @@ -8,8 +8,8 @@ from sqlalchemy import func, select from sqlalchemy.orm import Session, sessionmaker from core.workflow.node_factory import LATEST_VERSION, NODE_TYPE_CLASSES_MAPPING -from dify_graph.enums import NodeType -from dify_graph.variables.variables import VariableBase +from graphon.enums import NodeType +from graphon.variables.variables import VariableBase from extensions.ext_database import db from libs.infinite_scroll_pagination import InfiniteScrollPagination from models import Account diff --git a/api/tasks/evaluation_task.py b/api/tasks/evaluation_task.py index 38233e22f6..3c2f7fbd17 100644 --- a/api/tasks/evaluation_task.py +++ b/api/tasks/evaluation_task.py @@ -24,7 +24,7 @@ from core.evaluation.runners.llm_evaluation_runner import LLMEvaluationRunner from core.evaluation.runners.retrieval_evaluation_runner import RetrievalEvaluationRunner from core.evaluation.runners.snippet_evaluation_runner import SnippetEvaluationRunner from core.evaluation.runners.workflow_evaluation_runner import WorkflowEvaluationRunner -from dify_graph.node_events import NodeRunResult +from graphon.node_events import NodeRunResult from extensions.ext_database import db from libs.datetime_utils import naive_utc_now from models.enums import CreatorUserRole