resolve conflict

api/enterprise/telemetry/draft_trace.py

@@ -5,7 +5,7 @@ from typing import Any
 
 from core.telemetry import TelemetryContext, TelemetryEvent, TraceTaskName
 from core.telemetry import emit as telemetry_emit
-from graphon.enums import WorkflowNodeExecutionMetadataKey
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey
 from models.workflow import WorkflowNodeExecutionModel
 
 

api/extensions/otel/parser/base.py

@@ -15,12 +15,12 @@ from opentelemetry.trace.status import Status, StatusCode
 from pydantic import BaseModel
 
 from configs import dify_config
+from dify_graph.enums import BuiltinNodeTypes
+from dify_graph.file.models import File
+from dify_graph.graph_events import GraphNodeEventBase
+from dify_graph.nodes.base.node import Node
+from dify_graph.variables import Segment
 from extensions.otel.semconv.gen_ai import ChainAttributes, GenAIAttributes
-from graphon.enums import BuiltinNodeTypes
-from graphon.file.models import File
-from graphon.graph_events import GraphNodeEventBase
-from graphon.nodes.base.node import Node
-from graphon.variables import Segment
 
 
 def should_include_content() -> bool:

api/services/rag_pipeline/rag_pipeline.py

@@ -38,9 +38,6 @@ from core.repositories.factory import DifyCoreRepositoryFactory
 from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
 from core.workflow.node_factory import LATEST_VERSION, get_node_type_classes_mapping
 from core.workflow.workflow_entry import WorkflowEntry
-from dify_graph.entities.workflow_node_execution import (
-from enterprise.telemetry.draft_trace import enqueue_draft_node_execution_trace
-from extensions.ext_database import db
 from dify_graph.entities.workflow_node_execution import (
     WorkflowNodeExecution,
     WorkflowNodeExecutionStatus,
@@ -56,6 +53,7 @@ from dify_graph.repositories.workflow_node_execution_repository import OrderConf
 from dify_graph.runtime import VariablePool
 from dify_graph.system_variable import SystemVariable
 from dify_graph.variables.variables import VariableBase
+from enterprise.telemetry.draft_trace import enqueue_draft_node_execution_trace
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from models import Account

api/services/workflow_service.py

@@ -20,16 +20,6 @@ from core.workflow.workflow_entry import WorkflowEntry
 from dify_graph.entities import GraphInitParams, WorkflowNodeExecution
 from dify_graph.entities.graph_config import NodeConfigDict
 from dify_graph.entities.pause_reason import HumanInputRequired
-from dify_graph.enums import (
-from enterprise.telemetry.draft_trace import enqueue_draft_node_execution_trace
-from enums.cloud_plan import CloudPlan
-from events.app_event import app_draft_workflow_was_synced, app_published_workflow_was_updated
-from extensions.ext_database import db
-from extensions.ext_storage import storage
-from factories.file_factory import build_from_mapping, build_from_mappings
-from dify_graph.entities import GraphInitParams, WorkflowNodeExecution
-from dify_graph.entities.graph_config import NodeConfigDict
-from dify_graph.entities.pause_reason import HumanInputRequired
 from dify_graph.enums import (
     ErrorStrategy,
     NodeType,
@@ -59,6 +49,7 @@ from dify_graph.variable_loader import load_into_variable_pool
 from dify_graph.variables import VariableBase
 from dify_graph.variables.input_entities import VariableEntityType
 from dify_graph.variables.variables import Variable
+from enterprise.telemetry.draft_trace import enqueue_draft_node_execution_trace
 from enums.cloud_plan import CloudPlan
 from events.app_event import app_draft_workflow_was_synced, app_published_workflow_was_updated
 from extensions.ext_database import db

api/tests/unit_tests/enterprise/telemetry/test_draft_trace.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import UTC, datetime
 from unittest.mock import MagicMock, patch
 
-from graphon.enums import WorkflowNodeExecutionMetadataKey
+from dify_graph.enums import WorkflowNodeExecutionMetadataKey
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -292,7 +292,7 @@ class TestEnqueueDraftNodeExecutionTrace:
 def _make_llm_execution() -> MagicMock:
     """Return a WorkflowNodeExecutionModel mock that mimics a real LLM node.
 
-    The field values match what graphon/nodes/llm/node.py produces:
+    The field values match what dify_graph/nodes/llm/node.py produces:
     - process_data_dict contains model_provider, model_name, and usage
     - outputs_dict contains usage with prompt/completion breakdown
     - execution_metadata_dict contains total_tokens/total_price/currency