agenta 0.36.4__py3-none-any.whl → 0.37.0__py3-none-any.whl

agenta/client/{apps → backend/apps}/client.py

@@ -33,7 +33,6 @@ class AppsClient:
 
         Args:
             app_id (str): The ID of the app to retrieve variants for.
-            stoken_session (SessionContainer, optional): The session container to verify the user's session. Defaults to Depends(verify_session()).
 
         Returns:
             List[AppVariantResponse]: A list of app variants for the given app ID.
@@ -104,7 +103,6 @@ class AppsClient:
         Args:
             app_id (str): The ID of the app to retrieve the variant for.
             environment (str): The environment of the app variant to retrieve.
-            stoken_session (SessionContainer, optional): The session token container. Defaults to Depends(verify_session()).
 
         Raises:
             HTTPException: If the app variant is not found (status_code=500), or if a ValueError is raised (status_code=400), or if any other exception is raised (status_code=500).
@@ -183,7 +181,6 @@ class AppsClient:
 
         Args:
             app_name (Optional[str]): The name of the app to filter by.
-            stoken_session (SessionContainer): The session container.
 
         Returns:
             List[App]: A list of apps filtered by app_name.
@@ -260,7 +257,6 @@ class AppsClient:
 
         Args:
             payload (CreateApp): The payload containing the app name and organization ID (optional).
-            stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
             CreateAppOutput: The output containing the newly created app's ID and name.
@@ -415,7 +411,6 @@ class AppsClient:
         Args:
             app_id (str): The ID of the app.
             payload (UpdateApp): The payload containing the app name.
-            stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
             UpdateAppOuput: The output containing the newly created app's ID and name.
