vellum-ai 0.14.41__py3-none-any.whl → 0.14.42__py3-none-any.whl

vellum/__init__.py

@@ -105,6 +105,7 @@ from .types import (
     ExecuteApiRequestBody,
     ExecuteApiRequestHeadersValue,
     ExecuteApiResponse,
+    ExecuteApiResponseJson,
     ExecutePromptEvent,
     ExecutePromptResponse,
     ExecuteWorkflowResponse,
@@ -229,7 +230,6 @@ from .types import (
     NamedTestCaseVariableValue,
     NamedTestCaseVariableValueRequest,
     NewMemberJoinBehaviorEnum,
-    NodeEventDisplayContext,
     NodeExecutionFulfilledBody,
     NodeExecutionFulfilledEvent,
     NodeExecutionInitiatedBody,
@@ -518,7 +518,6 @@ from .types import (
     WorkflowDeploymentReleaseWorkflowDeployment,
     WorkflowDeploymentReleaseWorkflowVersion,
     WorkflowError,
-    WorkflowEventDisplayContext,
     WorkflowEventError,
     WorkflowEventExecutionRead,
     WorkflowExecutionActual,
@@ -728,6 +727,7 @@ __all__ = [
     "ExecuteApiRequestBody",
     "ExecuteApiRequestHeadersValue",
     "ExecuteApiResponse",
+    "ExecuteApiResponseJson",
     "ExecutePromptEvent",
     "ExecutePromptResponse",
     "ExecuteWorkflowResponse",
@@ -858,7 +858,6 @@ __all__ = [
     "NamedTestCaseVariableValue",
     "NamedTestCaseVariableValueRequest",
     "NewMemberJoinBehaviorEnum",
-    "NodeEventDisplayContext",
     "NodeExecutionFulfilledBody",
     "NodeExecutionFulfilledEvent",
     "NodeExecutionInitiatedBody",
@@ -1151,7 +1150,6 @@ __all__ = [
     "WorkflowDeploymentReleaseWorkflowVersion",
     "WorkflowDeploymentsListRequestStatus",
     "WorkflowError",
-    "WorkflowEventDisplayContext",
     "WorkflowEventError",
     "WorkflowEventExecutionRead",
     "WorkflowExecutionActual",

vellum/client/core/client_wrapper.py

@@ -18,7 +18,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "vellum-ai",
-            "X-Fern-SDK-Version": "0.14.41",
+            "X-Fern-SDK-Version": "0.14.42",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

vellum/client/reference.md

@@ -3408,7 +3408,7 @@ client.documents.retrieve(
 <dl>
 <dd>
 
-**id:** `str` — A UUID string identifying this document.
+**id:** `str` 
     
 </dd>
 </dl>
@@ -3478,7 +3478,7 @@ client.documents.destroy(
 <dl>
 <dd>
 
-**id:** `str` — A UUID string identifying this document.
+**id:** `str` 
     
 </dd>
 </dl>
@@ -3548,7 +3548,7 @@ client.documents.partial_update(
 <dl>
 <dd>
 
-**id:** `str` — A UUID string identifying this document.
+**id:** `str` 
     
 </dd>
 </dl>

vellum/client/resources/documents/client.py

@@ -106,7 +106,6 @@ class DocumentsClient:
         Parameters
         ----------
         id : str
-            A UUID string identifying this document.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -154,7 +153,6 @@ class DocumentsClient:
         Parameters
         ----------
         id : str
-            A UUID string identifying this document.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -203,7 +201,6 @@ class DocumentsClient:
         Parameters
         ----------
         id : str
-            A UUID string identifying this document.
 
         label : typing.Optional[str]
             A human-readable label for the document. Defaults to the originally uploaded file's file name.
@@ -471,7 +468,6 @@ class AsyncDocumentsClient:
         Parameters
         ----------
         id : str
-            A UUID string identifying this document.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -527,7 +523,6 @@ class AsyncDocumentsClient:
         Parameters
         ----------
         id : str
-            A UUID string identifying this document.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -584,7 +579,6 @@ class AsyncDocumentsClient:
         Parameters
         ----------
         id : str
-            A UUID string identifying this document.
 
         label : typing.Optional[str]
             A human-readable label for the document. Defaults to the originally uploaded file's file name.

vellum/client/types/__init__.py

@@ -109,6 +109,7 @@ from .execute_api_request_bearer_token import ExecuteApiRequestBearerToken
 from .execute_api_request_body import ExecuteApiRequestBody
 from .execute_api_request_headers_value import ExecuteApiRequestHeadersValue
 from .execute_api_response import ExecuteApiResponse
+from .execute_api_response_json import ExecuteApiResponseJson
 from .execute_prompt_event import ExecutePromptEvent
 from .execute_prompt_response import ExecutePromptResponse
 from .execute_workflow_response import ExecuteWorkflowResponse
@@ -237,7 +238,6 @@ from .named_test_case_string_variable_value_request import NamedTestCaseStringVa
 from .named_test_case_variable_value import NamedTestCaseVariableValue
 from .named_test_case_variable_value_request import NamedTestCaseVariableValueRequest
 from .new_member_join_behavior_enum import NewMemberJoinBehaviorEnum
-from .node_event_display_context import NodeEventDisplayContext
 from .node_execution_fulfilled_body import NodeExecutionFulfilledBody
 from .node_execution_fulfilled_event import NodeExecutionFulfilledEvent
 from .node_execution_initiated_body import NodeExecutionInitiatedBody
@@ -542,7 +542,6 @@ from .workflow_deployment_release import WorkflowDeploymentRelease
 from .workflow_deployment_release_workflow_deployment import WorkflowDeploymentReleaseWorkflowDeployment
 from .workflow_deployment_release_workflow_version import WorkflowDeploymentReleaseWorkflowVersion
 from .workflow_error import WorkflowError
-from .workflow_event_display_context import WorkflowEventDisplayContext
 from .workflow_event_error import WorkflowEventError
 from .workflow_event_execution_read import WorkflowEventExecutionRead
 from .workflow_execution_actual import WorkflowExecutionActual
@@ -715,6 +714,7 @@ __all__ = [
     "ExecuteApiRequestBody",
     "ExecuteApiRequestHeadersValue",
     "ExecuteApiResponse",
+    "ExecuteApiResponseJson",
     "ExecutePromptEvent",
     "ExecutePromptResponse",
     "ExecuteWorkflowResponse",
@@ -839,7 +839,6 @@ __all__ = [
     "NamedTestCaseVariableValue",
     "NamedTestCaseVariableValueRequest",
     "NewMemberJoinBehaviorEnum",
-    "NodeEventDisplayContext",
     "NodeExecutionFulfilledBody",
     "NodeExecutionFulfilledEvent",
     "NodeExecutionInitiatedBody",
@@ -1128,7 +1127,6 @@ __all__ = [
     "WorkflowDeploymentReleaseWorkflowDeployment",
     "WorkflowDeploymentReleaseWorkflowVersion",
     "WorkflowError",
-    "WorkflowEventDisplayContext",
     "WorkflowEventError",
     "WorkflowEventExecutionRead",
     "WorkflowExecutionActual",

vellum/client/types/execute_api_response.py

@@ -2,8 +2,9 @@
 
 from ..core.pydantic_utilities import UniversalBaseModel
 import typing_extensions
-import typing
+from .execute_api_response_json import ExecuteApiResponseJson
 from ..core.serialization import FieldMetadata
+import typing
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
 
@@ -11,9 +12,7 @@ import pydantic
 class ExecuteApiResponse(UniversalBaseModel):
     status_code: int
     text: str
-    json_: typing_extensions.Annotated[
-        typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]], FieldMetadata(alias="json")
-    ] = None
+    json_: typing_extensions.Annotated[ExecuteApiResponseJson, FieldMetadata(alias="json")]
     headers: typing.Dict[str, str]
 
     if IS_PYDANTIC_V2:

vellum/client/types/execute_api_response_json.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+ExecuteApiResponseJson = typing.Union[
+    typing.Dict[str, typing.Optional[typing.Any]], typing.List[typing.Optional[typing.Any]]
+]

vellum/client/types/prompt_settings.py

@@ -8,6 +8,7 @@ import pydantic
 
 class PromptSettings(UniversalBaseModel):
     timeout: typing.Optional[float] = None
+    stream_enabled: typing.Optional[bool] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

vellum/client/types/workflow_event_execution_read.py

@@ -10,8 +10,6 @@ from .workflow_deployment_parent_context import WorkflowDeploymentParentContext
 from .workflow_parent_context import WorkflowParentContext
 from .workflow_sandbox_parent_context import WorkflowSandboxParentContext
 from .array_vellum_value import ArrayVellumValue
-from .node_event_display_context import NodeEventDisplayContext
-from .workflow_event_display_context import WorkflowEventDisplayContext
 import typing
 import datetime as dt
 from .execution_vellum_value import ExecutionVellumValue
@@ -56,5 +54,3 @@ update_forward_refs(WorkflowDeploymentParentContext, WorkflowEventExecutionRead=
 update_forward_refs(WorkflowParentContext, WorkflowEventExecutionRead=WorkflowEventExecutionRead)
 update_forward_refs(WorkflowSandboxParentContext, WorkflowEventExecutionRead=WorkflowEventExecutionRead)
 update_forward_refs(ArrayVellumValue, WorkflowEventExecutionRead=WorkflowEventExecutionRead)
-update_forward_refs(NodeEventDisplayContext, WorkflowEventExecutionRead=WorkflowEventExecutionRead)
-update_forward_refs(WorkflowEventDisplayContext, WorkflowEventExecutionRead=WorkflowEventExecutionRead)

vellum/client/types/workflow_execution_initiated_body.py

@@ -1,19 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from __future__ import annotations
 from ..core.pydantic_utilities import UniversalBaseModel
-from .node_event_display_context import NodeEventDisplayContext
-from .workflow_event_display_context import WorkflowEventDisplayContext
 from .vellum_code_resource_definition import VellumCodeResourceDefinition
 import typing
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import pydantic
-from ..core.pydantic_utilities import update_forward_refs
 
 
 class WorkflowExecutionInitiatedBody(UniversalBaseModel):
     workflow_definition: VellumCodeResourceDefinition
-    display_context: typing.Optional[WorkflowEventDisplayContext] = None
     inputs: typing.Dict[str, typing.Optional[typing.Any]]
 
     if IS_PYDANTIC_V2:
@@ -24,7 +19,3 @@ class WorkflowExecutionInitiatedBody(UniversalBaseModel):
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
-
-
-update_forward_refs(NodeEventDisplayContext, WorkflowExecutionInitiatedBody=WorkflowExecutionInitiatedBody)
-update_forward_refs(WorkflowEventDisplayContext, WorkflowExecutionInitiatedBody=WorkflowExecutionInitiatedBody)

vellum/client/types/workflow_execution_initiated_event.py

@@ -9,8 +9,6 @@ from .span_link import SpanLink
 from .workflow_deployment_parent_context import WorkflowDeploymentParentContext
 from .workflow_parent_context import WorkflowParentContext
 from .workflow_sandbox_parent_context import WorkflowSandboxParentContext
-from .node_event_display_context import NodeEventDisplayContext
-from .workflow_event_display_context import WorkflowEventDisplayContext
 import typing
 from .parent_context import ParentContext
 from .workflow_execution_initiated_body import WorkflowExecutionInitiatedBody
@@ -49,5 +47,3 @@ update_forward_refs(SpanLink, WorkflowExecutionInitiatedEvent=WorkflowExecutionI
 update_forward_refs(WorkflowDeploymentParentContext, WorkflowExecutionInitiatedEvent=WorkflowExecutionInitiatedEvent)
 update_forward_refs(WorkflowParentContext, WorkflowExecutionInitiatedEvent=WorkflowExecutionInitiatedEvent)
 update_forward_refs(WorkflowSandboxParentContext, WorkflowExecutionInitiatedEvent=WorkflowExecutionInitiatedEvent)
-update_forward_refs(NodeEventDisplayContext, WorkflowExecutionInitiatedEvent=WorkflowExecutionInitiatedEvent)
-update_forward_refs(WorkflowEventDisplayContext, WorkflowExecutionInitiatedEvent=WorkflowExecutionInitiatedEvent)

vellum/client/types/workflow_execution_span.py

@@ -3,12 +3,10 @@
 from __future__ import annotations
 from ..core.pydantic_utilities import UniversalBaseModel
 from .api_request_parent_context import ApiRequestParentContext
-from .node_event_display_context import NodeEventDisplayContext
 from .node_parent_context import NodeParentContext
 from .prompt_deployment_parent_context import PromptDeploymentParentContext
 from .span_link import SpanLink
 from .workflow_deployment_parent_context import WorkflowDeploymentParentContext
-from .workflow_event_display_context import WorkflowEventDisplayContext
 from .workflow_parent_context import WorkflowParentContext
 from .workflow_sandbox_parent_context import WorkflowSandboxParentContext
 import typing
@@ -40,11 +38,9 @@ class WorkflowExecutionSpan(UniversalBaseModel):
 
 
 update_forward_refs(ApiRequestParentContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
-update_forward_refs(NodeEventDisplayContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
 update_forward_refs(NodeParentContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
 update_forward_refs(PromptDeploymentParentContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
 update_forward_refs(SpanLink, WorkflowExecutionSpan=WorkflowExecutionSpan)
 update_forward_refs(WorkflowDeploymentParentContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
-update_forward_refs(WorkflowEventDisplayContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
 update_forward_refs(WorkflowParentContext, WorkflowExecutionSpan=WorkflowExecutionSpan)
 update_forward_refs(WorkflowSandboxParentContext, WorkflowExecutionSpan=WorkflowExecutionSpan)

vellum/types/{node_event_display_context.py → execute_api_response_json.py}

@@ -1,3 +1,3 @@
 # WARNING: This file will be removed in a future release. Please import from "vellum.client" instead.
 
-from vellum.client.types.node_event_display_context import *
+from vellum.client.types.execute_api_response_json import *

vellum/workflows/inputs/base.py

@@ -1,4 +1,4 @@
-from typing import Any, Iterator, Tuple, Type, Union, get_args, get_origin
+from typing import Any, Dict, Iterator, Set, Tuple, Type, Union, get_args, get_origin
 from typing_extensions import dataclass_transform
 
 from pydantic import GetCoreSchemaHandler
@@ -14,11 +14,28 @@ from vellum.workflows.types.utils import get_class_attr_names, infer_types
 
 @dataclass_transform(kw_only_default=True)
 class _BaseInputsMeta(type):
+    def __new__(cls, name: str, bases: Tuple[Type, ...], dct: Dict[str, Any]) -> Any:
+        dct["__parent_class__"] = type(None)
+        return super().__new__(cls, name, bases, dct)
+
     def __getattribute__(cls, name: str) -> Any:
-        if not name.startswith("_") and name in cls.__annotations__ and issubclass(cls, BaseInputs):
+        if name.startswith("_") or not issubclass(cls, BaseInputs):
+            return super().__getattribute__(name)
+
+        attr_names = get_class_attr_names(cls)
+        if name in attr_names:
+            # We first try to resolve the instance that this class attribute name is mapped to. If it's not found,
+            # we iterate through its inheritance hierarchy to find the first base class that has this attribute
+            # and use its mapping.
             instance = vars(cls).get(name, undefined)
-            types = infer_types(cls, name)
+            if instance is undefined:
+                for base in cls.__mro__[1:]:
+                    inherited_input_reference = getattr(base, name, undefined)
+                    if isinstance(inherited_input_reference, (ExternalInputReference, WorkflowInputReference)):
+                        instance = inherited_input_reference.instance
+                        break
 
+            types = infer_types(cls, name)
             if getattr(cls, "__descriptor_class__", None) is ExternalInputReference:
                 return ExternalInputReference(name=name, types=types, instance=instance, inputs_class=cls)
             else:
@@ -29,14 +46,20 @@ class _BaseInputsMeta(type):
     def __iter__(cls) -> Iterator[InputReference]:
         # We iterate through the inheritance hierarchy to find all the WorkflowInputReference attached to this
         # Inputs class. __mro__ is the method resolution order, which is the order in which base classes are resolved.
+        yielded_attr_names: Set[str] = set()
+
         for resolved_cls in cls.__mro__:
             attr_names = get_class_attr_names(resolved_cls)
             for attr_name in attr_names:
+                if attr_name in yielded_attr_names:
+                    continue
+
                 attr_value = getattr(resolved_cls, attr_name)
                 if not isinstance(attr_value, (WorkflowInputReference, ExternalInputReference)):
                     continue
 
                 yield attr_value
+                yielded_attr_names.add(attr_name)
 
 
 class BaseInputs(metaclass=_BaseInputsMeta):

vellum/workflows/inputs/tests/test_inputs.py

@@ -47,3 +47,18 @@ def test_base_inputs_with_default():
 
     # THEN it should use the default value
     assert inputs.string_with_default == "default_value"
+
+
+def test_base_inputs__supports_inherited_inputs():
+    # GIVEN an inputs class
+    class TopInputs(BaseInputs):
+        first: str
+
+    # WHEN we inherit from the base inputs class
+    class BottomInputs(TopInputs):
+        second: int
+
+    # THEN both references should be available
+    assert BottomInputs.first.name == "first"
+    assert BottomInputs.second.name == "second"
+    assert len([ref for ref in BottomInputs]) == 2

vellum/workflows/nodes/bases/base_adornment_node.py

@@ -1,5 +1,6 @@
 from typing import TYPE_CHECKING, Any, Dict, Generic, Optional, Tuple, Type
 
+from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes.bases.base import BaseNode, BaseNodeMeta
 from vellum.workflows.outputs.base import BaseOutputs
 from vellum.workflows.references.output import OutputReference
@@ -13,6 +14,14 @@ class _BaseAdornmentNodeMeta(BaseNodeMeta):
     def __new__(cls, name: str, bases: Tuple[Type, ...], dct: Dict[str, Any]) -> Any:
         node_class = super().__new__(cls, name, bases, dct)
 
+        SubworkflowInputs = dct.get("SubworkflowInputs")
+        if (
+            isinstance(SubworkflowInputs, type)
+            and issubclass(SubworkflowInputs, BaseInputs)
+            and SubworkflowInputs.__parent_class__ is type(None)
+        ):
+            SubworkflowInputs.__parent_class__ = node_class
+
         subworkflow_attribute = dct.get("subworkflow")
         if not subworkflow_attribute:
             return node_class

vellum/workflows/nodes/core/map_node/node.py

@@ -62,7 +62,7 @@ class MapNode(BaseAdornmentNode[StateType], Generic[StateType, MapNodeItemType])
 
         item: MapNodeItemType  # type: ignore[valid-type]
         index: int
-        all_items: List[MapNodeItemType]  # type: ignore[valid-type]
+        items: List[MapNodeItemType]  # type: ignore[valid-type]
 
     def run(self) -> Iterator[BaseOutput]:
         mapped_items: Dict[str, List] = defaultdict(list)
@@ -176,8 +176,9 @@ class MapNode(BaseAdornmentNode[StateType], Generic[StateType, MapNodeItemType])
             parent_state=self.state,
             context=context,
         )
+        SubworkflowInputsClass = self.subworkflow.get_inputs_class()
         events = subworkflow.stream(
-            inputs=self.SubworkflowInputs(index=index, item=item, all_items=self.items),
+            inputs=SubworkflowInputsClass(index=index, item=item, items=self.items),
             node_output_mocks=self._context._get_all_node_output_mocks(),
             event_filter=all_workflow_event_filter,
         )

vellum/workflows/nodes/core/map_node/tests/test_node.py

@@ -116,3 +116,59 @@ def test_map_node__inner_try():
     # THEN the workflow should succeed
     assert outputs[-1].name == "final_output"
     assert len(outputs[-1].value) == 2
+
+
+def test_map_node__nested_map_node():
+    # GIVEN the inner map node's inputs
+    class VegetableMapNodeInputs(MapNode.SubworkflowInputs):
+        item: str
+
+    # AND the outer map node's inputs
+    class FruitMapNodeInputs(MapNode.SubworkflowInputs):
+        item: str
+
+    # AND a simple node that concats both attributes
+    class SimpleConcatNode(BaseNode):
+        fruit = FruitMapNodeInputs.item
+        vegetable = VegetableMapNodeInputs.item
+
+        class Outputs(BaseNode.Outputs):
+            medley: str
+
+        def run(self) -> Outputs:
+            return self.Outputs(medley=f"{self.fruit} {self.vegetable}")
+
+    # AND a workflow using that node
+    class VegetableMapNodeWorkflow(BaseWorkflow[VegetableMapNodeInputs, BaseState]):
+        graph = SimpleConcatNode
+
+        class Outputs(BaseWorkflow.Outputs):
+            final_output = SimpleConcatNode.Outputs.medley
+
+    # AND an inner map node referencing that workflow
+    class VegetableMapNode(MapNode):
+        items = ["carrot", "potato"]
+        subworkflow = VegetableMapNodeWorkflow
+
+    # AND an outer subworkflow referencing the inner map node
+    class FruitMapNodeWorkflow(BaseWorkflow[FruitMapNodeInputs, BaseState]):
+        graph = VegetableMapNode
+
+        class Outputs(BaseWorkflow.Outputs):
+            final_output = VegetableMapNode.Outputs.final_output
+
+    # AND an outer map node referencing the outer subworkflow
+    class FruitMapNode(MapNode):
+        items = ["apple", "banana"]
+        subworkflow = FruitMapNodeWorkflow
+
+    # WHEN we run the workflow
+    stream = FruitMapNode().run()
+    outputs = list(stream)
+
+    # THEN the workflow should succeed
+    assert outputs[-1].name == "final_output"
+    assert outputs[-1].value == [
+        ["apple carrot", "apple potato"],
+        ["banana carrot", "banana potato"],
+    ]

vellum/workflows/nodes/core/retry_node/node.py

@@ -47,8 +47,9 @@ class RetryNode(BaseAdornmentNode[StateType], Generic[StateType]):
                     parent_state=self.state,
                     context=WorkflowContext.create_from(self._context),
                 )
+                inputs_class = subworkflow.get_inputs_class()
                 subworkflow_stream = subworkflow.stream(
-                    inputs=self.SubworkflowInputs(attempt_number=attempt_number),
+                    inputs=inputs_class(attempt_number=attempt_number),
                     event_filter=all_workflow_event_filter,
                     node_output_mocks=self._context._get_all_node_output_mocks(),
                 )

vellum/workflows/nodes/utils.py

@@ -9,9 +9,11 @@ from pydantic import BaseModel, create_model
 from vellum.client.types.function_call import FunctionCall
 from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
+from vellum.workflows.inputs.base import BaseInputs
 from vellum.workflows.nodes import BaseNode
 from vellum.workflows.nodes.bases.base_adornment_node import BaseAdornmentNode
 from vellum.workflows.ports.port import Port
+from vellum.workflows.state.base import BaseState
 from vellum.workflows.types.core import Json
 from vellum.workflows.types.generics import NodeType
 
@@ -54,7 +56,18 @@ def create_adornment(
         # https://app.shortcut.com/vellum/story/4116
         from vellum.workflows import BaseWorkflow
 
-        class Subworkflow(BaseWorkflow):
+        SubworkflowInputs = getattr(adornable_cls, "SubworkflowInputs", None)
+        BaseSubworkflowInputs = (
+            SubworkflowInputs
+            if isinstance(SubworkflowInputs, type) and issubclass(SubworkflowInputs, BaseInputs)
+            else BaseInputs
+        )
+
+        # mypy is too conservative here - you can absolutely inherit from dynamic classes in python
+        class Inputs(BaseSubworkflowInputs):  # type: ignore[misc, valid-type]
+            pass
+
+        class Subworkflow(BaseWorkflow[Inputs, BaseState]):
             graph = inner_cls
 
             class Outputs(BaseWorkflow.Outputs):

vellum/workflows/references/workflow_input.py

@@ -3,6 +3,7 @@ from typing import TYPE_CHECKING, Generic, Optional, Tuple, Type, TypeVar, cast
 from vellum.workflows.descriptors.base import BaseDescriptor
 from vellum.workflows.errors.types import WorkflowErrorCode
 from vellum.workflows.exceptions import NodeException
+from vellum.workflows.types.generics import import_workflow_class
 
 if TYPE_CHECKING:
     from vellum.workflows.inputs.base import BaseInputs
@@ -29,7 +30,10 @@ class WorkflowInputReference(BaseDescriptor[_InputType], Generic[_InputType]):
         return self._inputs_class
 
     def resolve(self, state: "BaseState") -> _InputType:
-        if hasattr(state.meta.workflow_inputs, self._name):
+        if hasattr(state.meta.workflow_inputs, self._name) and (
+            state.meta.workflow_definition == self._inputs_class.__parent_class__
+            or not issubclass(self._inputs_class.__parent_class__, import_workflow_class())
+        ):
             return cast(_InputType, getattr(state.meta.workflow_inputs, self._name))
 
         if state.meta.parent:

vellum/workflows/runner/runner.py

@@ -101,6 +101,7 @@ class WorkflowRunner(Generic[StateType]):
             if state:
                 self._initial_state = deepcopy(state)
                 self._initial_state.meta.span_id = uuid4()
+                self._initial_state.meta.workflow_definition = self.workflow.__class__
             else:
                 self._initial_state = self.workflow.get_state_at_node(node)
             self._entrypoints = entrypoint_nodes
@@ -126,6 +127,7 @@ class WorkflowRunner(Generic[StateType]):
                 self._initial_state = deepcopy(state)
                 self._initial_state.meta.workflow_inputs = normalized_inputs
                 self._initial_state.meta.span_id = uuid4()
+                self._initial_state.meta.workflow_definition = self.workflow.__class__
             else:
                 self._initial_state = self.workflow.get_default_state(normalized_inputs)
                 # We don't want to emit the initial state on the base case of Workflow Runs, since

vellum/workflows/workflows/base.py

@@ -133,6 +133,11 @@ class _BaseWorkflowMeta(type):
         cls = super().__new__(mcs, name, bases, dct)
         workflow_class = cast(Type["BaseWorkflow"], cls)
         workflow_class.__id__ = uuid4_from_hash(workflow_class.__qualname__)
+
+        inputs_class = workflow_class.get_inputs_class()
+        if inputs_class is not BaseInputs and inputs_class.__parent_class__ is type(None):
+            inputs_class.__parent_class__ = workflow_class
+
         return workflow_class
 
 

{vellum_ai-0.14.41.dist-info → vellum_ai-0.14.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vellum-ai
-Version: 0.14.41
+Version: 0.14.42
 Summary: 
 License: MIT
 Requires-Python: >=3.9,<4.0