vellum-ai 0.14.19__py3-none-any.whl → 0.14.21__py3-none-any.whl

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_conditional_node_serialization.py

@@ -638,7 +638,7 @@ def test_serialize_workflow():
                 "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
                 "source_handle_id": "3a45b81f-95e4-4cbd-8997-bfdbe30251e8",
                 "target_node_id": "0d959311-c836-4641-a867-58f63df9dfea",
-                "target_handle_id": "139c6965-68f0-4bae-a6d9-3ee68d6347c0",
+                "target_handle_id": "7beba198-c452-4749-a38a-ea9420d84e14",
                 "type": "DEFAULT",
             },
             {
@@ -646,7 +646,7 @@ def test_serialize_workflow():
                 "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
                 "source_handle_id": "7202f702-1ebc-4067-ab1e-ec67e49158ee",
                 "target_node_id": "68c02b7c-5077-4087-803d-841474a8081f",
-                "target_handle_id": "6d2c998b-1525-475f-9327-d8495b5e2692",
+                "target_handle_id": "1dc4eebe-b6db-4229-96e5-115ff8cedb76",
                 "type": "DEFAULT",
             },
             {
@@ -654,7 +654,7 @@ def test_serialize_workflow():
                 "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
                 "source_handle_id": "cf45705d-1a47-43a6-9d24-a7fdf78baae0",
                 "target_node_id": "8df781b1-ff28-48a5-98a2-d7d796b932b0",
-                "target_handle_id": "4584996a-4c1e-45d0-8f49-6918d69b755e",
+                "target_handle_id": "b73c39be-cbfe-4225-86e6-e6e4c161881e",
                 "type": "DEFAULT",
             },
             {
@@ -662,7 +662,7 @@ def test_serialize_workflow():
                 "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
                 "source_handle_id": "f04610dd-61cf-41b0-b337-2235e101cdb0",
                 "target_node_id": "ed7caf01-9ae7-47a3-b15a-16697abaf486",
-                "target_handle_id": "8da86a9b-0d22-442c-b622-63afe1b569ab",
+                "target_handle_id": "76fe7aec-5cd4-4c1a-b386-cfe09ebe66e4",
                 "type": "DEFAULT",
             },
             {
@@ -670,7 +670,7 @@ def test_serialize_workflow():
                 "source_node_id": "9b619e4d-b0a7-4121-9060-100d457868cb",
                 "source_handle_id": "f9dde637-ea90-465f-a871-caf8380ae377",
                 "target_node_id": "148c61bd-e8b0-4d4b-8734-b043a72b90ed",
-                "target_handle_id": "f81bbac8-d7f1-4bfd-95ec-9d0b93e28114",
+                "target_handle_id": "c88839af-3a79-4310-abbd-e1553d981dce",
                 "type": "DEFAULT",
             },
             {

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_default_state_serialization.py

@@ -196,7 +196,7 @@ def test_serialize_workflow():
                 "source_node_id": "32684932-7c7c-4b1c-aed2-553de29bf3f7",
                 "source_handle_id": "e4136ee4-a51a-4ca3-9a3a-aa96f5de2347",
                 "target_node_id": "1381c078-efa2-4255-89a1-7b4cb742c7fc",
-                "target_handle_id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
+                "target_handle_id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
                 "type": "DEFAULT",
             },
             {

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_generic_node_serialization.py

@@ -124,7 +124,7 @@ def test_serialize_workflow(vellum_client):
                 "source_node_id": "f1e4678f-c470-400b-a40e-c8922cc99a86",
                 "source_handle_id": "40201804-8beb-43ad-8873-a027759512f1",
                 "target_node_id": "c2ed23f7-f6cb-4a56-a91c-2e5f9d8fda7f",
-                "target_handle_id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8",
+                "target_handle_id": "b7bfb298-959a-4d2b-8b85-bbd0d2522703",
                 "type": "DEFAULT",
             },
             {

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_inline_subworkflow_serialization.py

@@ -142,7 +142,7 @@ def test_serialize_workflow():
                                 "module": ["tests", "workflows", "basic_inline_subworkflow", "workflow"],
                             },
                             "trigger": {
-                                "id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
+                                "id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
                                 "merge_behavior": "AWAIT_ATTRIBUTES",
                             },
                             "ports": [
@@ -261,7 +261,7 @@ def test_serialize_workflow():
                             "source_node_id": "afa49a0f-db35-4552-9217-5b8f237e84bc",
                             "source_handle_id": "9914a6a0-9a99-430d-8ddd-f7c13847fe1a",
                             "target_node_id": "1381c078-efa2-4255-89a1-7b4cb742c7fc",
-                            "target_handle_id": "a95a34f2-e894-4fb6-a2c9-15d12c1e3135",
+                            "target_handle_id": "6492efcf-4437-4af1-9ad7-269795ccb27a",
                             "type": "DEFAULT",
                         },
                         {

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_map_node_serialization.py

@@ -131,7 +131,7 @@ def test_serialize_workflow():
                                 "module": ["tests", "workflows", "basic_map_node", "workflow"],
                             },
                             "trigger": {
-                                "id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e",
+                                "id": "551d5528-f4e1-42ea-bde0-9de4b4968253",
                                 "merge_behavior": "AWAIT_ATTRIBUTES",
                             },
                             "ports": [
@@ -215,7 +215,7 @@ def test_serialize_workflow():
                             "source_node_id": "ff9bfe6e-839d-4d40-b8fc-313b3bbd0ab0",
                             "source_handle_id": "520d3616-8369-4e79-9da5-3febae299c2a",
                             "target_node_id": "baf6d316-dc75-41e8-96c0-015aede96309",
-                            "target_handle_id": "01324747-9bc0-4ecd-a8ab-40dca5a94e2e",
+                            "target_handle_id": "551d5528-f4e1-42ea-bde0-9de4b4968253",
                             "type": "DEFAULT",
                         },
                         {

vellum_ee/workflows/display/tests/workflow_serialization/test_basic_merge_node_serialization.py

@@ -146,7 +146,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "dc8aecd0-49ba-4464-a45f-29d3bfd686e4",
                 "source_handle_id": "017d40f5-8326-4e42-a409-b08995defaa8",
                 "target_node_id": "59243c65-053f-4ea6-9157-3f3edb1477bf",
-                "target_handle_id": "75293c10-d6d8-4fc0-afae-ba6437af982e",
+                "target_handle_id": "e622fe61-3bca-4aff-86e1-25dad7bdf9d4",
                 "type": "DEFAULT",
             },
             {
@@ -154,7 +154,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "dc8aecd0-49ba-4464-a45f-29d3bfd686e4",
                 "source_handle_id": "017d40f5-8326-4e42-a409-b08995defaa8",
                 "target_node_id": "127ef456-91bc-43c6-bd8b-1772db5e3cb5",
-                "target_handle_id": "10c7392f-7dc0-4273-8380-ddc3497e6072",
+                "target_handle_id": "e5cc41cb-71db-43ec-b3f0-c78706af3351",
                 "type": "DEFAULT",
             },
             {
@@ -178,7 +178,7 @@ def test_serialize_workflow__await_all():
                 "source_node_id": "37c10e8a-771b-432b-a767-31f5007851f0",
                 "source_handle_id": "3bbc469f-0fb0-4b3d-a28b-746fefec2818",
                 "target_node_id": "634f0202-9ea9-4c62-b152-1a58c595cffb",
-                "target_handle_id": "c0c993cd-1370-480b-b175-59590735aa46",
+                "target_handle_id": "acd48f48-54fb-4b2b-ab37-96d336f6dfb3",
                 "type": "DEFAULT",
             },
             {

vellum_ee/workflows/display/types.py

@@ -7,7 +7,7 @@ from vellum.workflows.nodes import BaseNode
 from vellum.workflows.ports import Port
 from vellum.workflows.references import OutputReference, StateValueReference, WorkflowInputReference
 from vellum_ee.workflows.display.base import (
-    EdgeDisplayType,
+    EdgeDisplay,
     EntrypointDisplayType,
     StateValueDisplayType,
     WorkflowInputsDisplayType,
@@ -20,7 +20,6 @@ if TYPE_CHECKING:
     from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay
     from vellum_ee.workflows.display.workflows import BaseWorkflowDisplay
 
-NodeDisplayType = TypeVar("NodeDisplayType", bound="BaseNodeDisplay")
 WorkflowDisplayType = TypeVar("WorkflowDisplayType", bound="BaseWorkflowDisplay")
 
 
@@ -30,9 +29,7 @@ class WorkflowDisplayContext(
         WorkflowMetaDisplayType,
         WorkflowInputsDisplayType,
         StateValueDisplayType,
-        NodeDisplayType,
         EntrypointDisplayType,
-        EdgeDisplayType,
     ]
 ):
     workflow_display_class: Type["BaseWorkflowDisplay"]
@@ -43,12 +40,12 @@ class WorkflowDisplayContext(
     )
     state_value_displays: Dict[StateValueReference, StateValueDisplayType] = field(default_factory=dict)
     global_state_value_displays: Dict[StateValueReference, StateValueDisplayType] = field(default_factory=dict)
-    node_displays: Dict[Type[BaseNode], "NodeDisplayType"] = field(default_factory=dict)
-    global_node_displays: Dict[Type[BaseNode], NodeDisplayType] = field(default_factory=dict)
+    node_displays: Dict[Type[BaseNode], "BaseNodeDisplay"] = field(default_factory=dict)
+    global_node_displays: Dict[Type[BaseNode], "BaseNodeDisplay"] = field(default_factory=dict)
     global_node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], "NodeOutputDisplay"]] = field(
         default_factory=dict
     )
     entrypoint_displays: Dict[Type[BaseNode], EntrypointDisplayType] = field(default_factory=dict)
     workflow_output_displays: Dict[BaseDescriptor, WorkflowOutputDisplay] = field(default_factory=dict)
-    edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplayType] = field(default_factory=dict)
+    edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay] = field(default_factory=dict)
     port_displays: Dict[Port, "PortDisplay"] = field(default_factory=dict)

vellum_ee/workflows/display/vellum.py

@@ -93,12 +93,20 @@ class StateValueVellumDisplay(StateValueVellumDisplayOverrides):
 
 
 @dataclass
-class EdgeVellumDisplayOverrides(EdgeDisplay, EdgeDisplayOverrides):
+class EdgeVellumDisplayOverrides(EdgeDisplayOverrides):
+    """
+    DEPRECATED: Use EdgeDisplay instead. Will be removed in 0.15.0
+    """
+
     pass
 
 
 @dataclass
 class EdgeVellumDisplay(EdgeVellumDisplayOverrides):
+    """
+    DEPRECATED: Use EdgeDisplay instead. Will be removed in 0.15.0
+    """
+
     source_node_id: UUID
     source_handle_id: UUID
     target_node_id: UUID
@@ -108,12 +116,12 @@ class EdgeVellumDisplay(EdgeVellumDisplayOverrides):
 
 @dataclass
 class EntrypointVellumDisplayOverrides(EntrypointDisplay, EntrypointDisplayOverrides):
-    edge_display: EdgeVellumDisplayOverrides
+    edge_display: EdgeDisplay
 
 
 @dataclass
 class EntrypointVellumDisplay(EntrypointVellumDisplayOverrides):
