vellum-ai 0.12.17__py3-none-any.whl → 0.13.1__py3-none-any.whl

vellum_ee/workflows/display/tests/workflow_serialization/generic_nodes/test_trigger_serialization.py

@@ -14,22 +14,6 @@ class BasicGenericNode(BaseNode):
         output = Inputs.input
 
 
-class AwaitAnyGenericNode(BaseNode):
-    class Outputs(BaseNode.Outputs):
-        output = Inputs.input
-
-    class Trigger(BaseNode.Trigger):
-        merge_behavior = MergeBehavior.AWAIT_ANY
-
-
-class AwaitAllGenericNode(BaseNode):
-    class Outputs(BaseNode.Outputs):
-        output = Inputs.input
-
-    class Trigger(BaseNode.Trigger):
-        merge_behavior = MergeBehavior.AWAIT_ALL
-
-
 def test_serialize_node__basic(serialize_node):
     serialized_node = serialize_node(BasicGenericNode)
     assert not DeepDiff(
@@ -38,6 +22,7 @@ def test_serialize_node__basic(serialize_node):
             "label": "BasicGenericNode",
             "type": "GENERIC",
             "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
             "definition": {
                 "name": "BasicGenericNode",
                 "module": [
@@ -49,10 +34,14 @@ def test_serialize_node__basic(serialize_node):
                     "generic_nodes",
                     "test_trigger_serialization",
                 ],
-                "bases": [{"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]}],
             },
             "trigger": {"id": "9d3a1b3d-4a38-4f2e-bbf1-dd8be152bce8", "merge_behavior": "AWAIT_ANY"},
-            "ports": [],
+            "ports": [
+                {
+                    "id": "4fbf0fff-a42e-4410-852a-238b5059198e",
+                    "type": "DEFAULT",
+                }
+            ],
             "adornments": None,
             "attributes": [],
         },
@@ -61,6 +50,14 @@ def test_serialize_node__basic(serialize_node):
     )
 
 
+class AwaitAnyGenericNode(BaseNode):
+    class Outputs(BaseNode.Outputs):
+        output = Inputs.input
+
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ANY
+
+
 def test_serialize_node__await_any(serialize_node):
     serialized_node = serialize_node(AwaitAnyGenericNode)
     assert not DeepDiff(
@@ -69,6 +66,7 @@ def test_serialize_node__await_any(serialize_node):
             "label": "AwaitAnyGenericNode",
             "type": "GENERIC",
             "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
             "definition": {
                 "name": "AwaitAnyGenericNode",
                 "module": [
@@ -80,10 +78,14 @@ def test_serialize_node__await_any(serialize_node):
                     "generic_nodes",
                     "test_trigger_serialization",
                 ],
-                "bases": [{"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]}],
             },
             "trigger": {"id": "ffa72187-9a18-453f-ae55-b77aad332630", "merge_behavior": "AWAIT_ANY"},
-            "ports": [],
+            "ports": [
+                {
+                    "id": "3e219c0a-e5f8-443a-ac78-1a458b189009",
+                    "type": "DEFAULT",
+                }
+            ],
             "adornments": None,
             "attributes": [],
         },
@@ -92,6 +94,14 @@ def test_serialize_node__await_any(serialize_node):
     )
 
 
+class AwaitAllGenericNode(BaseNode):
+    class Outputs(BaseNode.Outputs):
+        output = Inputs.input
+
+    class Trigger(BaseNode.Trigger):
+        merge_behavior = MergeBehavior.AWAIT_ALL
+
+
 def test_serialize_node__await_all(serialize_node):
     serialized_node = serialize_node(AwaitAllGenericNode)
     assert not DeepDiff(
@@ -100,6 +110,7 @@ def test_serialize_node__await_all(serialize_node):
             "label": "AwaitAllGenericNode",
             "type": "GENERIC",
             "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "base": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]},
             "definition": {
                 "name": "AwaitAllGenericNode",
                 "module": [
@@ -111,10 +122,14 @@ def test_serialize_node__await_all(serialize_node):
                     "generic_nodes",
                     "test_trigger_serialization",
                 ],
-                "bases": [{"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"]}],
             },
             "trigger": {"id": "62074276-c817-476d-b59d-da523ae3f218", "merge_behavior": "AWAIT_ALL"},
-            "ports": [],
+            "ports": [
+                {
+                    "id": "9797e93f-9fe6-48b2-a48e-476abbd20e32",
+                    "type": "DEFAULT",
+                }
+            ],
             "adornments": None,
             "attributes": [],
         },

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

@@ -66,17 +66,8 @@ def test_serialize_workflow(vellum_client):
         "inputs": [],
         "data": {"label": "Entrypoint Node", "source_handle_id": "8eaa7f02-25ff-4a00-9b0a-5185718d89b3"},
         "display_data": {"position": {"x": 0.0, "y": 0.0}},
-        "definition": {
-            "name": "BaseNode",
-            "module": [
-                "vellum",
-                "workflows",
-                "nodes",
-                "bases",
-                "base",
-            ],
-            "bases": [],
-        },
+        "base": None,
+        "definition": None,
     }
 
     api_node = workflow_raw_data["nodes"][1]
