PyPI - vellum-ai - Versions diffs - 0.14.27__py3-none-any.whl → 0.14.28__py3-none-any.whl - Mend

vellum-ai 0.14.27py3-none-any.whl → 0.14.28py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

vellum/client/core/client_wrapper.py CHANGED Viewed

@@ -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.27",
+            "X-Fern-SDK-Version": "0.14.28",
         }
         headers["X_API_KEY"] = self.api_key
         return headers

vellum/client/core/jsonable_encoder.py CHANGED Viewed

@@ -45,7 +45,7 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
             encoder = getattr(obj.__config__, "json_encoders", {})  # type: ignore # Pydantic v1
         if custom_encoder:
             encoder.update(custom_encoder)
-        obj_dict = obj.model_dump(mode="json")
+        obj_dict = obj.dict(by_alias=True)
         if "__root__" in obj_dict:
             obj_dict = obj_dict["__root__"]
         if "root" in obj_dict:

vellum/client/resources/documents/client.py CHANGED Viewed

@@ -277,13 +277,6 @@ class DocumentsClient:
         **Note:** Uses a base url of `https://documents.vellum.ai`.
-        This is a multipart/form-data request. The `contents` field should be a file upload. It also expects a JSON body with the following fields:
-        - `add_to_index_names: list[str]` - Optionally include the names of all indexes that you'd like this document to be included in
-        - `external_id: str | None` - Optionally include an external ID for this document. This is useful if you want to re-upload the same document later when its contents change and would like it to be re-indexed.
-        - `label: str` - A human-friendly name for this document. Typically the filename.
-        - `keywords: list[str] | None` - Optionally include a list of keywords that'll be associated with this document. Used when performing keyword searches.
-        - `metadata: dict[str, Any]` - A stringified JSON object containing any metadata associated with the document that you'd like to filter upon later.
         Parameters
         ----------
         label : str
@@ -673,13 +666,6 @@ class AsyncDocumentsClient:
         **Note:** Uses a base url of `https://documents.vellum.ai`.
-        This is a multipart/form-data request. The `contents` field should be a file upload. It also expects a JSON body with the following fields:
-        - `add_to_index_names: list[str]` - Optionally include the names of all indexes that you'd like this document to be included in
-        - `external_id: str | None` - Optionally include an external ID for this document. This is useful if you want to re-upload the same document later when its contents change and would like it to be re-indexed.
-        - `label: str` - A human-friendly name for this document. Typically the filename.
-        - `keywords: list[str] | None` - Optionally include a list of keywords that'll be associated with this document. Used when performing keyword searches.
-        - `metadata: dict[str, Any]` - A stringified JSON object containing any metadata associated with the document that you'd like to filter upon later.
         Parameters
         ----------
         label : str

vellum/workflows/events/tests/test_event.py CHANGED Viewed

@@ -4,6 +4,7 @@ from uuid import UUID
 from deepdiff import DeepDiff