@@ -767,107 +762,6 @@ class AppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def create_app_and_variant_from_template(
-        self,
-        *,
-        app_name: str,
-        template_id: str,
-        env_vars: typing.Dict[str, str],
-        project_id: typing.Optional[str] = OMIT,
-        workspace_id: typing.Optional[str] = OMIT,
-        organization_id: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> AppVariantResponse:
-        """
-        Create an app and variant from a template.
-
-        Args:
-            payload (CreateAppVariant): The payload containing the app and variant information.
-            stoken_session (SessionContainer, optional): The session container. Defaults to Depends(verify_session()).
-
-        Raises:
-            HTTPException: If the user has reached the app limit or if an app with the same name already exists.
-
-        Returns:
-            AppVariantResponse: The output of the created app variant.
-
-        Parameters
-        ----------
-        app_name : str
-
-        template_id : str
-
-        env_vars : typing.Dict[str, str]
-
-        project_id : typing.Optional[str]
-
-        workspace_id : typing.Optional[str]
-
-        organization_id : typing.Optional[str]
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        AppVariantResponse
-            Successful Response
-
-        Examples
-        --------
-        from agenta import AgentaApi
-
-        client = AgentaApi(
-            api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
-        )
-        client.apps.create_app_and_variant_from_template(
-            app_name="app_name",
-            template_id="template_id",
-            env_vars={"key": "value"},
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "apps/app_and_variant_from_template",
-            method="POST",
-            json={
-                "app_name": app_name,
-                "template_id": template_id,
-                "project_id": project_id,
-                "workspace_id": workspace_id,
-                "env_vars": env_vars,
-                "organization_id": organization_id,
-            },
-            headers={
-                "content-type": "application/json",
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    AppVariantResponse,
-                    parse_obj_as(
-                        type_=AppVariantResponse,  # 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)
-
     def list_environments(
         self, app_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> typing.List[EnvironmentOutput]:
@@ -876,7 +770,6 @@ class AppsClient:
 
         Args:
             app_id (str): The ID of the app to retrieve environments for.
-            stoken_session (SessionContainer, optional): The session container. Defaults to Depends(verify_session()).
 
         Returns:
             List[EnvironmentOutput]: A list of environment objects.
@@ -1011,7 +904,6 @@ class AsyncAppsClient:
 
         Args:
             app_id (str): The ID of the app to retrieve variants for.
-            stoken_session (SessionContainer, optional): The session container to verify the user's session. Defaults to Depends(verify_session()).
 
         Returns:
             List[AppVariantResponse]: A list of app variants for the given app ID.
@@ -1090,7 +982,6 @@ class AsyncAppsClient:
         Args:
             app_id (str): The ID of the app to retrieve the variant for.
             environment (str): The environment of the app variant to retrieve.
-            stoken_session (SessionContainer, optional): The session token container. Defaults to Depends(verify_session()).
 
         Raises:
             HTTPException: If the app variant is not found (status_code=500), or if a ValueError is raised (status_code=400), or if any other exception is raised (status_code=500).
@@ -1177,7 +1068,6 @@ class AsyncAppsClient:
 
         Args:
             app_name (Optional[str]): The name of the app to filter by.
-            stoken_session (SessionContainer): The session container.
 
         Returns:
             List[App]: A list of apps filtered by app_name.
@@ -1262,7 +1152,6 @@ class AsyncAppsClient:
 
         Args:
             payload (CreateApp): The payload containing the app name and organization ID (optional).
-            stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
             CreateAppOutput: The output containing the newly created app's ID and name.
@@ -1433,7 +1322,6 @@ class AsyncAppsClient:
         Args:
             app_id (str): The ID of the app.
             payload (UpdateApp): The payload containing the app name.
-            stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
             UpdateAppOuput: The output containing the newly created app's ID and name.
@@ -1817,115 +1705,6 @@ class AsyncAppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def create_app_and_variant_from_template(
-        self,
-        *,
-        app_name: str,
-        template_id: str,
-        env_vars: typing.Dict[str, str],
-        project_id: typing.Optional[str] = OMIT,
-        workspace_id: typing.Optional[str] = OMIT,
-        organization_id: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> AppVariantResponse:
-        """
-        Create an app and variant from a template.
-
-        Args:
-            payload (CreateAppVariant): The payload containing the app and variant information.
-            stoken_session (SessionContainer, optional): The session container. Defaults to Depends(verify_session()).
-
-        Raises:
-            HTTPException: If the user has reached the app limit or if an app with the same name already exists.
-
-        Returns:
-            AppVariantResponse: The output of the created app variant.
-
-        Parameters
-        ----------
-        app_name : str
-
-        template_id : str
-
-        env_vars : typing.Dict[str, str]
-
-        project_id : typing.Optional[str]
-
-        workspace_id : typing.Optional[str]
-
-        organization_id : typing.Optional[str]
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        AppVariantResponse
-            Successful Response
-
-        Examples
-        --------
-        import asyncio
-
-        from agenta import AsyncAgentaApi
-
-        client = AsyncAgentaApi(
-            api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
-        )
-
-
-        async def main() -> None:
-            await client.apps.create_app_and_variant_from_template(
-                app_name="app_name",
-                template_id="template_id",
-                env_vars={"key": "value"},
-            )
-
-
-        asyncio.run(main())
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "apps/app_and_variant_from_template",
-            method="POST",
-            json={
-                "app_name": app_name,
-                "template_id": template_id,
-                "project_id": project_id,
-                "workspace_id": workspace_id,
-                "env_vars": env_vars,
-                "organization_id": organization_id,
-            },
-            headers={
-                "content-type": "application/json",
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    AppVariantResponse,
-                    parse_obj_as(
-                        type_=AppVariantResponse,  # 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)
-
     async def list_environments(
         self, app_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> typing.List[EnvironmentOutput]:
@@ -1934,7 +1713,6 @@ class AsyncAppsClient:
 
         Args:
             app_id (str): The ID of the app to retrieve environments for.
-            stoken_session (SessionContainer, optional): The session container. Defaults to Depends(verify_session()).
 
         Returns:
             List[EnvironmentOutput]: A list of environment objects.

agenta/client/{containers → backend/containers}/client.py

@@ -37,7 +37,6 @@ class ContainersClient:
             app_id (str): The ID of the application to build the image for.
             base_name (str): The base name of the image to build.
             tar_file (UploadFile): The tar file containing the application code.
-            stoken_session (SessionContainer): The session container for the user making the request.
 
         Returns:
             Image: The Docker image that was built.
@@ -83,11 +82,7 @@ class ContainersClient:
             files={
                 "tar_file": tar_file,
             },
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
             omit=OMIT,
         )
         try:
@@ -159,11 +154,7 @@ class ContainersClient:
             headers={
                 "content-type": "application/json",
             },
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
             omit=OMIT,
         )
         try:
@@ -196,12 +187,8 @@ class ContainersClient:
         """
         Returns a list of templates available for creating new containers.
 
-        Parameters:
-        stoken_session (SessionContainer): The session container for the user.
-
         Returns:
-
-        Union[List[Template], str]: A list of templates or an error message.
+            Union[List[Template], str]: A list of templates or an error message.
 
         Parameters
         ----------
@@ -226,11 +213,7 @@ class ContainersClient:
         _response = self._client_wrapper.httpx_client.request(
             "containers/templates",
             method="GET",
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -257,23 +240,14 @@ class ContainersClient:
         Constructs the URL for an app container based on the provided base_id or variant_id.
 
         Args:
-
-
-
             base_id (Optional[str]): The ID of the base to use for the app container.
             variant_id (Optional[str]): The ID of the variant to use for the app container.
             request (Request): The request object.
 
         Returns:
-
-
-
             URI: The URI for the app container.
 
         Raises:
-
-
-
             HTTPException: If the base or variant cannot be found or the user does not have access.
 
         Parameters
@@ -307,11 +281,7 @@ class ContainersClient:
                 "base_id": base_id,
                 "variant_id": variant_id,
             },
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -357,7 +327,6 @@ class AsyncContainersClient:
             app_id (str): The ID of the application to build the image for.
             base_name (str): The base name of the image to build.
             tar_file (UploadFile): The tar file containing the application code.
-            stoken_session (SessionContainer): The session container for the user making the request.
 
         Returns:
             Image: The Docker image that was built.
@@ -411,11 +380,7 @@ class AsyncContainersClient:
             files={
                 "tar_file": tar_file,
             },
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
             omit=OMIT,
         )
         try:
@@ -495,11 +460,7 @@ class AsyncContainersClient:
             headers={
                 "content-type": "application/json",
             },
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
             omit=OMIT,
         )
         try:
@@ -532,12 +493,8 @@ class AsyncContainersClient:
         """
         Returns a list of templates available for creating new containers.
 
-        Parameters:
-        stoken_session (SessionContainer): The session container for the user.
-
         Returns:
-
-        Union[List[Template], str]: A list of templates or an error message.
+            Union[List[Template], str]: A list of templates or an error message.
 
         Parameters
         ----------
@@ -570,11 +527,7 @@ class AsyncContainersClient:
         _response = await self._client_wrapper.httpx_client.request(
             "containers/templates",
             method="GET",
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -601,23 +554,14 @@ class AsyncContainersClient:
         Constructs the URL for an app container based on the provided base_id or variant_id.
 
         Args:
-
-
-
             base_id (Optional[str]): The ID of the base to use for the app container.
             variant_id (Optional[str]): The ID of the variant to use for the app container.
             request (Request): The request object.
 
         Returns:
-
-
-
             URI: The URI for the app container.
 
         Raises:
-
-
-
             HTTPException: If the base or variant cannot be found or the user does not have access.
 
         Parameters
@@ -659,11 +603,7 @@ class AsyncContainersClient:
                 "base_id": base_id,
                 "variant_id": variant_id,
             },
-            request_options=(
-                {**request_options, "timeout_in_seconds": 600}
-                if request_options
-                else {"timeout_in_seconds": 600}
-            ),
+            request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:

agenta/client/{core → backend/core}/http_client.py

@@ -87,8 +87,8 @@ def _retry_timeout(response: httpx.Response, retries: int) -> float:
 
 
 def _should_retry(response: httpx.Response) -> bool:
-    retriable_400s = [429, 408, 409]
-    return response.status_code >= 500 or response.status_code in retriable_400s
+    retryable_400s = [429, 408, 409]
+    return response.status_code >= 500 or response.status_code in retryable_400s
 
 
 def remove_omit_from_dict(
@@ -195,7 +195,7 @@ class HttpClient:
         ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-        retries: int = 0,
+        retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
     ) -> httpx.Response:
         base_url = self.get_base_url(base_url)
@@ -299,7 +299,7 @@ class HttpClient:
         ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-        retries: int = 0,
+        retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
     ) -> typing.Iterator[httpx.Response]:
         base_url = self.get_base_url(base_url)
@@ -406,7 +406,7 @@ class AsyncHttpClient:
         ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-        retries: int = 0,
+        retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
     ) -> httpx.Response:
         base_url = self.get_base_url(base_url)
