agenta 0.48.9__py3-none-any.whl → 0.49.0__py3-none-any.whl

agenta/client/backend/evaluations/client.py

@@ -1,19 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..core.pydantic_utilities import parse_obj_as
-from ..errors.unprocessable_entity_error import UnprocessableEntityError
-from ..types.http_validation_error import HttpValidationError
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..types.evaluation import Evaluation
-from ..types.llm_run_rate_limit import LlmRunRateLimit
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..core.jsonable_encoder import jsonable_encoder
 from ..types.evaluation_scenario import EvaluationScenario
-from ..core.client_wrapper import AsyncClientWrapper
+from ..types.llm_run_rate_limit import LlmRunRateLimit
+from .raw_client import AsyncRawEvaluationsClient, RawEvaluationsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -21,7 +15,18 @@ OMIT = typing.cast(typing.Any, ...)
 
 class EvaluationsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = RawEvaluationsClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> RawEvaluationsClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        RawEvaluationsClient
+        """
+        return self._raw_client
 
     def fetch_evaluation_ids(
         self,
@@ -64,44 +69,17 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_evaluation_ids(
             resource_type="resource_type",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "evaluations/by_resource",
-            method="GET",
-            params={
-                "resource_type": resource_type,
-                "resource_ids": resource_ids,
-            },
+        _response = self._raw_client.fetch_evaluation_ids(
+            resource_type=resource_type,
+            resource_ids=resource_ids,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[str],
-                    parse_obj_as(
-                        type_=typing.List[str],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_list_evaluations(
         self, *, app_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -133,55 +111,24 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_list_evaluations(
             app_id="app_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "evaluations",
-            method="GET",
-            params={
-                "app_id": app_id,
-            },
-            request_options=request_options,
+        _response = self._raw_client.fetch_list_evaluations(
+            app_id=app_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Evaluation],
-                    parse_obj_as(
-                        type_=typing.List[Evaluation],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 create_evaluation(
         self,
         *,
         app_id: str,
-        variant_ids: typing.Sequence[str],
+        revisions_ids: typing.Sequence[str],
         evaluators_configs: typing.Sequence[str],
         testset_id: str,
         rate_limit: LlmRunRateLimit,
-        lm_providers_keys: typing.Optional[
-            typing.Dict[str, typing.Optional[str]]
-        ] = OMIT,
         correct_answer_column: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[Evaluation]:
@@ -196,7 +143,7 @@ class EvaluationsClient:
         ----------
         app_id : str
 
-        variant_ids : typing.Sequence[str]
+        revisions_ids : typing.Sequence[str]
 
         evaluators_configs : typing.Sequence[str]
 
@@ -204,8 +151,6 @@ class EvaluationsClient:
 
         rate_limit : LlmRunRateLimit
 
-        lm_providers_keys : typing.Optional[typing.Dict[str, typing.Optional[str]]]
-
         correct_answer_column : typing.Optional[str]
 
         request_options : typing.Optional[RequestOptions]
@@ -222,11 +167,10 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.create_evaluation(
             app_id="app_id",
-            variant_ids=["variant_ids"],
+            revisions_ids=["revisions_ids"],
             evaluators_configs=["evaluators_configs"],
             testset_id="testset_id",
             rate_limit=LlmRunRateLimit(
@@ -237,49 +181,16 @@ class EvaluationsClient:
             ),
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "evaluations",
-            method="POST",
-            json={
-                "app_id": app_id,
-                "variant_ids": variant_ids,
-                "evaluators_configs": evaluators_configs,
-                "testset_id": testset_id,
-                "rate_limit": convert_and_respect_annotation_metadata(
-                    object_=rate_limit, annotation=LlmRunRateLimit, direction="write"
-                ),
-                "lm_providers_keys": lm_providers_keys,
-                "correct_answer_column": correct_answer_column,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = self._raw_client.create_evaluation(
+            app_id=app_id,
+            revisions_ids=revisions_ids,
+            evaluators_configs=evaluators_configs,
+            testset_id=testset_id,
+            rate_limit=rate_limit,
+            correct_answer_column=correct_answer_column,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Evaluation],
-                    parse_obj_as(
-                        type_=typing.List[Evaluation],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 delete_evaluations(
         self,
@@ -314,44 +225,15 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.delete_evaluations(
             evaluations_ids=["evaluations_ids"],
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "evaluations",
-            method="DELETE",
-            json={
-                "evaluations_ids": evaluations_ids,
-            },
-            request_options=request_options,
-            omit=OMIT,
+        _response = self._raw_client.delete_evaluations(
+            evaluations_ids=evaluations_ids, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[str],
-                    parse_obj_as(
-                        type_=typing.List[str],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_status(
         self,
@@ -387,40 +269,15 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_evaluation_status(
             evaluation_id="evaluation_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}/status",
-            method="GET",
-            request_options=request_options,
+        _response = self._raw_client.fetch_evaluation_status(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    parse_obj_as(
-                        type_=typing.Optional[typing.Any],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_results(
         self,
@@ -456,40 +313,15 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_evaluation_results(
             evaluation_id="evaluation_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}/results",
-            method="GET",
-            request_options=request_options,
+        _response = self._raw_client.fetch_evaluation_results(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    parse_obj_as(
-                        type_=typing.Optional[typing.Any],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_scenarios(
         self,
@@ -527,40 +359,15 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_evaluation_scenarios(
             evaluation_id="evaluation_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}/evaluation_scenarios",
-            method="GET",
-            request_options=request_options,
+        _response = self._raw_client.fetch_evaluation_scenarios(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[EvaluationScenario],
-                    parse_obj_as(
-                        type_=typing.List[EvaluationScenario],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation(
         self,
@@ -595,42 +402,17 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_evaluation(
             evaluation_id="evaluation_id",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}",
-            method="GET",
-            request_options=request_options,
+        _response = self._raw_client.fetch_evaluation(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Evaluation,
-                    parse_obj_as(
-                        type_=Evaluation,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_scenarios(
+    def fetch_evaluation_scenarios_comparison_results(
         self,
         *,
         evaluations_ids: str,
@@ -666,48 +448,31 @@ class EvaluationsClient:
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
-        client.evaluations.fetch_evaluation_scenarios(
+        client.evaluations.fetch_evaluation_scenarios_comparison_results(
             evaluations_ids="evaluations_ids",
         )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "evaluations/evaluation_scenarios/comparison-results",
-            method="GET",
-            params={
-                "evaluations_ids": evaluations_ids,
-            },
-            request_options=request_options,
+        _response = self._raw_client.fetch_evaluation_scenarios_comparison_results(
+            evaluations_ids=evaluations_ids, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    parse_obj_as(
-                        type_=typing.Optional[typing.Any],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 AsyncEvaluationsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = AsyncRawEvaluationsClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> AsyncRawEvaluationsClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        AsyncRawEvaluationsClient
+        """
+        return self._raw_client
 
     async def fetch_evaluation_ids(
         self,
@@ -752,7 +517,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -764,38 +528,12 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "evaluations/by_resource",
-            method="GET",
-            params={
-                "resource_type": resource_type,
-                "resource_ids": resource_ids,
-            },
+        _response = await self._raw_client.fetch_evaluation_ids(
+            resource_type=resource_type,
+            resource_ids=resource_ids,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[str],
-                    parse_obj_as(
-                        type_=typing.List[str],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_list_evaluations(
         self, *, app_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -829,7 +567,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -841,49 +578,19 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "evaluations",
-            method="GET",
-            params={
-                "app_id": app_id,
-            },
-            request_options=request_options,
+        _response = await self._raw_client.fetch_list_evaluations(
+            app_id=app_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Evaluation],
-                    parse_obj_as(
-                        type_=typing.List[Evaluation],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 create_evaluation(
         self,
         *,
         app_id: str,
-        variant_ids: typing.Sequence[str],
+        revisions_ids: typing.Sequence[str],
         evaluators_configs: typing.Sequence[str],
         testset_id: str,
         rate_limit: LlmRunRateLimit,
-        lm_providers_keys: typing.Optional[
-            typing.Dict[str, typing.Optional[str]]
-        ] = OMIT,
         correct_answer_column: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[Evaluation]:
@@ -898,7 +605,7 @@ class AsyncEvaluationsClient:
         ----------
         app_id : str
 
-        variant_ids : typing.Sequence[str]
+        revisions_ids : typing.Sequence[str]
 
         evaluators_configs : typing.Sequence[str]
 
@@ -906,8 +613,6 @@ class AsyncEvaluationsClient:
 
         rate_limit : LlmRunRateLimit
 
-        lm_providers_keys : typing.Optional[typing.Dict[str, typing.Optional[str]]]
-
         correct_answer_column : typing.Optional[str]
 
         request_options : typing.Optional[RequestOptions]
@@ -926,14 +631,13 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
         async def main() -> None:
             await client.evaluations.create_evaluation(
                 app_id="app_id",
-                variant_ids=["variant_ids"],
+                revisions_ids=["revisions_ids"],
                 evaluators_configs=["evaluators_configs"],
                 testset_id="testset_id",
                 rate_limit=LlmRunRateLimit(
@@ -947,49 +651,16 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "evaluations",
-            method="POST",
-            json={
-                "app_id": app_id,
-                "variant_ids": variant_ids,
-                "evaluators_configs": evaluators_configs,
-                "testset_id": testset_id,
-                "rate_limit": convert_and_respect_annotation_metadata(
-                    object_=rate_limit, annotation=LlmRunRateLimit, direction="write"
-                ),
-                "lm_providers_keys": lm_providers_keys,
-                "correct_answer_column": correct_answer_column,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = await self._raw_client.create_evaluation(
+            app_id=app_id,
+            revisions_ids=revisions_ids,
+            evaluators_configs=evaluators_configs,
+            testset_id=testset_id,
+            rate_limit=rate_limit,
+            correct_answer_column=correct_answer_column,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[Evaluation],
-                    parse_obj_as(
-                        type_=typing.List[Evaluation],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 delete_evaluations(
         self,
@@ -1026,7 +697,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -1038,38 +708,10 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "evaluations",
-            method="DELETE",
-            json={
-                "evaluations_ids": evaluations_ids,
-            },
-            request_options=request_options,
-            omit=OMIT,
+        _response = await self._raw_client.delete_evaluations(
+            evaluations_ids=evaluations_ids, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[str],
-                    parse_obj_as(
-                        type_=typing.List[str],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_status(
         self,
@@ -1107,7 +749,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -1119,34 +760,10 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}/status",
-            method="GET",
-            request_options=request_options,
+        _response = await self._raw_client.fetch_evaluation_status(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    parse_obj_as(
-                        type_=typing.Optional[typing.Any],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_results(
         self,
@@ -1184,7 +801,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -1196,34 +812,10 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}/results",
-            method="GET",
-            request_options=request_options,
+        _response = await self._raw_client.fetch_evaluation_results(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    parse_obj_as(
-                        type_=typing.Optional[typing.Any],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_scenarios(
         self,
@@ -1263,7 +855,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -1275,34 +866,10 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}/evaluation_scenarios",
-            method="GET",
-            request_options=request_options,
+        _response = await self._raw_client.fetch_evaluation_scenarios(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[EvaluationScenario],
-                    parse_obj_as(
-                        type_=typing.List[EvaluationScenario],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation(
         self,
@@ -1339,7 +906,6 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
@@ -1351,36 +917,12 @@ class AsyncEvaluationsClient:
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"evaluations/{jsonable_encoder(evaluation_id)}",
-            method="GET",
-            request_options=request_options,
+        _response = await self._raw_client.fetch_evaluation(
+            evaluation_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Evaluation,
-                    parse_obj_as(
-                        type_=Evaluation,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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 fetch_evaluation_scenarios(
+    async def fetch_evaluation_scenarios_comparison_results(
         self,
         *,
         evaluations_ids: str,
@@ -1418,46 +960,20 @@ class AsyncEvaluationsClient:
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
         )
 
 
         async def main() -> None:
-            await client.evaluations.fetch_evaluation_scenarios(
+            await client.evaluations.fetch_evaluation_scenarios_comparison_results(
                 evaluations_ids="evaluations_ids",
             )
 
 
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "evaluations/evaluation_scenarios/comparison-results",
-            method="GET",
-            params={
-                "evaluations_ids": evaluations_ids,
-            },
-            request_options=request_options,
+        _response = (
+            await self._raw_client.fetch_evaluation_scenarios_comparison_results(
+                evaluations_ids=evaluations_ids, request_options=request_options
+            )
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.Optional[typing.Any],
-                    parse_obj_as(
-                        type_=typing.Optional[typing.Any],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # 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