+from vellum.client.core.pydantic_utilities import UniversalBaseModel
 from vellum.workflows.constants import undefined
 from vellum.workflows.errors.types import WorkflowError, WorkflowErrorCode
 from vellum.workflows.events.node import (
@@ -14,7 +15,7 @@ from vellum.workflows.events.node import (
     NodeExecutionStreamingBody,
     NodeExecutionStreamingEvent,
 )
-from vellum.workflows.events.types import NodeParentContext, WorkflowParentContext
+from vellum.workflows.events.types import NodeParentContext, ParentContext, WorkflowParentContext
 from vellum.workflows.events.workflow import (
     WorkflowExecutionFulfilledBody,
     WorkflowExecutionFulfilledEvent,
@@ -419,3 +420,30 @@ mock_node_uuid = str(uuid4_from_hash(MockNode.__qualname__))
 )
 def test_event_serialization(event, expected_json):
     assert not DeepDiff(event.model_dump(mode="json"), expected_json)
+def test_parent_context__deserialize_from_json__invalid_parent_context():
+    # GIVEN an event with a parent context that Vellum is introducing in the future
+    data = {
+        "foo": "bar",
+        "parent": {
+            "type": "SOME_FUTURE_ENTITY",
+            "span_id": "123e4567-e89b-12d3-a456-426614174000",
+            "some_randome_field": "some_random_value",
+            "parent": None,
+        },
+    }
+    # AND a dataclass that references the parent context
+    class MyData(UniversalBaseModel):
+        foo: str
+        parent: ParentContext
+    # WHEN the data is deserialized
+    event = MyData.model_validate(data)
+    # THEN the event is deserialized correctly
+    assert event.parent
+    assert event.parent.type == "UNKNOWN"
+    assert event.parent.span_id == UUID("123e4567-e89b-12d3-a456-426614174000")
+    assert event.parent.parent is None

vellum/workflows/events/types.py CHANGED Viewed

@@ -1,9 +1,10 @@
 from datetime import datetime
 import json
 from uuid import UUID, uuid4
-from typing import Annotated, Any, Dict, List, Literal, Optional, Union
+from typing import Annotated, Any, Dict, List, Literal, Optional, Union, get_args
-from pydantic import BeforeValidator, Field
+from pydantic import BeforeValidator, Field, GetCoreSchemaHandler, Tag, ValidationInfo
+from pydantic_core import CoreSchema, core_schema
 from vellum.core.pydantic_utilities import UniversalBaseModel
 from vellum.workflows.state.encoder import DefaultStateEncoder
@@ -112,6 +113,59 @@ class APIRequestParentContext(BaseParentContext):
     type: Literal["API_REQUEST"] = "API_REQUEST"
+class UnknownParentContext(BaseParentContext):
+    type: Literal["UNKNOWN"] = "UNKNOWN"
+def _cast_parent_context_discriminator(v: Any) -> Any:
+    if v in PARENT_CONTEXT_TYPES:
+        return v
+    return "UNKNOWN"
+def _get_parent_context_discriminator(v: Any) -> Any:
+    if isinstance(v, dict) and "type" in v:
+        return _cast_parent_context_discriminator(v["type"])
+    if isinstance(v, PARENT_CONTEXT_CHOICES):
+        return v.type
+    return _cast_parent_context_discriminator(v)
+def _tag_parent_context_discriminator(v: Any) -> Any:
+    return Tag(_get_parent_context_discriminator(v))
+def _validate_parent_context_discriminator(v: Any, info: ValidationInfo) -> Any:
+    if isinstance(v, str):
+        return _get_parent_context_discriminator(v)
+    if isinstance(v, dict) and "type" in v:
+        v["type"] = _get_parent_context_discriminator(v["type"])
+    return v
+class ParentContextDiscriminator:
+    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
+        original_schema = handler(source_type)
+        tagged_union_choices = {}
+        for index, choice in enumerate(original_schema["choices"]):
+            tagged_union_choices[Tag(PARENT_CONTEXT_TYPES[index])] = choice
+        tagged_union_schema = core_schema.tagged_union_schema(
+            tagged_union_choices,
+            _tag_parent_context_discriminator,
+        )
+        return core_schema.with_info_before_validator_function(
+            function=_validate_parent_context_discriminator,
+            schema=tagged_union_schema,
+            field_name="type",
+        )
 # Define the discriminated union
 ParentContext = Annotated[
     Union[
@@ -121,8 +175,13 @@ ParentContext = Annotated[
         PromptDeploymentParentContext,
         WorkflowSandboxParentContext,
         APIRequestParentContext,
+        UnknownParentContext,
     ],
-    Field(discriminator="type"),
+    ParentContextDiscriminator(),
+]
+PARENT_CONTEXT_CHOICES = get_args(get_args(ParentContext)[0])
+PARENT_CONTEXT_TYPES = [
+    pc.model_fields["type"].default for pc in PARENT_CONTEXT_CHOICES if issubclass(pc, UniversalBaseModel)
 ]
 # Update the forward references

vellum/workflows/nodes/displayable/code_execution_node/utils.py CHANGED Viewed

@@ -14,10 +14,11 @@ def read_file_from_path(node_filepath: str, script_filepath: str) -> Union[str,
     node_filepath_dir = os.path.dirname(node_filepath)
     full_filepath = os.path.join(node_filepath_dir, script_filepath)
-    if os.path.isfile(full_filepath):
+    try:
         with open(full_filepath) as file:
             return file.read()
-    return None
+    except (FileNotFoundError, IsADirectoryError):
+        return None
 class ListWrapper(list):

vellum/workflows/nodes/displayable/inline_prompt_node/tests/test_node.py CHANGED Viewed

@@ -9,6 +9,7 @@ from httpx import Response
 from vellum.client.core.api_error import ApiError
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
 from vellum.client.types.chat_message import ChatMessage
+from vellum.client.types.chat_message_prompt_block import ChatMessagePromptBlock
 from vellum.client.types.chat_message_request import ChatMessageRequest
 from vellum.client.types.execute_prompt_event import ExecutePromptEvent
 from vellum.client.types.fulfilled_execute_prompt_event import FulfilledExecutePromptEvent
@@ -241,7 +242,7 @@ def test_inline_prompt_node__parent_context(mock_httpx_transport, mock_complex_p
     # GIVEN a prompt node
     class MyNode(InlinePromptNode):
         ml_model = "gpt-4o"
-        blocks = []
+        blocks = [ChatMessagePromptBlock(chat_role="USER", blocks=[])]
         prompt_inputs = {}
     # AND a known response from the httpx client
@@ -276,6 +277,16 @@ def test_inline_prompt_node__parent_context(mock_httpx_transport, mock_complex_p
     # AND the prompt is executed with the correct execution context
     call_request_args = mock_httpx_transport.handle_request.call_args_list[0][0][0]
-    request_execution_context = json.loads(call_request_args.read().decode("utf-8"))["execution_context"]
+    call_request = json.loads(call_request_args.read().decode("utf-8"))
+    request_execution_context = call_request["execution_context"]
     assert request_execution_context["trace_id"] == str(trace_id)
     assert request_execution_context["parent_context"]
+    # AND the blocks are serialized as expected
+    assert call_request["blocks"] == [
+        {
+            "block_type": "CHAT_MESSAGE",
+            "chat_role": "USER",
+            "blocks": [],
+        }
+    ]

{vellum_ai-0.14.27.dist-info → vellum_ai-0.14.28.dist-info}/METADATA RENAMED Viewed

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

{vellum_ai-0.14.27.dist-info → vellum_ai-0.14.28.dist-info}/RECORD RENAMED Viewed

@@ -41,7 +41,7 @@ vellum_ee/workflows/display/nodes/vellum/conditional_node.py,sha256=ybLIa4uclqVI
 vellum_ee/workflows/display/nodes/vellum/error_node.py,sha256=I1Jkp2htRINJATtv1e-zs9BrReFX842djpiVgBPHDYg,2186
 vellum_ee/workflows/display/nodes/vellum/final_output_node.py,sha256=BJ--Y-LCbGFJve3OFEKHVxrw8TKvgb342opYLJibToc,3128
 vellum_ee/workflows/display/nodes/vellum/guardrail_node.py,sha256=aYZSJTxknU4LMiQdWk9LcK6CkhdozeDEMiRxfAyUNEc,2202
-vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py,sha256=3fJzrFoGJX_igzWKgXp7f7-owdVBG6xuy-kBSWNbNxc,8734
+vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py,sha256=86hkneLIBS4Jel3GWsPVIIFqXGD3RHIpXw0iGa_Zues,8843
 vellum_ee/workflows/display/nodes/vellum/inline_subworkflow_node.py,sha256=MU9I8CB1X1TgL1aa1eT6DHWwNJ-2v79t74xl0oy-fBo,5510
 vellum_ee/workflows/display/nodes/vellum/map_node.py,sha256=8CPnn06HIBxBOiECevUffeVmQmCpec6WtPQnNl9gj9Y,3748
 vellum_ee/workflows/display/nodes/vellum/merge_node.py,sha256=xtyecs9mJ_WEwVpP12jxYwvehLXynhqLrPJ-Ahdk2GA,3232
@@ -54,7 +54,7 @@ vellum_ee/workflows/display/nodes/vellum/templating_node.py,sha256=5EWzdA3TSUPlb
 vellum_ee/workflows/display/nodes/vellum/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/display/nodes/vellum/tests/test_code_execution_node.py,sha256=p0fCvbKzpGvVrg67QmJd14m9E8_DG0u5s6SYIhzlkNA,4018
 vellum_ee/workflows/display/nodes/vellum/tests/test_error_node.py,sha256=ulrpoYUW-5kIxfG4Lf5F2p0k_EoYKhmahEbF3P_eruM,1648
-vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py,sha256=bg9INsXiWfyK047u8TD1oEOFYrqDq8GC7Hvgz69n7BE,1988
+vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py,sha256=fu9nxD4FInSfKbipJJ7UE617VkeUWs_uS6SeEz_8-Iw,4691
 vellum_ee/workflows/display/nodes/vellum/tests/test_retry_node.py,sha256=NuIw8Yb42KUdoGi3Ur8_7VPg50IC4hNrwAkCociwqNk,2091
 vellum_ee/workflows/display/nodes/vellum/tests/test_templating_node.py,sha256=Us32jf_FQnLuT4Bs2o5JyHxihCTAN8ozZghWIR0pl9k,3459
 vellum_ee/workflows/display/nodes/vellum/tests/test_try_node.py,sha256=mtzB8LJlFCHVFM4H5AanLp29gQfaVmnN4A4iaRGJHoI,2427
@@ -100,7 +100,7 @@ vellum_ee/workflows/display/workflows/get_vellum_workflow_display_class.py,sha25
 vellum_ee/workflows/display/workflows/tests/test_workflow_display.py,sha256=nD6_lZnNp56siVJwhlWzSEHdMaSKjvWlsJa31SqfQAE,10623
 vellum_ee/workflows/display/workflows/vellum_workflow_display.py,sha256=AzGZ7ApiwXAHuymTJoXJketUegyC1dmB1blzoni5eh8,13423
 vellum_ee/workflows/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum_ee/workflows/server/virtual_file_loader.py,sha256=ET-Q83W5Cgqzqz3qtFNwtS2nJEIcm3VtvR5kffsT3VY,2262
+vellum_ee/workflows/server/virtual_file_loader.py,sha256=7JphJcSO3H85qiC2DpFfBWjC3JjrbRmoynBC6KKHVsA,2710
 vellum_ee/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum_ee/workflows/tests/local_files/__init__.py,sha256=UyP6kKkRqr9cTKHQF4MVLdLk5MM9GGcLuqxXsQGm22Y,51
 vellum_ee/workflows/tests/local_files/base_class.py,sha256=UuiC7J68MVr6A4949QYiBpXOLdsvFG_Cw1muEPiHT6I,298
@@ -121,18 +121,18 @@ vellum_ee/workflows/tests/local_workflow/nodes/final_output.py,sha256=ZX7zBv87zi
 vellum_ee/workflows/tests/local_workflow/nodes/templating_node.py,sha256=NQwFN61QkHfI3Vssz-B0NKGfupK8PU0FDSAIAhYBLi0,325
 vellum_ee/workflows/tests/local_workflow/workflow.py,sha256=A4qOzOPNwePYxWbcAgIPLsmrVS_aVEZEc-wULSv787Q,393
 vellum_ee/workflows/tests/test_display_meta.py,sha256=C25dErwghPNXio49pvSRxyOuc96srH6eYEwTAWdE2zY,2258
-vellum_ee/workflows/tests/test_server.py,sha256=2za_EEIRgmep4motFI-UIEeGU0EvlFpo1G9B8ZfbISw,3841
+vellum_ee/workflows/tests/test_server.py,sha256=Ll4o9gg0Q4r8uX6Kt8LWgIz0u2zLwPiZxl3TuqoZpxg,4707
 vellum_ee/workflows/tests/test_virtual_files.py,sha256=TJEcMR0v2S8CkloXNmCHA0QW0K6pYNGaIjraJz7sFvY,2762
 vellum/__init__.py,sha256=88-79I29hBTQvR1uH_BOCGMWuj2a4Nx82R_8KIESg28,40470
 vellum/client/README.md,sha256=JkCJjmMZl4jrPj46pkmL9dpK4gSzQQmP5I7z4aME4LY,4749
 vellum/client/__init__.py,sha256=Jv9sI5BNFo2OYA9px_aREFSIp655ryC3eaZSRI6yH1k,117826
 vellum/client/core/__init__.py,sha256=SQ85PF84B9MuKnBwHNHWemSGuy-g_515gFYNFhvEE0I,1438
 vellum/client/core/api_error.py,sha256=RE8LELok2QCjABadECTvtDp7qejA1VmINCh6TbqPwSE,426
-vellum/client/core/client_wrapper.py,sha256=lLWC2w0e3KTAB1BDko4CdDRGR3x7RCpVB3NoA4E1TQo,1869
+vellum/client/core/client_wrapper.py,sha256=UH9Mq4cJvem6l6xfFj0IWt_RPwlM-wLXpcS5F1LSo2k,1869
 vellum/client/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 vellum/client/core/file.py,sha256=X9IbmkZmB2bB_DpmZAO3crWdXagOakAyn6UCOCImCPg,2322
 vellum/client/core/http_client.py,sha256=R0pQpCppnEtxccGvXl4uJ76s7ro_65Fo_erlNNLp_AI,19228
-vellum/client/core/jsonable_encoder.py,sha256=ZZad_lvQK-HJ8EWAvpPI8clvao8L_G5YcCbi2gq0kOI,3660
+vellum/client/core/jsonable_encoder.py,sha256=qaF1gtgH-kQZb4kJskETwcCsOPUof-NnYVdszHkb-dM,3656
 vellum/client/core/pydantic_utilities.py,sha256=6ev3gtER-hjlq7PcPL9XT_YSCdgyCE8ZKHJ9Uc-gHIg,12071
 vellum/client/core/query_encoder.py,sha256=ekulqNd0j8TgD7ox-Qbz7liqX8-KP9blvT9DsRCenYM,2144
 vellum/client/core/remove_none_from_dict.py,sha256=EU9SGgYidWq7SexuJbNs4-PZ-5Bl3Vppd864mS6vQZw,342
@@ -159,7 +159,7 @@ vellum/client/resources/document_indexes/client.py,sha256=UcznU0NyvdNBpV4UCsTqG3
 vellum/client/resources/document_indexes/types/__init__.py,sha256=IoFqKHN_VBdEhC7VL8_6Jbatrn0e0zuYEJAJUahcUR0,196
 vellum/client/resources/document_indexes/types/document_indexes_list_request_status.py,sha256=sfUEB0cvOSmlE2iITqnMVyHv05Zy2fWP4QjCIYqMg0M,178
 vellum/client/resources/documents/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
-vellum/client/resources/documents/client.py,sha256=mSUvWf6iFXK6-QtfU9dTXNKhcRoMOA_6vyjtMzJ2S4g,27862
+vellum/client/resources/documents/client.py,sha256=DOiZ0i0iuGxPWTxDZsd8kndZPMB4GslHvyj1gBkrTIc,26048
 vellum/client/resources/folder_entities/__init__.py,sha256=QOp7UMMB3a32GrfVaud35ECn4fqPBKXxCyClsDgd6GE,175
 vellum/client/resources/folder_entities/client.py,sha256=xkT6D1TwPxvf1eXgDhRpKg7_O2V78jwBsIGyJgnI5SY,11110
 vellum/client/resources/folder_entities/types/__init__.py,sha256=cHabrupjC-HL3kj-UZ9WdVzqHoQHCu6QsLFB3wlOs7k,212
@@ -1447,8 +1447,8 @@ vellum/workflows/errors/types.py,sha256=tVW7Il9zalnwWzdoDLqYPIvRTOhXIv6FPORZAbU7
 vellum/workflows/events/__init__.py,sha256=6pxxceJo2dcaRkWtkDAYlUQZ-PHBQSZytIoyuUK48Qw,759
 vellum/workflows/events/node.py,sha256=jbmNHjdp331Q1IRK-AWtAxwF6Lidb9R7__N5rQuilE8,5401
 vellum/workflows/events/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum/workflows/events/tests/test_event.py,sha256=sHcKhZPDPtzZfTmehL4NORA_StR4M6nZDcx9kz3Avo0,16866
-vellum/workflows/events/types.py,sha256=ArTnICVLE54ewwPi_YUX_JM_LZKdNb_qz0YI0lzP36I,3736
+vellum/workflows/events/tests/test_event.py,sha256=WRxjOO1470rFH40O56RWjhonIdupW782h_FRAhIQZCQ,17823
+vellum/workflows/events/types.py,sha256=cKXEZEZ4C_O38CH-qiu8nYSMy2DVJ66lQayJO5A-haU,5690
 vellum/workflows/events/workflow.py,sha256=xdqU6WOexaAqzJbU2Zw42o2LJhK7SDPtTFO5REGv17I,7293
 vellum/workflows/exceptions.py,sha256=NiBiR3ggfmPxBVqD-H1SqmjI-7mIn0EStSN1BqApvCM,1213
 vellum/workflows/expressions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1548,7 +1548,7 @@ vellum/workflows/nodes/displayable/code_execution_node/tests/__init__.py,sha256=
 vellum/workflows/nodes/displayable/code_execution_node/tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/nodes/displayable/code_execution_node/tests/fixtures/main.py,sha256=5QsbmkzSlSbcbWTG_JmIqcP-JNJzOPTKxGzdHos19W4,79
 vellum/workflows/nodes/displayable/code_execution_node/tests/test_code_execution_node.py,sha256=xAaoOfQHQUlp0iKlig87t0aT2cJM-8PxiTb1QDg8VmY,24641
-vellum/workflows/nodes/displayable/code_execution_node/utils.py,sha256=tBuR9cV1caFtpGuQrw_LcPDAfzLI-Mpmi1Klzpr34KM,3870
+vellum/workflows/nodes/displayable/code_execution_node/utils.py,sha256=PI0IQysC3uASv4nof23O4gIWpoNl3tRleb1q417bfTw,3896
 vellum/workflows/nodes/displayable/conditional_node/__init__.py,sha256=AS_EIqFdU1F9t8aLmbZU-rLh9ry6LCJ0uj0D8F0L5Uw,72
 vellum/workflows/nodes/displayable/conditional_node/node.py,sha256=Qjfl33gZ3JEgxBA1EgzSUebboGvsARthIxxcQyvx5Gg,1152
 vellum/workflows/nodes/displayable/conftest.py,sha256=tD_WIiw5WjFqnzgnGLtEZDaMj2XhQ1DptnBTKYeBbI0,5705
@@ -1562,7 +1562,7 @@ vellum/workflows/nodes/displayable/guardrail_node/test_node.py,sha256=1yPIAt4_GW
 vellum/workflows/nodes/displayable/inline_prompt_node/__init__.py,sha256=gSUOoEZLlrx35-tQhSAd3An8WDwBqyiQh-sIebLU9wU,74
 vellum/workflows/nodes/displayable/inline_prompt_node/node.py,sha256=8RXZqWMzViUjFfbpmcy1gkSsKnEpci8BGwsuPYv4xMQ,3380
 vellum/workflows/nodes/displayable/inline_prompt_node/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vellum/workflows/nodes/displayable/inline_prompt_node/tests/test_node.py,sha256=dVapol3P0NnbyUbn5ZBoRtUjt75yhoo0HYF5zkpokGA,10175
+vellum/workflows/nodes/displayable/inline_prompt_node/tests/test_node.py,sha256=D06GymJGoMt9StKpTzqYk8wvmRedkvcRdYUHPUznvK4,10554
 vellum/workflows/nodes/displayable/merge_node/__init__.py,sha256=J8IC08dSH7P76wKlNuxe1sn7toNGtSQdFirUbtPDEs0,60
 vellum/workflows/nodes/displayable/merge_node/node.py,sha256=nZtGGVAvY4fvGg8vwV6sTQ8_QLRnigeXt0vf2FL272A,450
 vellum/workflows/nodes/displayable/note_node/__init__.py,sha256=KWA3P4fyYJ-fOTky8qNGlcOotQ-HeHJ9AjZt6mRQmCE,58
@@ -1650,8 +1650,8 @@ vellum/workflows/workflows/event_filters.py,sha256=GSxIgwrX26a1Smfd-6yss2abGCnad
 vellum/workflows/workflows/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vellum/workflows/workflows/tests/test_base_workflow.py,sha256=tCxrV3QBHL8wfdEO3bvKteDdw32xBlUl1_WxkAwaONw,8344
 vellum/workflows/workflows/tests/test_context.py,sha256=VJBUcyWVtMa_lE5KxdhgMu0WYNYnUQUDvTF7qm89hJ0,2333
-vellum_ai-0.14.27.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
-vellum_ai-0.14.27.dist-info/METADATA,sha256=DgLbQNMAj3437pSlt-7jgoO88Km4cBlRqqabwpj85jc,5484
-vellum_ai-0.14.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-vellum_ai-0.14.27.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
-vellum_ai-0.14.27.dist-info/RECORD,,
+vellum_ai-0.14.28.dist-info/LICENSE,sha256=hOypcdt481qGNISA784bnAGWAE6tyIf9gc2E78mYC3E,1574
+vellum_ai-0.14.28.dist-info/METADATA,sha256=N7nbaIH39gbgUyBqZttgkemMWEoUpoQUJLtpd6bxTl0,5484
+vellum_ai-0.14.28.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+vellum_ai-0.14.28.dist-info/entry_points.txt,sha256=HCH4yc_V3J_nDv3qJzZ_nYS8llCHZViCDP1ejgCc5Ak,42
+vellum_ai-0.14.28.dist-info/RECORD,,

vellum_ee/workflows/display/nodes/vellum/inline_prompt_node.py CHANGED Viewed

@@ -94,7 +94,8 @@ class BaseInlinePromptNodeDisplay(BaseNodeVellumDisplay[_InlinePromptNodeType],
                 input_name=variable_name,
                 value=variable_value,
                 display_context=display_context,
-                input_id=self.node_input_ids_by_name.get(variable_name),
+                input_id=self.node_input_ids_by_name.get(f"{InlinePromptNode.prompt_inputs.name}.{variable_name}")
+                or self.node_input_ids_by_name.get(variable_name),
             )
             vellum_variable_type = infer_vellum_variable_type(variable_value)
             node_inputs.append(node_input)

vellum_ee/workflows/display/nodes/vellum/tests/test_prompt_node.py CHANGED Viewed

@@ -1,7 +1,12 @@
+import pytest
+from uuid import UUID
+from typing import Type
 from vellum.workflows import BaseWorkflow
 from vellum.workflows.nodes import BaseNode
 from vellum.workflows.nodes.displayable.inline_prompt_node.node import InlinePromptNode
 from vellum.workflows.references.lazy import LazyReference
+from vellum_ee.workflows.display.nodes.vellum.inline_prompt_node import BaseInlinePromptNodeDisplay
 from vellum_ee.workflows.display.workflows.get_vellum_workflow_display_class import get_workflow_display
 from vellum_ee.workflows.display.workflows.vellum_workflow_display import VellumWorkflowDisplay
@@ -34,7 +39,7 @@ def test_serialize_node__lazy_reference_in_prompt_inputs():
     assert lazy_reference_node["inputs"] == [
         {
-            "id": "fba6a4d5-835a-4e99-afb7-f6a4aed15110",
+            "id": "aa81c1bc-d5d8-4ae8-8946-e9f4d0c1ab5f",
             "key": "attr",
             "value": {
                 "combinator": "OR",
@@ -50,3 +55,77 @@ def test_serialize_node__lazy_reference_in_prompt_inputs():
             },
         }
     ]
+def _no_display_class(Node: Type[InlinePromptNode]):
+    return None
+def _display_class_with_node_input_ids_by_name(Node: Type[InlinePromptNode]):
+    class PromptNodeDisplay(BaseInlinePromptNodeDisplay[Node]):  # type: ignore[valid-type]
+        node_input_ids_by_name = {"foo": UUID("fba6a4d5-835a-4e99-afb7-f6a4aed15110")}
+    return PromptNodeDisplay
+def _display_class_with_node_input_ids_by_name_with_inputs_prefix(Node: Type[InlinePromptNode]):
+    class PromptNodeDisplay(BaseInlinePromptNodeDisplay[Node]):  # type: ignore[valid-type]
+        node_input_ids_by_name = {"prompt_inputs.foo": UUID("fba6a4d5-835a-4e99-afb7-f6a4aed15110")}
+    return PromptNodeDisplay
+@pytest.mark.parametrize(
+    ["GetDisplayClass", "expected_input_id"],
+    [
+        (_no_display_class, "8aa4ce7f-5eb8-41b7-abd0-ea2b40c8fb88"),
+        (_display_class_with_node_input_ids_by_name, "fba6a4d5-835a-4e99-afb7-f6a4aed15110"),
+        (_display_class_with_node_input_ids_by_name_with_inputs_prefix, "fba6a4d5-835a-4e99-afb7-f6a4aed15110"),
+    ],
+    ids=[
+        "no_display_class",
+        "display_class_with_node_input_ids_by_name",
+        "display_class_with_node_input_ids_by_name_with_inputs_prefix",
+    ],
+)
+def test_serialize_node__prompt_inputs(GetDisplayClass, expected_input_id):
+    # GIVEN a prompt node with inputs
+    class MyPromptNode(InlinePromptNode):
+        prompt_inputs = {"foo": "bar"}
+        blocks = []
+        ml_model = "gpt-4o"
+    # AND a workflow with the prompt node
+    class Workflow(BaseWorkflow):
+        graph = MyPromptNode
+    # AND a display class
+    GetDisplayClass(MyPromptNode)
+    # WHEN the workflow is serialized
+    workflow_display = get_workflow_display(base_display_class=VellumWorkflowDisplay, workflow_class=Workflow)
+    serialized_workflow: dict = workflow_display.serialize()
+    # THEN the node should properly serialize the inputs
+    my_prompt_node = next(
+        node for node in serialized_workflow["workflow_raw_data"]["nodes"] if node["id"] == str(MyPromptNode.__id__)
+    )
+    assert my_prompt_node["inputs"] == [
+        {
+            "id": expected_input_id,
+            "key": "foo",
+            "value": {
+                "rules": [
+                    {
+                        "type": "CONSTANT_VALUE",
+                        "data": {
+                            "type": "STRING",
+                            "value": "bar",
+                        },
+                    }
+                ],
+                "combinator": "OR",
+            },
+        }
+    ]

vellum_ee/workflows/server/virtual_file_loader.py CHANGED Viewed

@@ -1,5 +1,7 @@
 import importlib
+from importlib.machinery import ModuleSpec
 import re
+import sys
 from typing import Optional
@@ -8,11 +10,20 @@ class VirtualFileLoader(importlib.abc.Loader):
         self.files = files
         self.namespace = namespace
-    def create_module(self, spec):
-        return None  # use default module creation
+    def create_module(self, spec: ModuleSpec):
+        """
+        We started with cpython/Lib/importlib/_bootstrap.py::FrozenImporter::create_module here
+        https://github.com/python/cpython/blob/053c285f6b41f92fbdd1d4ff0c959cceefacd7cd/Lib/importlib/_bootstrap.py#L1160C1-L1169C22
+        and reduced our needs to just updating the __file__ attribute directly.
+        """
+        module = type(sys)(spec.name)
+        module.__file__ = spec.origin
+        return module
     def exec_module(self, module):
-        module_info = self._resolve_module(module.__spec__.origin)
+        module_info = self._resolve_module(module.__spec__.name)
         if module_info:
             file_path, code = module_info
@@ -66,7 +77,8 @@ class VirtualFileFinder(importlib.abc.MetaPathFinder, importlib.abc.Loader):
             return importlib.machinery.ModuleSpec(
                 fullname,
                 self.loader,
-                origin=fullname,
+                origin=file_path,
                 is_package=is_package,
             )
         return None

vellum_ee/workflows/tests/test_server.py CHANGED Viewed

@@ -4,11 +4,18 @@ from uuid import uuid4
 from typing import Type, cast
 from vellum.client.core.pydantic_utilities import UniversalBaseModel
+from vellum.client.types.code_executor_response import CodeExecutorResponse
+from vellum.client.types.number_vellum_value import NumberVellumValue
 from vellum.workflows import BaseWorkflow
 from vellum.workflows.nodes import BaseNode
 from vellum_ee.workflows.server.virtual_file_loader import VirtualFileFinder
+@pytest.fixture
+def mock_open(mocker):
+    return mocker.patch("vellum.workflows.nodes.displayable.code_execution_node.utils.open")
 def test_load_workflow_event_display_context():
     # DEPRECATED: Use `vellum.workflows.events.workflow.WorkflowEventDisplayContext` instead. Will be removed in 0.15.0
     from vellum_ee.workflows.display.types import WorkflowEventDisplayContext
@@ -72,9 +79,16 @@ class StartNode(BaseNode):
     assert start_node.foo.instance.name == "StartNode.Outputs.bar"
-@pytest.mark.skip(reason="Code execution inspect and get read file from path needs to be fixed")
-def test_load_from_module__ts_code_in_file_loader():
-    # GIVEN a workflow module with only a code execution node
+def test_load_from_module__ts_code_in_file_loader(
+    mock_open,
+    vellum_client,
+):
+    # GIVEN typescript code
+    ts_code = """async function main(): any {
+  return 5;
+}"""
+    # AND a workflow module with only a code execution node
     files = {
         "__init__.py": "",
         "workflow.py": """\
@@ -95,18 +109,13 @@ from typing import Any
 from vellum.workflows.nodes.displayable import CodeExecutionNode as BaseCodeExecutionNode
 from vellum.workflows.state import BaseState
-class CodeExecutionNode(BaseCodeExecutionNode[BaseState, Any]):
+class CodeExecutionNode(BaseCodeExecutionNode[BaseState, int]):
     filepath = "./script.ts"
     code_inputs = {}
     runtime = "TYPESCRIPT_5_3_3"
     packages = []
 """,
-        "nodes/code_execution_node/script.ts": """async function main(inputs: {
-  text: string,
-}): any {
-  const matches = inputs.text.match(/\\((.+?)\\)/gs);
-  return matches;
-}""",
+        "nodes/code_execution_node/script.ts": ts_code,
     }
     namespace = str(uuid4())
@@ -114,6 +123,16 @@ class CodeExecutionNode(BaseCodeExecutionNode[BaseState, Any]):
     # AND the virtual file loader is registered
     sys.meta_path.append(VirtualFileFinder(files, namespace))
+    # AND the open function returns our file content
+    mock_open.return_value.__enter__.return_value.read.return_value = ts_code
+    # AND we know what the Code Execution Node will respond with
+    mock_code_execution = CodeExecutorResponse(
+        log="hello",
+        output=NumberVellumValue(value=5),
+    )
+    vellum_client.execute_code.return_value = mock_code_execution
     # WHEN the workflow is loaded
     Workflow = BaseWorkflow.load_from_module(namespace)
     workflow = Workflow()
@@ -122,4 +141,10 @@ class CodeExecutionNode(BaseCodeExecutionNode[BaseState, Any]):
     assert workflow
     event = workflow.run()
-    assert event.name == "workflow.execution.fulfilled"
+    assert event.name == "workflow.execution.fulfilled", event.model_dump_json()
+    # AND we pass in the correct file path to the open function
+    assert mock_open.call_args[0][0] == f"{namespace}/nodes/./script.ts"
+    # AND we invoke the Code Execution Node with the correct code
+    assert vellum_client.execute_code.call_args.kwargs["code"] == ts_code

{vellum_ai-0.14.27.dist-info → vellum_ai-0.14.28.dist-info}/LICENSE RENAMED Viewed

File without changes

{vellum_ai-0.14.27.dist-info → vellum_ai-0.14.28.dist-info}/WHEEL RENAMED Viewed

File without changes

{vellum_ai-0.14.27.dist-info → vellum_ai-0.14.28.dist-info}/entry_points.txt RENAMED Viewed

File without changes

vellum-ai 0.14.27__py3-none-any.whl → 0.14.28__py3-none-any.whl

vellum-ai 0.14.27py3-none-any.whl → 0.14.28py3-none-any.whl