-    edge_display: EdgeVellumDisplay
+    edge_display: EdgeDisplay
 
 
 @dataclass

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -12,15 +12,14 @@ from vellum.workflows.edges import Edge
 from vellum.workflows.events.workflow import NodeEventDisplayContext, WorkflowEventDisplayContext
 from vellum.workflows.expressions.coalesce_expression import CoalesceExpression
 from vellum.workflows.nodes.bases import BaseNode
-from vellum.workflows.nodes.utils import get_wrapped_node
+from vellum.workflows.nodes.utils import get_unadorned_node, get_wrapped_node
 from vellum.workflows.ports import Port
 from vellum.workflows.references import OutputReference, StateValueReference, WorkflowInputReference
 from vellum.workflows.types.core import JsonObject
 from vellum.workflows.types.generics import WorkflowType
 from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum_ee.workflows.display.base import (
-    EdgeDisplayOverridesType,
-    EdgeDisplayType,
+    EdgeDisplay,
     EntrypointDisplayOverridesType,
     EntrypointDisplayType,
     StateValueDisplayOverridesType,
@@ -31,11 +30,12 @@ from vellum_ee.workflows.display.base import (
     WorkflowMetaDisplayType,
     WorkflowOutputDisplay,
 )
+from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
 from vellum_ee.workflows.display.nodes.get_node_display_class import get_node_display_class
 from vellum_ee.workflows.display.nodes.types import NodeOutputDisplay, PortDisplay, PortDisplayOverrides
 from vellum_ee.workflows.display.nodes.utils import raise_if_descriptor
-from vellum_ee.workflows.display.types import NodeDisplayType, WorkflowDisplayContext
+from vellum_ee.workflows.display.types import WorkflowDisplayContext
 from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
 
 logger = logging.getLogger(__name__)
@@ -50,11 +50,8 @@ class BaseWorkflowDisplay(
         WorkflowInputsDisplayOverridesType,
         StateValueDisplayType,
         StateValueDisplayOverridesType,
-        NodeDisplayType,
         EntrypointDisplayType,
         EntrypointDisplayOverridesType,
-        EdgeDisplayType,
-        EdgeDisplayOverridesType,
     ]
 ):
     # Used to specify the display data for a workflow.
