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

vellum/client/resources/folder_entities/client.py

@@ -2,14 +2,12 @@
 
 import typing
 from ...core.client_wrapper import SyncClientWrapper
+from .raw_client import RawFolderEntitiesClient
 from .types.folder_entities_list_request_entity_status import FolderEntitiesListRequestEntityStatus
 from ...core.request_options import RequestOptions
 from ...types.paginated_folder_entity_list import PaginatedFolderEntityList
-from ...core.pydantic_utilities import parse_obj_as
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
-from ...core.jsonable_encoder import jsonable_encoder
 from ...core.client_wrapper import AsyncClientWrapper
+from .raw_client import AsyncRawFolderEntitiesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -17,9 +15,24 @@ OMIT = typing.cast(typing.Any, ...)
 
 class FolderEntitiesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = RawFolderEntitiesClient(client_wrapper=client_wrapper)
 
-    def list(
+    @property
+    def _client_wrapper(self) -> SyncClientWrapper:
+        return self._raw_client._client_wrapper
+
+    @property
+    def with_raw_response(self) -> RawFolderEntitiesClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        RawFolderEntitiesClient
+        """
+        return self._raw_client
+
+    def list_(
         self,
         *,
         parent_folder_id: str,
@@ -79,32 +92,15 @@ class FolderEntitiesClient:
             parent_folder_id="parent_folder_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/folder-entities",
-            base_url=self._client_wrapper.get_environment().default,
-            method="GET",
-            params={
-                "entity_status": entity_status,
-                "limit": limit,
-                "offset": offset,
-                "ordering": ordering,
-                "parent_folder_id": parent_folder_id,
-            },
+        response = self._raw_client.list(
+            parent_folder_id=parent_folder_id,
+            entity_status=entity_status,
+            limit=limit,
+            offset=offset,
+            ordering=ordering,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    PaginatedFolderEntityList,
-                    parse_obj_as(
-                        type_=PaginatedFolderEntityList,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data
 
     def add_entity_to_folder(
         self, folder_id: str, *, entity_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -147,33 +143,30 @@ class FolderEntitiesClient:
             entity_id="entity_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/folders/{jsonable_encoder(folder_id)}/add-entity",
-            base_url=self._client_wrapper.get_environment().default,
-            method="POST",
-            json={
-                "entity_id": entity_id,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        response = self._raw_client.add_entity_to_folder(
+            folder_id,
+            entity_id=entity_id,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data
 
 
 class AsyncFolderEntitiesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = AsyncRawFolderEntitiesClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> AsyncRawFolderEntitiesClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        AsyncRawFolderEntitiesClient
+        """
+        return self._raw_client
 
-    async def list(
+    async def list_(
         self,
         *,
         parent_folder_id: str,
@@ -241,32 +234,15 @@ class AsyncFolderEntitiesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/folder-entities",
-            base_url=self._client_wrapper.get_environment().default,
-            method="GET",
-            params={
-                "entity_status": entity_status,
-                "limit": limit,
-                "offset": offset,
-                "ordering": ordering,
-                "parent_folder_id": parent_folder_id,
-            },
+        response = await self._raw_client.list(
+            parent_folder_id=parent_folder_id,
+            entity_status=entity_status,
+            limit=limit,
+            offset=offset,
+            ordering=ordering,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    PaginatedFolderEntityList,
-                    parse_obj_as(
-                        type_=PaginatedFolderEntityList,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data
 
     async def add_entity_to_folder(
         self, folder_id: str, *, entity_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -317,23 +293,9 @@ class AsyncFolderEntitiesClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/folders/{jsonable_encoder(folder_id)}/add-entity",
-            base_url=self._client_wrapper.get_environment().default,
-            method="POST",
-            json={
-                "entity_id": entity_id,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        response = await self._raw_client.add_entity_to_folder(
+            folder_id,
+            entity_id=entity_id,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data

vellum/client/resources/folder_entities/raw_client.py

@@ -0,0 +1,277 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+from ...core.client_wrapper import SyncClientWrapper
+from .types.folder_entities_list_request_entity_status import FolderEntitiesListRequestEntityStatus
+from ...core.request_options import RequestOptions
+from ...core.http_response import HttpResponse
+from ...types.paginated_folder_entity_list import PaginatedFolderEntityList
+from ...core.pydantic_utilities import parse_obj_as
+from json.decoder import JSONDecodeError
+from ...core.api_error import ApiError
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.client_wrapper import AsyncClientWrapper
+from ...core.http_response import AsyncHttpResponse
+
+# this is used as the default value for optional parameters
+OMIT = typing.cast(typing.Any, ...)
+
+
+class RawFolderEntitiesClient:
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    def list(
+        self,
+        *,
+        parent_folder_id: str,
+        entity_status: typing.Optional[FolderEntitiesListRequestEntityStatus] = None,
+        limit: typing.Optional[int] = None,
+        offset: typing.Optional[int] = None,
+        ordering: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> HttpResponse[PaginatedFolderEntityList]:
+        """
+        List all folder entities within a specified folder.
+
+        Parameters
+        ----------
+        parent_folder_id : str
+            Filter down to only those entities whose parent folder has the specified ID.
+
+            To filter by an entity's parent folder, provide the ID of the parent folder. To filter by the root directory, provide
+            a string representing the entity type of the root directory. Supported root directories include:
+            - PROMPT_SANDBOX
+            - WORKFLOW_SANDBOX
+            - DOCUMENT_INDEX
+            - TEST_SUITE
+
+        entity_status : typing.Optional[FolderEntitiesListRequestEntityStatus]
+            Filter down to only those objects whose entities have a status matching the status specified.
+
+            * `ACTIVE` - Active
+            * `ARCHIVED` - Archived
+
+        limit : typing.Optional[int]
+            Number of results to return per page.
+
+        offset : typing.Optional[int]
+            The initial index from which to return the results.
+
+        ordering : typing.Optional[str]
+            Which field to use when ordering the results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        HttpResponse[PaginatedFolderEntityList]
+
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v1/folder-entities",
+            base_url=self._client_wrapper.get_environment().default,
+            method="GET",
+            params={
+                "entity_status": entity_status,
+                "limit": limit,
+                "offset": offset,
+                "ordering": ordering,
+                "parent_folder_id": parent_folder_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _data = typing.cast(
+                    PaginatedFolderEntityList,
+                    parse_obj_as(
+                        type_=PaginatedFolderEntityList,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                return HttpResponse(response=_response, data=_data)
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    def add_entity_to_folder(
+        self, folder_id: str, *, entity_id: str, request_options: typing.Optional[RequestOptions] = None
+    ) -> HttpResponse[None]:
+        """
+        Add an entity to a specific folder or root directory.
+
+        Adding an entity to a folder will remove it from any other folders it might have been a member of.
+
+        Parameters
+        ----------
+        folder_id : str
+            The ID of the folder to which the entity should be added. This can be a UUID of a folder, or the name of a root
+            directory. Supported root directories include:
+            - PROMPT_SANDBOX
+            - WORKFLOW_SANDBOX
+            - DOCUMENT_INDEX
+            - TEST_SUITE
+
+        entity_id : str
+            The ID of the entity you would like to move.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        HttpResponse[None]
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v1/folders/{jsonable_encoder(folder_id)}/add-entity",
+            base_url=self._client_wrapper.get_environment().default,
+            method="POST",
+            json={
+                "entity_id": entity_id,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return HttpResponse(response=_response, data=None)
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+
+class AsyncRawFolderEntitiesClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    async def list(
+        self,
+        *,
+        parent_folder_id: str,
+        entity_status: typing.Optional[FolderEntitiesListRequestEntityStatus] = None,
+        limit: typing.Optional[int] = None,
+        offset: typing.Optional[int] = None,
+        ordering: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncHttpResponse[PaginatedFolderEntityList]:
+        """
+        List all folder entities within a specified folder.
+
+        Parameters
+        ----------
+        parent_folder_id : str
+            Filter down to only those entities whose parent folder has the specified ID.
+
+            To filter by an entity's parent folder, provide the ID of the parent folder. To filter by the root directory, provide
+            a string representing the entity type of the root directory. Supported root directories include:
+            - PROMPT_SANDBOX
+            - WORKFLOW_SANDBOX
+            - DOCUMENT_INDEX
+            - TEST_SUITE
+
+        entity_status : typing.Optional[FolderEntitiesListRequestEntityStatus]
+            Filter down to only those objects whose entities have a status matching the status specified.
+
+            * `ACTIVE` - Active
+            * `ARCHIVED` - Archived
+
+        limit : typing.Optional[int]
+            Number of results to return per page.
+
+        offset : typing.Optional[int]
+            The initial index from which to return the results.
+
+        ordering : typing.Optional[str]
+            Which field to use when ordering the results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncHttpResponse[PaginatedFolderEntityList]
+
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v1/folder-entities",
+            base_url=self._client_wrapper.get_environment().default,
+            method="GET",
+            params={
+                "entity_status": entity_status,
+                "limit": limit,
+                "offset": offset,
+                "ordering": ordering,
+                "parent_folder_id": parent_folder_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _data = typing.cast(
+                    PaginatedFolderEntityList,
+                    parse_obj_as(
+                        type_=PaginatedFolderEntityList,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                return AsyncHttpResponse(response=_response, data=_data)
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def add_entity_to_folder(
+        self, folder_id: str, *, entity_id: str, request_options: typing.Optional[RequestOptions] = None
+    ) -> AsyncHttpResponse[None]:
+        """
+        Add an entity to a specific folder or root directory.
+
+        Adding an entity to a folder will remove it from any other folders it might have been a member of.
+
+        Parameters
+        ----------
+        folder_id : str
+            The ID of the folder to which the entity should be added. This can be a UUID of a folder, or the name of a root
+            directory. Supported root directories include:
+            - PROMPT_SANDBOX
+            - WORKFLOW_SANDBOX
+            - DOCUMENT_INDEX
+            - TEST_SUITE
+
+        entity_id : str
+            The ID of the entity you would like to move.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncHttpResponse[None]
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v1/folders/{jsonable_encoder(folder_id)}/add-entity",
+            base_url=self._client_wrapper.get_environment().default,
+            method="POST",
+            json={
+                "entity_id": entity_id,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                return AsyncHttpResponse(response=_response, data=None)
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)

vellum/client/resources/metric_definitions/client.py

@@ -2,16 +2,13 @@
 
 import typing
 from ...core.client_wrapper import SyncClientWrapper
+from .raw_client import RawMetricDefinitionsClient
 from ...types.metric_definition_input import MetricDefinitionInput
 from ...core.request_options import RequestOptions
 from ...types.metric_definition_execution import MetricDefinitionExecution
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.pydantic_utilities import parse_obj_as
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.metric_definition_history_item import MetricDefinitionHistoryItem
 from ...core.client_wrapper import AsyncClientWrapper
+from .raw_client import AsyncRawMetricDefinitionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -19,7 +16,22 @@ OMIT = typing.cast(typing.Any, ...)
 
 class MetricDefinitionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = RawMetricDefinitionsClient(client_wrapper=client_wrapper)
+
+    @property
+    def _client_wrapper(self) -> SyncClientWrapper:
+        return self._raw_client._client_wrapper
+
+    @property
+    def with_raw_response(self) -> RawMetricDefinitionsClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        RawMetricDefinitionsClient
+        """
+        return self._raw_client
 
     def execute_metric_definition(
         self,
@@ -69,35 +81,13 @@ class MetricDefinitionsClient:
             ],
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/metric-definitions/{jsonable_encoder(id)}/execute",
-            base_url=self._client_wrapper.get_environment().predict,
-            method="POST",
-            json={
-                "inputs": convert_and_respect_annotation_metadata(
-                    object_=inputs, annotation=typing.Sequence[MetricDefinitionInput], direction="write"
-                ),
-                "release_tag": release_tag,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        response = self._raw_client.execute_metric_definition(
+            id,
+            inputs=inputs,
+            release_tag=release_tag,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    MetricDefinitionExecution,
-                    parse_obj_as(
-                        type_=MetricDefinitionExecution,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data
 
     def metric_definition_history_item_retrieve(
         self, history_id_or_release_tag: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -132,30 +122,28 @@ class MetricDefinitionsClient:
             id="id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/metric-definitions/{jsonable_encoder(id)}/history/{jsonable_encoder(history_id_or_release_tag)}",
-            base_url=self._client_wrapper.get_environment().default,
-            method="GET",
+        response = self._raw_client.metric_definition_history_item_retrieve(
+            history_id_or_release_tag,
+            id,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    MetricDefinitionHistoryItem,
-                    parse_obj_as(
-                        type_=MetricDefinitionHistoryItem,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data
 
 
 class AsyncMetricDefinitionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = AsyncRawMetricDefinitionsClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> AsyncRawMetricDefinitionsClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        AsyncRawMetricDefinitionsClient
+        """
+        return self._raw_client
 
     async def execute_metric_definition(
         self,
@@ -213,35 +201,13 @@ class AsyncMetricDefinitionsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/metric-definitions/{jsonable_encoder(id)}/execute",
-            base_url=self._client_wrapper.get_environment().predict,
-            method="POST",
-            json={
-                "inputs": convert_and_respect_annotation_metadata(
-                    object_=inputs, annotation=typing.Sequence[MetricDefinitionInput], direction="write"
-                ),
-                "release_tag": release_tag,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        response = await self._raw_client.execute_metric_definition(
+            id,
+            inputs=inputs,
+            release_tag=release_tag,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    MetricDefinitionExecution,
-                    parse_obj_as(
-                        type_=MetricDefinitionExecution,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data
 
     async def metric_definition_history_item_retrieve(
         self, history_id_or_release_tag: str, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -284,22 +250,9 @@ class AsyncMetricDefinitionsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/metric-definitions/{jsonable_encoder(id)}/history/{jsonable_encoder(history_id_or_release_tag)}",
-            base_url=self._client_wrapper.get_environment().default,
-            method="GET",
+        response = await self._raw_client.metric_definition_history_item_retrieve(
+            history_id_or_release_tag,
+            id,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    MetricDefinitionHistoryItem,
-                    parse_obj_as(
-                        type_=MetricDefinitionHistoryItem,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return response.data