vellum-ai 1.1.1__py3-none-any.whl → 1.1.3__py3-none-any.whl

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

@@ -45,54 +45,20 @@ def test_serialize_workflow():
         "id": "20adf593-c4f0-4c67-8e36-37eb66f28f66",
         "name": "functions",
         "value": {
-            "type": "ARRAY_REFERENCE",
-            "items": [
-                {
-                    "type": "DICTIONARY_REFERENCE",
-                    "entries": [
-                        {
-                            "id": "bcf2713b-19fc-4b4b-8ff5-b45c8e63c665",
-                            "key": "type",
-                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "STRING", "value": "MCP_SERVER"}},
-                        },
-                        {
-                            "id": "5a3aef6f-b8a1-4f37-8688-b513da42a35a",
-                            "key": "name",
-                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "STRING", "value": "github"}},
-                        },
-                        {
-                            "id": "641decf3-79c5-4ef9-9fc8-06570d8a69af",
-                            "key": "url",
-                            "value": {
-                                "type": "CONSTANT_VALUE",
-                                "value": {"type": "STRING", "value": "https://api.githubcopilot.com/mcp/"},
-                            },
-                        },
-                        {
-                            "id": "801a74ca-7966-4ac3-b1b5-bebb71a7de07",
-                            "key": "authorization_type",
-                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "STRING", "value": "BEARER_TOKEN"}},
-                        },
-                        {
-                            "id": "fcd70e2f-0fb2-4011-a73b-90d5d7643be4",
-                            "key": "bearer_token_value",
-                            "value": {
-                                "type": "ENVIRONMENT_VARIABLE",
-                                "environment_variable": "GITHUB_PERSONAL_ACCESS_TOKEN",
-                            },
-                        },
-                        {
-                            "id": "b2fa2900-0e09-44ff-99db-c5399fd76d28",
-                            "key": "api_key_header_key",
-                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
-                        },
-                        {
-                            "id": "6ab23414-5f1b-49c1-a0bc-891bbba9124c",
-                            "key": "api_key_header_value",
-                            "value": {"type": "CONSTANT_VALUE", "value": {"type": "JSON", "value": None}},
-                        },
-                    ],
-                }
-            ],
+            "type": "CONSTANT_VALUE",
+            "value": {
+                "type": "JSON",
+                "value": [
+                    {
+                        "type": "MCP_SERVER",
+                        "name": "github",
+                        "url": "https://api.githubcopilot.com/mcp/",
+                        "authorization_type": "BEARER_TOKEN",
+                        "bearer_token_value": "GITHUB_PERSONAL_ACCESS_TOKEN",
+                        "api_key_header_key": None,
+                        "api_key_header_value": None,
+                    }
+                ],
+            },
         },
     }

vellum_ee/workflows/display/types.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Dict, Tuple, Type
+from typing import TYPE_CHECKING, Dict, Iterator, List, Tuple, Type
 
 from vellum.client import Vellum as VellumClient
 from vellum.workflows.descriptors.base import BaseDescriptor
@@ -51,3 +51,16 @@ class WorkflowDisplayContext:
     workflow_output_displays: WorkflowOutputDisplays = field(default_factory=dict)
     edge_displays: EdgeDisplays = field(default_factory=dict)
     port_displays: PortDisplays = field(default_factory=dict)
+    _errors: List[Exception] = field(default_factory=list)
+    _dry_run: bool = False
+
+    def add_error(self, error: Exception) -> None:
+        if self._dry_run:
+            self._errors.append(error)
+            return
+
+        raise error
+
+    @property
+    def errors(self) -> Iterator[Exception]:
+        return iter(self._errors)

vellum_ee/workflows/display/utils/expressions.py

@@ -266,10 +266,19 @@ def serialize_value(display_context: "WorkflowDisplayContext", value: Any) -> Js
         }
 
     if isinstance(value, EnvironmentVariableReference):
-        return {
-            "type": "ENVIRONMENT_VARIABLE",
-            "environment_variable": value.name,
-        }
+        if value.serialize_as_constant:
+            return {
+                "type": "CONSTANT_VALUE",
+                "value": {
+                    "type": "STRING",
+                    "value": value.name,
+                },
+            }
+        else:
+            return {
+                "type": "ENVIRONMENT_VARIABLE",
+                "environment_variable": value.name,
+            }
 
     if isinstance(value, ExecutionCountReference):
         node_class_display = display_context.global_node_displays[value.node_class]

vellum_ee/workflows/display/workflows/base_workflow_display.py

@@ -6,7 +6,7 @@ import inspect
 import logging
 import os
 from uuid import UUID
-from typing import Any, Dict, ForwardRef, Generic, Iterator, List, Optional, Tuple, Type, TypeVar, Union, cast, get_args
+from typing import Any, Dict, ForwardRef, Generic, List, Optional, Tuple, Type, TypeVar, Union, cast, get_args
 
 from vellum.client import Vellum as VellumClient
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
@@ -96,8 +96,6 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
     # Used to explicitly specify display data for a workflow's ports.
     port_displays: PortDisplays = {}
 
-    _errors: List[Exception]
-
     _serialized_files: List[str]
 
     _dry_run: bool
@@ -116,7 +114,6 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
             if self._parent_display_context
             else create_vellum_client()
         )
-        self._errors = []
         self._serialized_files = []
         self._dry_run = dry_run
 
@@ -196,7 +193,7 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
             try:
                 serialized_node = node_display.serialize(self.display_context)
             except (NotImplementedError, NodeValidationError) as e:
-                self.add_error(e)
+                self.display_context.add_error(e)
                 continue
 
             serialized_nodes[node_display.node_id] = serialized_node
@@ -315,7 +312,7 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
         # If there are terminal nodes with no workflow output reference,
         # raise a serialization error
         if len(unreferenced_final_output_node_outputs) > 0:
-            self.add_error(
+            self.display_context.add_error(
                 ValueError("Unable to serialize terminal nodes that are not referenced by workflow outputs.")
             )
 
@@ -375,7 +372,7 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
             try:
                 self._apply_auto_layout(nodes_dict_list, edges)
             except Exception as e:
-                self.add_error(e)
+                self.display_context.add_error(e)
 
         return {
             "workflow_raw_data": {
@@ -446,17 +443,6 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
         """Can be overridden as a class attribute to specify a custom workflow id."""
         return self._workflow.__id__
 
-    def add_error(self, error: Exception) -> None:
-        if self._dry_run:
-            self._errors.append(error)
-            return
-
-        raise error
-
-    @property
-    def errors(self) -> Iterator[Exception]:
-        return iter(self._errors)
-
     def _enrich_global_node_output_displays(
         self,
         node: Type[BaseNode],
@@ -606,6 +592,7 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
             edge_displays=edge_displays,
             port_displays=port_displays,
             workflow_display_class=self.__class__,
+            _dry_run=self._dry_run,
         )
 
     def _generate_workflow_meta_display(self) -> WorkflowMetaDisplay:
@@ -896,7 +883,7 @@ class BaseWorkflowDisplay(Generic[WorkflowType]):
 
         return WorkflowSerializationResult(
             exec_config=exec_config,
-            errors=[str(error) for error in workflow_display.errors],
+            errors=[str(error) for error in workflow_display.display_context.errors],
         )
 
     def _gather_additional_module_files(self, module_path: str) -> Dict[str, str]: