vellum-ai 0.9.5__py3-none-any.whl → 0.9.7__py3-none-any.whl

vellum/__init__.py

@@ -2,7 +2,7 @@
 
 from .types import (
     AdHocExecutePromptEvent,
-    AdHocExpandMetaRequest,
+    AdHocExpandMeta,
     AdHocFulfilledPromptExecutionMeta,
     AdHocInitiatedPromptExecutionMeta,
     AdHocRejectedPromptExecutionMeta,
@@ -37,8 +37,6 @@ from .types import (
     ChatMessage,
     ChatMessageContent,
     ChatMessageContentRequest,
-    ChatMessagePromptBlockPropertiesRequest,
-    ChatMessagePromptBlockRequest,
     ChatMessageRequest,
     ChatMessageRole,
     CodeExecutionNodeArrayResult,
@@ -84,8 +82,6 @@ from .types import (
     EntityStatus,
     EntityVisibility,
     EnvironmentEnum,
-    EphemeralPromptCacheConfigRequest,
-    EphemeralPromptCacheConfigTypeEnum,
     ErrorInputRequest,
     ErrorVariableValue,
     ErrorVellumValue,
@@ -134,8 +130,6 @@ from .types import (
     FunctionCallVariableValue,
     FunctionCallVellumValue,
     FunctionCallVellumValueRequest,
-    FunctionDefinitionPromptBlockPropertiesRequest,
-    FunctionDefinitionPromptBlockRequest,
     GenerateOptionsRequest,
     GenerateRequest,
     GenerateResponse,
@@ -168,8 +162,6 @@ from .types import (
     InstructorVectorizerConfig,
     InstructorVectorizerConfigRequest,
     IterationStateEnum,
-    JinjaPromptBlockPropertiesRequest,
-    JinjaPromptBlockRequest,
     JsonInputRequest,
     JsonVariableValue,
     JsonVellumValue,
@@ -254,12 +246,9 @@ from .types import (
     PaginatedWorkflowReleaseTagReadList,
     PdfSearchResultMetaSource,
     PdfSearchResultMetaSourceRequest,
-    PlainTextPromptBlockRequest,
     Price,
     ProcessingFailureReasonEnum,
     ProcessingStateEnum,
-    PromptBlockRequest,
-    PromptBlockState,
     PromptDeploymentExpandMetaRequest,
     PromptDeploymentInputRequest,
     PromptExecutionMeta,
@@ -267,12 +256,12 @@ from .types import (
     PromptNodeResult,
     PromptNodeResultData,
     PromptOutput,
-    PromptParametersRequest,
-    PromptRequestChatHistoryInputRequest,
-    PromptRequestInputRequest,
-    PromptRequestJsonInputRequest,
-    PromptRequestStringInputRequest,
-    PromptSettingsRequest,
+    PromptParameters,
+    PromptRequestChatHistoryInput,
+    PromptRequestInput,
+    PromptRequestJsonInput,
+    PromptRequestStringInput,
+    PromptSettings,
     RawPromptExecutionOverridesRequest,
     ReductoChunkerConfig,
     ReductoChunkerConfigRequest,
@@ -286,8 +275,6 @@ from .types import (
     RejectedWorkflowNodeResultEvent,
     ReleaseTagSource,
     ReplaceTestSuiteTestCaseRequest,
-    RichTextChildBlockRequest,
-    RichTextPromptBlockRequest,
     SandboxScenario,
     ScenarioInput,
     ScenarioInputChatHistoryVariableValue,
@@ -419,7 +406,6 @@ from .types import (
     UnitEnum,
     UploadDocumentResponse,
     UpsertTestSuiteTestCaseRequest,
-    VariablePromptBlockRequest,
     VellumAudio,
     VellumAudioRequest,
     VellumError,
@@ -434,8 +420,6 @@ from .types import (
     VellumValueRequest,
     VellumVariable,
     VellumVariableExtensions,
-    VellumVariableExtensionsRequest,
-    VellumVariableRequest,
     VellumVariableType,
     WorkflowDeploymentRead,
     WorkflowEventError,
@@ -513,7 +497,7 @@ from .version import __version__
 
 __all__ = [
     "AdHocExecutePromptEvent",
-    "AdHocExpandMetaRequest",
+    "AdHocExpandMeta",
     "AdHocFulfilledPromptExecutionMeta",
     "AdHocInitiatedPromptExecutionMeta",
     "AdHocRejectedPromptExecutionMeta",
@@ -550,8 +534,6 @@ __all__ = [
     "ChatMessage",
     "ChatMessageContent",
     "ChatMessageContentRequest",
-    "ChatMessagePromptBlockPropertiesRequest",
-    "ChatMessagePromptBlockRequest",
     "ChatMessageRequest",
     "ChatMessageRole",
     "CodeExecutionNodeArrayResult",
@@ -599,8 +581,6 @@ __all__ = [
     "EntityStatus",
     "EntityVisibility",
     "EnvironmentEnum",
-    "EphemeralPromptCacheConfigRequest",
-    "EphemeralPromptCacheConfigTypeEnum",
     "ErrorInputRequest",
     "ErrorVariableValue",
     "ErrorVellumValue",
@@ -651,8 +631,6 @@ __all__ = [
     "FunctionCallVariableValue",
     "FunctionCallVellumValue",
     "FunctionCallVellumValueRequest",
-    "FunctionDefinitionPromptBlockPropertiesRequest",
-    "FunctionDefinitionPromptBlockRequest",
     "GenerateOptionsRequest",
     "GenerateRequest",
     "GenerateResponse",
@@ -686,8 +664,6 @@ __all__ = [
     "InstructorVectorizerConfigRequest",
     "InternalServerError",
     "IterationStateEnum",
-    "JinjaPromptBlockPropertiesRequest",
-    "JinjaPromptBlockRequest",
     "JsonInputRequest",
     "JsonVariableValue",
     "JsonVellumValue",
@@ -775,12 +751,9 @@ __all__ = [
     "PaginatedWorkflowReleaseTagReadList",
     "PdfSearchResultMetaSource",
     "PdfSearchResultMetaSourceRequest",
-    "PlainTextPromptBlockRequest",
     "Price",
     "ProcessingFailureReasonEnum",
     "ProcessingStateEnum",
-    "PromptBlockRequest",
-    "PromptBlockState",
     "PromptDeploymentExpandMetaRequest",
     "PromptDeploymentInputRequest",
     "PromptExecutionMeta",
@@ -788,12 +761,12 @@ __all__ = [
     "PromptNodeResult",
     "PromptNodeResultData",
     "PromptOutput",
-    "PromptParametersRequest",
-    "PromptRequestChatHistoryInputRequest",
-    "PromptRequestInputRequest",
-    "PromptRequestJsonInputRequest",
-    "PromptRequestStringInputRequest",
-    "PromptSettingsRequest",
+    "PromptParameters",
+    "PromptRequestChatHistoryInput",
+    "PromptRequestInput",
+    "PromptRequestJsonInput",
+    "PromptRequestStringInput",
+    "PromptSettings",
     "RawPromptExecutionOverridesRequest",
     "ReductoChunkerConfig",
     "ReductoChunkerConfigRequest",
@@ -807,8 +780,6 @@ __all__ = [
     "RejectedWorkflowNodeResultEvent",
     "ReleaseTagSource",
     "ReplaceTestSuiteTestCaseRequest",
-    "RichTextChildBlockRequest",
-    "RichTextPromptBlockRequest",
     "SandboxScenario",
     "ScenarioInput",
     "ScenarioInputChatHistoryVariableValue",
@@ -940,7 +911,6 @@ __all__ = [
     "UnitEnum",
     "UploadDocumentResponse",
     "UpsertTestSuiteTestCaseRequest",
-    "VariablePromptBlockRequest",
     "Vellum",
     "VellumAudio",
     "VellumAudioRequest",
@@ -957,8 +927,6 @@ __all__ = [
     "VellumValueRequest",
     "VellumVariable",
     "VellumVariableExtensions",
-    "VellumVariableExtensionsRequest",
-    "VellumVariableRequest",
     "VellumVariableType",
     "WorkflowDeploymentRead",
     "WorkflowDeploymentsListRequestStatus",

vellum/core/client_wrapper.py

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

vellum/resources/ad_hoc/client.py

@@ -2,12 +2,11 @@
 
 import typing
 from ...core.client_wrapper import SyncClientWrapper
-from ...types.prompt_request_input_request import PromptRequestInputRequest
-from ...types.vellum_variable_request import VellumVariableRequest
-from ...types.prompt_parameters_request import PromptParametersRequest
-from ...types.prompt_block_request import PromptBlockRequest
-from ...types.prompt_settings_request import PromptSettingsRequest
-from ...types.ad_hoc_expand_meta_request import AdHocExpandMetaRequest
+from ...types.prompt_request_input import PromptRequestInput
+from ...types.vellum_variable import VellumVariable
+from ...types.prompt_parameters import PromptParameters
+from ...types.prompt_settings import PromptSettings
+from ...types.ad_hoc_expand_meta import AdHocExpandMeta
 from ...core.request_options import RequestOptions
 from ...types.ad_hoc_execute_prompt_event import AdHocExecutePromptEvent
 from ...core.serialization import convert_and_respect_annotation_metadata
@@ -32,12 +31,12 @@ class AdHocClient:
         self,
         *,
         ml_model: str,
-        input_values: typing.Sequence[PromptRequestInputRequest],
-        input_variables: typing.Sequence[VellumVariableRequest],
-        parameters: PromptParametersRequest,
-        blocks: typing.Sequence[PromptBlockRequest],
-        settings: typing.Optional[PromptSettingsRequest] = OMIT,
-        expand_meta: typing.Optional[AdHocExpandMetaRequest] = OMIT,
+        input_values: typing.Sequence[PromptRequestInput],
+        input_variables: typing.Sequence[VellumVariable],
+        parameters: PromptParameters,
+        blocks: typing.Sequence[typing.Optional[typing.Any]],
+        settings: typing.Optional[PromptSettings] = OMIT,
+        expand_meta: typing.Optional[AdHocExpandMeta] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.Iterator[AdHocExecutePromptEvent]:
         """
@@ -47,17 +46,17 @@ class AdHocClient:
         ----------
         ml_model : str
 
-        input_values : typing.Sequence[PromptRequestInputRequest]
+        input_values : typing.Sequence[PromptRequestInput]
 
-        input_variables : typing.Sequence[VellumVariableRequest]
+        input_variables : typing.Sequence[VellumVariable]
 
-        parameters : PromptParametersRequest
+        parameters : PromptParameters
 
-        blocks : typing.Sequence[PromptBlockRequest]
+        blocks : typing.Sequence[typing.Optional[typing.Any]]
 
-        settings : typing.Optional[PromptSettingsRequest]
+        settings : typing.Optional[PromptSettings]
 
-        expand_meta : typing.Optional[AdHocExpandMetaRequest]
+        expand_meta : typing.Optional[AdHocExpandMeta]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -70,17 +69,14 @@ class AdHocClient:
         Examples
         --------
         from vellum import (
-            AdHocExpandMetaRequest,
-            EphemeralPromptCacheConfigRequest,
-            JinjaPromptBlockPropertiesRequest,
-            JinjaPromptBlockRequest,
-            PromptParametersRequest,
-            PromptRequestStringInputRequest,
-            PromptSettingsRequest,
-            StringVellumValueRequest,
+            AdHocExpandMeta,
+            PromptParameters,
+            PromptRequestStringInput,
+            PromptSettings,
+            StringVellumValue,
             Vellum,
-            VellumVariableExtensionsRequest,
-            VellumVariableRequest,
+            VellumVariable,
+            VellumVariableExtensions,
         )
 
         client = Vellum(
@@ -89,26 +85,26 @@ class AdHocClient:
         response = client.ad_hoc.adhoc_execute_prompt_stream(
             ml_model="string",
             input_values=[
-                PromptRequestStringInputRequest(
+                PromptRequestStringInput(
                     key="string",
                     value="string",
                 )
             ],
             input_variables=[
-                VellumVariableRequest(
+                VellumVariable(
                     id="string",
                     key="string",
                     type="STRING",
                     required=True,
-                    default=StringVellumValueRequest(
-                        value="string",
+                    default=StringVellumValue(
+                        value={"key": "value"},
                     ),
-                    extensions=VellumVariableExtensionsRequest(
-                        color="string",
+                    extensions=VellumVariableExtensions(
+                        color={"key": "value"},
                     ),
                 )
             ],
-            parameters=PromptParametersRequest(
+            parameters=PromptParameters(
                 stop=["string"],
                 temperature=1.1,
                 max_tokens=1,
@@ -119,23 +115,11 @@ class AdHocClient:
                 logit_bias={"string": {"key": "value"}},
                 custom_parameters={"string": {"key": "value"}},
             ),
-            settings=PromptSettingsRequest(
+            settings=PromptSettings(
                 timeout=1.1,
             ),
-            blocks=[
-                JinjaPromptBlockRequest(
-                    properties=JinjaPromptBlockPropertiesRequest(
-                        template="string",
-                        template_type="STRING",
-                    ),
-                    id="string",
-                    state="ENABLED",
-                    cache_config=EphemeralPromptCacheConfigRequest(
-                        type={"key": "value"},
-                    ),
-                )
-            ],
-            expand_meta=AdHocExpandMetaRequest(
+            blocks=[{"key": "value"}],
+            expand_meta=AdHocExpandMeta(
                 cost=True,
                 model_name=True,
                 usage=True,
@@ -152,22 +136,20 @@ class AdHocClient:
             json={
                 "ml_model": ml_model,
                 "input_values": convert_and_respect_annotation_metadata(
-                    object_=input_values, annotation=typing.Sequence[PromptRequestInputRequest], direction="write"
+                    object_=input_values, annotation=typing.Sequence[PromptRequestInput], direction="write"
                 ),
                 "input_variables": convert_and_respect_annotation_metadata(
-                    object_=input_variables, annotation=typing.Sequence[VellumVariableRequest], direction="write"
+                    object_=input_variables, annotation=typing.Sequence[VellumVariable], direction="write"
                 ),
                 "parameters": convert_and_respect_annotation_metadata(
-                    object_=parameters, annotation=PromptParametersRequest, direction="write"
+                    object_=parameters, annotation=PromptParameters, direction="write"
                 ),
                 "settings": convert_and_respect_annotation_metadata(
-                    object_=settings, annotation=PromptSettingsRequest, direction="write"
-                ),
-                "blocks": convert_and_respect_annotation_metadata(
-                    object_=blocks, annotation=typing.Sequence[PromptBlockRequest], direction="write"
+                    object_=settings, annotation=PromptSettings, direction="write"
                 ),
+                "blocks": blocks,
                 "expand_meta": convert_and_respect_annotation_metadata(
-                    object_=expand_meta, annotation=AdHocExpandMetaRequest, direction="write"
+                    object_=expand_meta, annotation=AdHocExpandMeta, direction="write"
                 ),
             },
             request_options=request_options,
@@ -234,12 +216,12 @@ class AsyncAdHocClient:
         self,
         *,
         ml_model: str,
-        input_values: typing.Sequence[PromptRequestInputRequest],
-        input_variables: typing.Sequence[VellumVariableRequest],
-        parameters: PromptParametersRequest,
-        blocks: typing.Sequence[PromptBlockRequest],
-        settings: typing.Optional[PromptSettingsRequest] = OMIT,
-        expand_meta: typing.Optional[AdHocExpandMetaRequest] = OMIT,
+        input_values: typing.Sequence[PromptRequestInput],
+        input_variables: typing.Sequence[VellumVariable],
+        parameters: PromptParameters,
+        blocks: typing.Sequence[typing.Optional[typing.Any]],
+        settings: typing.Optional[PromptSettings] = OMIT,
+        expand_meta: typing.Optional[AdHocExpandMeta] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.AsyncIterator[AdHocExecutePromptEvent]:
         """
@@ -249,17 +231,17 @@ class AsyncAdHocClient:
         ----------
         ml_model : str
 
-        input_values : typing.Sequence[PromptRequestInputRequest]
+        input_values : typing.Sequence[PromptRequestInput]
 
-        input_variables : typing.Sequence[VellumVariableRequest]
+        input_variables : typing.Sequence[VellumVariable]
 
-        parameters : PromptParametersRequest
+        parameters : PromptParameters
 
-        blocks : typing.Sequence[PromptBlockRequest]
+        blocks : typing.Sequence[typing.Optional[typing.Any]]
 
-        settings : typing.Optional[PromptSettingsRequest]
+        settings : typing.Optional[PromptSettings]
 
-        expand_meta : typing.Optional[AdHocExpandMetaRequest]
+        expand_meta : typing.Optional[AdHocExpandMeta]
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
@@ -274,17 +256,14 @@ class AsyncAdHocClient:
         import asyncio
 
         from vellum import (
-            AdHocExpandMetaRequest,
+            AdHocExpandMeta,
             AsyncVellum,
-            EphemeralPromptCacheConfigRequest,
-            JinjaPromptBlockPropertiesRequest,
-            JinjaPromptBlockRequest,
-            PromptParametersRequest,
-            PromptRequestStringInputRequest,
-            PromptSettingsRequest,
-            StringVellumValueRequest,
-            VellumVariableExtensionsRequest,
-            VellumVariableRequest,
+            PromptParameters,
+            PromptRequestStringInput,
+            PromptSettings,
+            StringVellumValue,
+            VellumVariable,
+            VellumVariableExtensions,
         )
 
         client = AsyncVellum(
@@ -296,26 +275,26 @@ class AsyncAdHocClient:
             response = await client.ad_hoc.adhoc_execute_prompt_stream(
                 ml_model="string",
                 input_values=[
-                    PromptRequestStringInputRequest(
+                    PromptRequestStringInput(
                         key="string",
                         value="string",
                     )
                 ],
                 input_variables=[
-                    VellumVariableRequest(
+                    VellumVariable(
                         id="string",
                         key="string",
                         type="STRING",
                         required=True,
-                        default=StringVellumValueRequest(
-                            value="string",
+                        default=StringVellumValue(
+                            value={"key": "value"},
                         ),
-                        extensions=VellumVariableExtensionsRequest(
-                            color="string",
+                        extensions=VellumVariableExtensions(
+                            color={"key": "value"},
                         ),
                     )
                 ],
-                parameters=PromptParametersRequest(
+                parameters=PromptParameters(
                     stop=["string"],
                     temperature=1.1,
                     max_tokens=1,
@@ -326,23 +305,11 @@ class AsyncAdHocClient:
                     logit_bias={"string": {"key": "value"}},
                     custom_parameters={"string": {"key": "value"}},
                 ),
-                settings=PromptSettingsRequest(
+                settings=PromptSettings(
                     timeout=1.1,
                 ),
-                blocks=[
-                    JinjaPromptBlockRequest(
-                        properties=JinjaPromptBlockPropertiesRequest(
-                            template="string",
-                            template_type="STRING",
-                        ),
-                        id="string",
-                        state="ENABLED",
-                        cache_config=EphemeralPromptCacheConfigRequest(
-                            type={"key": "value"},
-                        ),
-                    )
-                ],
-                expand_meta=AdHocExpandMetaRequest(
+                blocks=[{"key": "value"}],
+                expand_meta=AdHocExpandMeta(
                     cost=True,
                     model_name=True,
                     usage=True,
@@ -362,22 +329,20 @@ class AsyncAdHocClient:
             json={
                 "ml_model": ml_model,
                 "input_values": convert_and_respect_annotation_metadata(
-                    object_=input_values, annotation=typing.Sequence[PromptRequestInputRequest], direction="write"
+                    object_=input_values, annotation=typing.Sequence[PromptRequestInput], direction="write"
                 ),
                 "input_variables": convert_and_respect_annotation_metadata(
-                    object_=input_variables, annotation=typing.Sequence[VellumVariableRequest], direction="write"
+                    object_=input_variables, annotation=typing.Sequence[VellumVariable], direction="write"
                 ),
                 "parameters": convert_and_respect_annotation_metadata(
-                    object_=parameters, annotation=PromptParametersRequest, direction="write"
+                    object_=parameters, annotation=PromptParameters, direction="write"
                 ),
                 "settings": convert_and_respect_annotation_metadata(
-                    object_=settings, annotation=PromptSettingsRequest, direction="write"
-                ),
-                "blocks": convert_and_respect_annotation_metadata(
-                    object_=blocks, annotation=typing.Sequence[PromptBlockRequest], direction="write"
+                    object_=settings, annotation=PromptSettings, direction="write"
                 ),
+                "blocks": blocks,
                 "expand_meta": convert_and_respect_annotation_metadata(
-                    object_=expand_meta, annotation=AdHocExpandMetaRequest, direction="write"
+                    object_=expand_meta, annotation=AdHocExpandMeta, direction="write"
                 ),
             },
             request_options=request_options,