@@ -73,7 +70,7 @@ class BaseWorkflowDisplay(
     output_displays: Dict[BaseDescriptor, WorkflowOutputDisplay] = {}
 
     # Used to explicitly specify display data for a workflow's edges.
-    edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplayOverridesType] = {}
+    edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay] = {}
 
     # Used to explicitly specify display data for a workflow's ports.
     port_displays: Dict[Port, PortDisplayOverrides] = {}
@@ -94,9 +91,7 @@ class BaseWorkflowDisplay(
                 WorkflowMetaDisplayType,
                 WorkflowInputsDisplayType,
                 StateValueDisplayType,
-                NodeDisplayType,
                 EntrypointDisplayType,
-                EdgeDisplayType,
             ]
         ] = None,
         dry_run: bool = False,
@@ -124,7 +119,7 @@ class BaseWorkflowDisplay(
 
     @property
     @abstractmethod
-    def node_display_base_class(self) -> Type[NodeDisplayType]:
+    def node_display_base_class(self) -> Type[BaseNodeDisplay]:
         pass
 
     def add_error(self, error: Exception) -> None:
@@ -141,7 +136,7 @@ class BaseWorkflowDisplay(
     def _enrich_global_node_output_displays(
         self,
         node: Type[BaseNode],
-        node_display: NodeDisplayType,
+        node_display: BaseNodeDisplay,
         node_output_displays: Dict[OutputReference, Tuple[Type[BaseNode], NodeOutputDisplay]],
     ):
         """This method recursively adds nodes wrapped in decorators to the node_output_displays dictionary."""
@@ -162,7 +157,7 @@ class BaseWorkflowDisplay(
     def _enrich_node_port_displays(
         self,
         node: Type[BaseNode],
-        node_display: NodeDisplayType,
+        node_display: BaseNodeDisplay,
         port_displays: Dict[Port, PortDisplay],
     ):
         """This method recursively adds nodes wrapped in decorators to the port_displays dictionary."""
@@ -178,7 +173,7 @@ class BaseWorkflowDisplay(
 
             port_displays[port] = node_display.get_node_port_display(port)
 
-    def _get_node_display(self, node: Type[BaseNode]) -> NodeDisplayType:
+    def _get_node_display(self, node: Type[BaseNode]) -> BaseNodeDisplay:
         node_display_class = get_node_display_class(self.node_display_base_class, node)
         node_display = node_display_class()
 
@@ -194,9 +189,7 @@ class BaseWorkflowDisplay(
         WorkflowMetaDisplayType,
         WorkflowInputsDisplayType,
         StateValueDisplayType,
-        NodeDisplayType,
         EntrypointDisplayType,
-        EdgeDisplayType,
     ]:
         workflow_display = self._generate_workflow_meta_display()
 
@@ -204,9 +197,9 @@ class BaseWorkflowDisplay(
             copy(self._parent_display_context.global_node_output_displays) if self._parent_display_context else {}
         )
 
-        node_displays: Dict[Type[BaseNode], NodeDisplayType] = {}
+        node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = {}
 
-        global_node_displays: Dict[Type[BaseNode], NodeDisplayType] = (
+        global_node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = (
             copy(self._parent_display_context.global_node_displays) if self._parent_display_context else {}
         )
 
@@ -273,14 +266,14 @@ class BaseWorkflowDisplay(
                 entrypoint, workflow_display, node_displays, overrides=entrypoint_display_overrides
             )
 
-        edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplayType] = {}
+        edge_displays: Dict[Tuple[Port, Type[BaseNode]], EdgeDisplay] = {}
         for edge in self._workflow.get_edges():
             if edge in edge_displays:
                 continue
 
             edge_display_overrides = self.edge_displays.get((edge.from_port, edge.to_node))
             edge_displays[(edge.from_port, edge.to_node)] = self._generate_edge_display(
-                edge, node_displays, port_displays, overrides=edge_display_overrides
+                edge, node_displays, overrides=edge_display_overrides
             )
 
         for edge in self._workflow.get_unused_edges():
@@ -289,7 +282,7 @@ class BaseWorkflowDisplay(
 
             edge_display_overrides = self.edge_displays.get((edge.from_port, edge.to_node))
             edge_displays[(edge.from_port, edge.to_node)] = self._generate_edge_display(
-                edge, node_displays, port_displays, overrides=edge_display_overrides
+                edge, node_displays, overrides=edge_display_overrides
             )
 
         workflow_output_displays: Dict[BaseDescriptor, WorkflowOutputDisplay] = {}
@@ -347,7 +340,7 @@ class BaseWorkflowDisplay(
         self,
         entrypoint: Type[BaseNode],
         workflow_display: WorkflowMetaDisplayType,
-        node_displays: Dict[Type[BaseNode], NodeDisplayType],
+        node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
         overrides: Optional[EntrypointDisplayOverridesType] = None,
     ) -> EntrypointDisplayType:
         pass
@@ -357,16 +350,6 @@ class BaseWorkflowDisplay(
 
         return WorkflowOutputDisplay(id=output_id, name=output.name)
 
-    @abstractmethod
-    def _generate_edge_display(
-        self,
-        edge: Edge,
-        node_displays: Dict[Type[BaseNode], NodeDisplayType],
-        port_displays: Dict[Port, PortDisplay],
-        overrides: Optional[EdgeDisplayOverridesType] = None,
-    ) -> EdgeDisplayType:
-        pass
-
     def __init_subclass__(cls, **kwargs: Any) -> None:
         super().__init_subclass__(**kwargs)
 
@@ -443,9 +426,9 @@ class BaseWorkflowDisplay(
         )
         return display_meta
 
-    def _extract_node_displays(self, node: Type[BaseNode]) -> Dict[Type[BaseNode], NodeDisplayType]:
+    def _extract_node_displays(self, node: Type[BaseNode]) -> Dict[Type[BaseNode], BaseNodeDisplay]:
         node_display = self._get_node_display(node)
-        additional_node_displays: Dict[Type[BaseNode], NodeDisplayType] = {
+        additional_node_displays: Dict[Type[BaseNode], BaseNodeDisplay] = {
             node: node_display,
         }
 
@@ -459,3 +442,31 @@ class BaseWorkflowDisplay(
                     additional_node_displays[node] = display
 
         return additional_node_displays
+
+    def _generate_edge_display(
+        self,
+        edge: Edge,
+        node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
+        overrides: Optional[EdgeDisplay] = None,
+    ) -> EdgeDisplay:
+        source_node = get_unadorned_node(edge.from_port.node_class)
+        target_node = get_unadorned_node(edge.to_node)
+
+        source_node_id = node_displays[source_node].node_id
+        target_node_id = node_displays[target_node].node_id
+
+        return self._generate_edge_display_from_source(source_node_id, target_node_id, overrides)
+
+    def _generate_edge_display_from_source(
+        self,
+        source_node_id: UUID,
+        target_node_id: UUID,
+        overrides: Optional[EdgeDisplay] = None,
+    ) -> EdgeDisplay:
+        edge_id: UUID
+        if overrides:
+            edge_id = overrides.id
+        else:
+            edge_id = uuid4_from_hash(f"{self.workflow_id}|id|{source_node_id}|{target_node_id}")
+
+        return EdgeDisplay(id=edge_id)

vellum_ee/workflows/display/workflows/vellum_workflow_display.py

@@ -1,14 +1,12 @@
 import logging
 from uuid import UUID
-from typing import Dict, List, Optional, Type, cast
+from typing import Dict, Optional, Type, cast
 
 from vellum.workflows.descriptors.base import BaseDescriptor
-from vellum.workflows.edges import Edge
 from vellum.workflows.nodes.bases import BaseNode
 from vellum.workflows.nodes.displayable.bases.utils import primitive_to_vellum_value
 from vellum.workflows.nodes.displayable.final_output_node import FinalOutputNode
 from vellum.workflows.nodes.utils import get_unadorned_node, get_unadorned_port
-from vellum.workflows.ports import Port
 from vellum.workflows.references import WorkflowInputReference
 from vellum.workflows.references.output import OutputReference
 from vellum.workflows.types.core import JsonArray, JsonObject
@@ -16,12 +14,9 @@ from vellum.workflows.types.generics import WorkflowType
 from vellum.workflows.utils.uuids import uuid4_from_hash
 from vellum_ee.workflows.display.nodes.base_node_display import BaseNodeDisplay
 from vellum_ee.workflows.display.nodes.base_node_vellum_display import BaseNodeVellumDisplay
-from vellum_ee.workflows.display.nodes.types import PortDisplay
 from vellum_ee.workflows.display.nodes.vellum.utils import create_node_input
 from vellum_ee.workflows.display.utils.vellum import infer_vellum_variable_type
 from vellum_ee.workflows.display.vellum import (
-    EdgeVellumDisplay,
-    EdgeVellumDisplayOverrides,
     EntrypointVellumDisplay,
     EntrypointVellumDisplayOverrides,
     NodeDisplayData,
@@ -46,11 +41,8 @@ class VellumWorkflowDisplay(
         WorkflowInputsVellumDisplayOverrides,
         StateValueVellumDisplay,
         StateValueVellumDisplayOverrides,
-        BaseNodeDisplay,
         EntrypointVellumDisplay,
         EntrypointVellumDisplayOverrides,
-        EdgeVellumDisplay,
-        EdgeVellumDisplayOverrides,
     ]
 ):
     node_display_base_class = BaseNodeDisplay
@@ -99,14 +91,16 @@ class VellumWorkflowDisplay(
         edges: JsonArray = []
 
         # Add a single synthetic node for the workflow entrypoint
+        entrypoint_node_id = self.display_context.workflow_display.entrypoint_node_id
+        entrypoint_node_source_handle_id = self.display_context.workflow_display.entrypoint_node_source_handle_id
         nodes.append(
             {
-                "id": str(self.display_context.workflow_display.entrypoint_node_id),
+                "id": str(entrypoint_node_id),
                 "type": "ENTRYPOINT",
                 "inputs": [],
                 "data": {
                     "label": "Entrypoint Node",
-                    "source_handle_id": str(self.display_context.workflow_display.entrypoint_node_source_handle_id),
+                    "source_handle_id": str(entrypoint_node_source_handle_id),
                 },
                 "display_data": self.display_context.workflow_display.entrypoint_node_display.dict(),
                 "base": None,
@@ -245,25 +239,37 @@ class VellumWorkflowDisplay(
             )
 
         # Add an edge for each edge in the workflow
-        all_edge_displays: List[EdgeVellumDisplay] = [
-            # Create a synthetic edge from the synthetic entrypoint node to each actual entrypoint
-            *[
-                entrypoint_display.edge_display
-                for entrypoint_display in self.display_context.entrypoint_displays.values()
-            ],
-            # Include the concrete edges in the workflow
-            *self.display_context.edge_displays.values(),
-        ]
+        for target_node, entrypoint_display in self.display_context.entrypoint_displays.items():
+            unadorned_target_node = get_unadorned_node(target_node)
+            target_node_display = self.display_context.node_displays[unadorned_target_node]
+            edges.append(
+                {
+                    "id": str(entrypoint_display.edge_display.id),
+                    "source_node_id": str(entrypoint_node_id),
+                    "source_handle_id": str(entrypoint_node_source_handle_id),
+                    "target_node_id": str(target_node_display.node_id),
+                    "target_handle_id": str(target_node_display.get_trigger_id()),
+                    "type": "DEFAULT",
+                }
+            )
+
+        for (source_node_port, target_node), edge_display in self.display_context.edge_displays.items():
+            unadorned_source_node_port = get_unadorned_port(source_node_port)
+            unadorned_target_node = get_unadorned_node(target_node)
+
+            source_node_port_display = self.display_context.port_displays[unadorned_source_node_port]
+            target_node_display = self.display_context.node_displays[unadorned_target_node]
 
-        for edge_display in all_edge_displays:
             edges.append(
                 {
                     "id": str(edge_display.id),
-                    "source_node_id": str(edge_display.source_node_id),
-                    "source_handle_id": str(edge_display.source_handle_id),
-                    "target_node_id": str(edge_display.target_node_id),
-                    "target_handle_id": str(edge_display.target_handle_id),
-                    "type": edge_display.type,
+                    "source_node_id": str(source_node_port_display.node_id),
+                    "source_handle_id": str(source_node_port_display.id),
+                    "target_node_id": str(target_node_display.node_id),
+                    "target_handle_id": str(
+                        target_node_display.get_target_handle_id_by_source_node_id(source_node_port_display.node_id)
+                    ),
+                    "type": "DEFAULT",
                 }
             )
 
@@ -345,7 +351,6 @@ class VellumWorkflowDisplay(
         overrides: Optional[EntrypointVellumDisplayOverrides] = None,
     ) -> EntrypointVellumDisplay:
         entrypoint_node_id = workflow_display.entrypoint_node_id
-        source_handle_id = workflow_display.entrypoint_node_source_handle_id
 
         edge_display_overrides = overrides.edge_display if overrides else None
         entrypoint_id = (
@@ -357,61 +362,9 @@ class VellumWorkflowDisplay(
         entrypoint_target = get_unadorned_node(entrypoint)
         target_node_display = node_displays[entrypoint_target]
         target_node_id = target_node_display.node_id
-        if isinstance(target_node_display, BaseNodeVellumDisplay):
-            target_handle_id = target_node_display.get_target_handle_id_by_source_node_id(entrypoint_node_id)
-        else:
-            target_handle_id = target_node_display.get_trigger_id()
 
         edge_display = self._generate_edge_display_from_source(
-            entrypoint_node_id, source_handle_id, target_node_id, target_handle_id, overrides=edge_display_overrides
+            entrypoint_node_id, target_node_id, overrides=edge_display_overrides
         )
 
         return EntrypointVellumDisplay(id=entrypoint_id, edge_display=edge_display)
-
-    def _generate_edge_display(
-        self,
-        edge: Edge,
-        node_displays: Dict[Type[BaseNode], BaseNodeDisplay],
-        port_displays: Dict[Port, PortDisplay],
-        overrides: Optional[EdgeVellumDisplayOverrides] = None,
-    ) -> EdgeVellumDisplay:
-        source_node = get_unadorned_node(edge.from_port.node_class)
-        target_node = get_unadorned_node(edge.to_node)
-
-        source_node_id = node_displays[source_node].node_id
-        from_port = get_unadorned_port(edge.from_port)
-        source_handle_id = port_displays[from_port].id
-
-        target_node_display = node_displays[target_node]
-        target_node_id = target_node_display.node_id
-
-        if isinstance(target_node_display, BaseNodeVellumDisplay):
-            target_handle_id = target_node_display.get_target_handle_id_by_source_node_id(source_node_id)
-        else:
-            target_handle_id = target_node_display.get_trigger_id()
-
-        return self._generate_edge_display_from_source(
-            source_node_id, source_handle_id, target_node_id, target_handle_id, overrides
-        )
-
-    def _generate_edge_display_from_source(
-        self,
-        source_node_id: UUID,
-        source_handle_id: UUID,
-        target_node_id: UUID,
-        target_handle_id: UUID,
-        overrides: Optional[EdgeVellumDisplayOverrides] = None,
-    ) -> EdgeVellumDisplay:
-        edge_id: UUID
-        if overrides:
-            edge_id = overrides.id
-        else:
-            edge_id = uuid4_from_hash(f"{self.workflow_id}|id|{source_node_id}|{target_node_id}")
-
-        return EdgeVellumDisplay(
-            id=edge_id,
-            source_node_id=source_node_id,
-            target_node_id=target_node_id,
-            source_handle_id=source_handle_id,
-            target_handle_id=target_handle_id,
-        )