@@ -510,7 +510,7 @@ class AsyncHttpClient:
         ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
-        retries: int = 0,
+        retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
     ) -> typing.AsyncIterator[httpx.Response]:
         base_url = self.get_base_url(base_url)

agenta/client/{core → backend/core}/pydantic_utilities.py

@@ -81,7 +81,7 @@ def to_jsonable_with_fallback(
 class UniversalBaseModel(pydantic.BaseModel):
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
-            # Allow fields begining with `model_` to be used in the model
+            # Allow fields beginning with `model_` to be used in the model
             protected_namespaces=(),
         )  # type: ignore # Pydantic v2
 
@@ -143,7 +143,7 @@ class UniversalBaseModel(pydantic.BaseModel):
         Override the default dict method to `exclude_unset` by default. This function patches
         `exclude_unset` to work include fields within non-None default values.
         """
-        # Note: the logic here is multi-plexed given the levers exposed in Pydantic V1 vs V2
+        # Note: the logic here is multiplexed given the levers exposed in Pydantic V1 vs V2
         # Pydantic V1's .dict can be extremely slow, so we do not want to call it twice.
         #
         # We'd ideally do the same for Pydantic V2, but it shells out to a library to serialize models

agenta/client/{environments → backend/environments}/client.py

@@ -31,7 +31,6 @@ class EnvironmentsClient:
         Args:
             environment_name: Name of the environment to deploy to.
             variant_id: variant id to deploy.
-            stoken_session: . Defaults to Depends(verify_session()).
 
         Raises:
             HTTPException: If the deployment fails.
@@ -118,7 +117,6 @@ class AsyncEnvironmentsClient:
         Args:
             environment_name: Name of the environment to deploy to.
             variant_id: variant id to deploy.
-            stoken_session: . Defaults to Depends(verify_session()).
 
         Raises:
             HTTPException: If the deployment fails.

agenta/client/{human_evaluations → backend/human_evaluations}/client.py

@@ -612,7 +612,6 @@ class HumanEvaluationsClient:
 
         Args:
             evaluation_scenario_id: The ID of the evaluation scenario to fetch.
-            stoken_session: Session data, verified by `verify_session`.
 
         Returns:
             Dictionary containing the scenario ID and its score.
@@ -1462,7 +1461,6 @@ class AsyncHumanEvaluationsClient:
 
         Args:
             evaluation_scenario_id: The ID of the evaluation scenario to fetch.
-            stoken_session: Session data, verified by `verify_session`.
 
         Returns:
             Dictionary containing the scenario ID and its score.