@@ -195,12 +186,13 @@ def test_serialize_workflow(vellum_client):
                 "status_code_output_id": "fecc16c3-400e-4fd3-8223-08366070e3b1",
             },
             "display_data": {"position": {"x": 0.0, "y": 0.0}},
+            "base": {
+                "name": "APINode",
+                "module": ["vellum", "workflows", "nodes", "displayable", "api_node", "node"],
+            },
             "definition": {
                 "name": "SimpleAPINode",
                 "module": ["tests", "workflows", "basic_vellum_api_node", "workflow"],
-                "bases": [
-                    {"name": "APINode", "module": ["vellum", "workflows", "nodes", "displayable", "api_node", "node"]}
-                ],
             },
         },
         api_node,
@@ -239,7 +231,7 @@ def test_serialize_workflow(vellum_client):
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": [
                         "vellum",
@@ -249,20 +241,8 @@ def test_serialize_workflow(vellum_client):
                         "final_output_node",
                         "node",
                     ],
-                    "bases": [
-                        {
-                            "name": "BaseNode",
-                            "module": [
-                                "vellum",
-                                "workflows",
-                                "nodes",
-                                "bases",
-                                "base",
-                            ],
-                            "bases": [],
-                        }
-                    ],
                 },
+                "definition": None,
             },
             {
                 "id": "736f9bd0-f487-42af-bdb3-780b4941c61c",
@@ -294,7 +274,7 @@ def test_serialize_workflow(vellum_client):
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": [
                         "vellum",
@@ -304,20 +284,8 @@ def test_serialize_workflow(vellum_client):
                         "final_output_node",
                         "node",
                     ],
-                    "bases": [
-                        {
-                            "name": "BaseNode",
-                            "module": [
-                                "vellum",
-                                "workflows",
-                                "nodes",
-                                "bases",
-                                "base",
-                            ],
-                            "bases": [],
-                        }
-                    ],
                 },
+                "definition": None,
             },
             {
                 "id": "3f3ffc50-b156-48ac-b5f3-f68cb05c2b90",
@@ -349,7 +317,7 @@ def test_serialize_workflow(vellum_client):
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": [
                         "vellum",
@@ -359,20 +327,8 @@ def test_serialize_workflow(vellum_client):
                         "final_output_node",
                         "node",
                     ],
-                    "bases": [
-                        {
-                            "name": "BaseNode",
-                            "module": [
-                                "vellum",
-                                "workflows",
-                                "nodes",
-                                "bases",
-                                "base",
-                            ],
-                            "bases": [],
-                        }
-                    ],
                 },
+                "definition": None,
             },
         ],
         final_output_nodes,

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

@@ -54,7 +54,8 @@ def test_serialize_workflow_with_filepath():
         "inputs": [],
         "data": {"label": "Entrypoint Node", "source_handle_id": "118e4298-aa79-467c-b8b4-2df540905e86"},
         "display_data": {"position": {"x": 0.0, "y": 0.0}},
-        "definition": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"], "bases": []},
+        "base": None,
+        "definition": None,
     }
 
     code_execution_node = workflow_raw_data["nodes"][1]
@@ -97,26 +98,19 @@ def test_serialize_workflow_with_filepath():
             "log_output_id": "7cac05e3-b7c3-475e-8df8-422b496c3398",
         },
         "display_data": {"position": {"x": 0.0, "y": 0.0}},
-        "definition": {
-            "bases": [
-                {
-                    "module": [
-                        "vellum",
-                        "workflows",
-                        "nodes",
-                        "displayable",
-                        "code_execution_node",
-                        "node",
-                    ],
-                    "name": "CodeExecutionNode",
-                }
-            ],
+        "base": {
             "module": [
-                "tests",
+                "vellum",
                 "workflows",
-                "basic_code_execution_node",
-                "workflow",
+                "nodes",
+                "displayable",
+                "code_execution_node",
+                "node",
             ],
+            "name": "CodeExecutionNode",
+        },
+        "definition": {
+            "module": ["tests", "workflows", "basic_code_execution_node", "workflow"],
             "name": "SimpleCodeExecutionNode",
         },
     }
@@ -152,13 +146,11 @@ def test_serialize_workflow_with_filepath():
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
-                    "bases": [
-                        {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"], "bases": []}
-                    ],
                 },
+                "definition": None,
             },
             {
                 "id": "c6e3aced-1fc9-48d2-ae55-d2a880e359cb",
@@ -190,13 +182,11 @@ def test_serialize_workflow_with_filepath():
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
-                    "bases": [
-                        {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"], "bases": []}
-                    ],
                 },
+                "definition": None,
             },
         ],
         workflow_raw_data["nodes"][2:],
@@ -304,7 +294,8 @@ def test_serialize_workflow_with_code():
         "inputs": [],
         "data": {"label": "Entrypoint Node", "source_handle_id": "e82390bb-c68c-48c1-9f87-7fbfff494c45"},
         "display_data": {"position": {"x": 0.0, "y": 0.0}},
-        "definition": {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"], "bases": []},
+        "base": None,
+        "definition": None,
     }
 
     code_execution_node = workflow_raw_data["nodes"][1]
@@ -347,15 +338,13 @@ def test_serialize_workflow_with_code():
             "log_output_id": "7cac05e3-b7c3-475e-8df8-422b496c3398",
         },
         "display_data": {"position": {"x": 0.0, "y": 0.0}},
+        "base": {
+            "name": "CodeExecutionNode",
+            "module": ["vellum", "workflows", "nodes", "displayable", "code_execution_node", "node"],
+        },
         "definition": {
             "name": "SimpleCodeExecutionNode",
             "module": ["tests", "workflows", "basic_code_execution_node", "workflow_with_code"],
-            "bases": [
-                {
-                    "name": "CodeExecutionNode",
-                    "module": ["vellum", "workflows", "nodes", "displayable", "code_execution_node", "node"],
-                }
-            ],
         },
     }
     assert not DeepDiff(
@@ -390,13 +379,11 @@ def test_serialize_workflow_with_code():
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
-                    "bases": [
-                        {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"], "bases": []}
-                    ],
                 },
+                "definition": None,
             },
             {
                 "id": "eccf97c7-e766-471f-9703-4d2595800e66",
@@ -428,13 +415,11 @@ def test_serialize_workflow_with_code():
                     }
                 ],
                 "display_data": {"position": {"x": 0.0, "y": 0.0}},
-                "definition": {
+                "base": {
                     "name": "FinalOutputNode",
                     "module": ["vellum", "workflows", "nodes", "displayable", "final_output_node", "node"],
-                    "bases": [
-                        {"name": "BaseNode", "module": ["vellum", "workflows", "nodes", "bases", "base"], "bases": []}
-                    ],
                 },
+                "definition": None,
             },
         ],
         workflow_raw_data["nodes"][2:],
@@ -539,17 +524,8 @@ def test_serialize_workflow__try_wrapped():
             "label": "Entrypoint Node",
             "source_handle_id": "8cd1e612-39aa-4471-88cf-f7999b713fa6",
         },
-        "definition": {
-            "bases": [],
-            "module": [
-                "vellum",
-                "workflows",
-                "nodes",
-                "bases",
-                "base",
-            ],
-            "name": "BaseNode",
-        },
+        "base": None,
+        "definition": None,
         "display_data": {
             "position": {"x": 0.0, "y": 0.0},
         },
@@ -595,20 +571,18 @@ def test_serialize_workflow__try_wrapped():
             "log_output_id": "7cac05e3-b7c3-475e-8df8-422b496c3398",
         },
         "display_data": {"position": {"x": 0.0, "y": 0.0}},
-        "definition": {
-            "bases": [
-                {
-                    "module": [
-                        "vellum",
-                        "workflows",
-                        "nodes",
-                        "displayable",
-                        "code_execution_node",
-                        "node",
-                    ],
-                    "name": "CodeExecutionNode",
-                }
+        "base": {
+            "module": [
+                "vellum",
+                "workflows",
+                "nodes",
+                "displayable",
+                "code_execution_node",
+                "node",
             ],
+            "name": "CodeExecutionNode",
+        },
+        "definition": {
             "module": [
                 "tests",
                 "workflows",
@@ -627,20 +601,7 @@ def test_serialize_workflow__try_wrapped():
             {
                 "id": "af4fc1ef-7701-43df-b5e7-4f354f707db2",
                 "type": "TERMINAL",
-                "definition": {
-                    "bases": [
-                        {
-                            "bases": [],
-                            "module": [
-                                "vellum",
-                                "workflows",
-                                "nodes",
-                                "bases",
-                                "base",
-                            ],
-                            "name": "BaseNode",
-                        },
-                    ],
+                "base": {
                     "module": [
                         "vellum",
                         "workflows",
@@ -651,6 +612,7 @@ def test_serialize_workflow__try_wrapped():
                     ],
                     "name": "FinalOutputNode",
                 },
+                "definition": None,
                 "data": {
                     "label": "Final Output",
                     "name": "log",
@@ -682,20 +644,7 @@ def test_serialize_workflow__try_wrapped():
             {
                 "id": "4cbfa5f7-fc12-4ab2-81cb-168c5caef4f0",
                 "type": "TERMINAL",
-                "definition": {
-                    "bases": [
-                        {
-                            "bases": [],
-                            "module": [
-                                "vellum",
-                                "workflows",
-                                "nodes",
-                                "bases",
-                                "base",
-                            ],
-                            "name": "BaseNode",
-                        },
-                    ],
+                "base": {
                     "module": [
                         "vellum",
                         "workflows",
@@ -706,6 +655,7 @@ def test_serialize_workflow__try_wrapped():
                     ],
                     "name": "FinalOutputNode",
                 },
+                "definition": None,
                 "data": {
                     "label": "Final Output",
                     "name": "result",