agenta 0.33.0a1__py3-none-any.whl → 0.33.0a3__py3-none-any.whl

agenta/client/backend/apps/client.py

@@ -249,6 +249,7 @@ class AppsClient:
         self,
         *,
         app_name: str,
+        template_key: typing.Optional[str] = OMIT,
         project_id: typing.Optional[str] = OMIT,
         workspace_id: typing.Optional[str] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
@@ -271,6 +272,8 @@ class AppsClient:
         ----------
         app_name : str
 
+        template_key : typing.Optional[str]
+
         project_id : typing.Optional[str]
 
         workspace_id : typing.Optional[str]
@@ -302,6 +305,7 @@ class AppsClient:
             method="POST",
             json={
                 "app_name": app_name,
+                "template_key": template_key,
                 "project_id": project_id,
                 "workspace_id": workspace_id,
                 "organization_id": organization_id,
@@ -499,7 +503,6 @@ class AppsClient:
         Args:
             app_id (str): The ID of the app to add the variant to.
             payload (AddVariantFromImagePayload): The payload containing information about the variant to add.
-            stoken_session (SessionContainer, optional): The session container. Defaults to Depends(verify_session()).
 
         Raises:
             HTTPException: If the feature flag is set to "demo" or if the image does not have a tag starting with the registry name (agenta-server) or if the image is not found or if the user does not have access to the app.
@@ -584,6 +587,186 @@ class AppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def add_variant_from_url(
+        self,
+        app_id: str,
+        *,
+        variant_name: str,
+        url: str,
+        base_name: typing.Optional[str] = OMIT,
+        config_name: typing.Optional[str] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> typing.Optional[typing.Any]:
+        """
+        Add a new variant to an app based on a URL.
+
+        Args:
+            app_id (str): The ID of the app to add the variant to.
+            payload (AddVariantFromURLPayload): The payload containing information about the variant to add.
+
+        Raises:
+            HTTPException: If the user does not have access to the app or if there is an error adding the variant.
+
+        Returns:
+            dict: The newly added variant.
+
+        Parameters
+        ----------
+        app_id : str
+
+        variant_name : str
+
+        url : str
+
+        base_name : typing.Optional[str]
+
+        config_name : typing.Optional[str]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        typing.Optional[typing.Any]
+            Successful Response
+
+        Examples
+        --------
+        from agenta import AgentaApi
+
+        client = AgentaApi(
+            api_key="YOUR_API_KEY",
+            base_url="https://yourhost.com/path/to/api",
+        )
+        client.apps.add_variant_from_url(
+            app_id="app_id",
+            variant_name="variant_name",
+            url="url",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"apps/{jsonable_encoder(app_id)}/variant/from-service",
+            method="POST",
+            json={
+                "variant_name": variant_name,
+                "url": url,
+                "base_name": base_name,
+                "config_name": config_name,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        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)
+
+    def add_variant_from_key(
+        self,
+        app_id: str,
+        *,
+        variant_name: str,
+        key: str,
+        base_name: typing.Optional[str] = OMIT,
+        config_name: typing.Optional[str] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> typing.Optional[typing.Any]:
+        """
+        Parameters
+        ----------
+        app_id : str
+
+        variant_name : str
+
+        key : str
+
+        base_name : typing.Optional[str]
+
+        config_name : typing.Optional[str]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        typing.Optional[typing.Any]
+            Successful Response
+
+        Examples
+        --------
+        from agenta import AgentaApi
+
+        client = AgentaApi(
+            api_key="YOUR_API_KEY",
+            base_url="https://yourhost.com/path/to/api",
+        )
+        client.apps.add_variant_from_key(
+            app_id="app_id",
+            variant_name="variant_name",
+            key="key",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"apps/{jsonable_encoder(app_id)}/variant/from-template",
+            method="POST",
+            json={
+                "variant_name": variant_name,
+                "key": key,
+                "base_name": base_name,
+                "config_name": config_name,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        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)
+
     def create_app_and_variant_from_template(
         self,
         *,
@@ -1068,6 +1251,7 @@ class AsyncAppsClient:
         self,
         *,
         app_name: str,
+        template_key: typing.Optional[str] = OMIT,
         project_id: typing.Optional[str] = OMIT,
         workspace_id: typing.Optional[str] = OMIT,
         organization_id: typing.Optional[str] = OMIT,
@@ -1090,6 +1274,8 @@ class AsyncAppsClient:
         ----------
         app_name : str
 
+        template_key : typing.Optional[str]
+
         project_id : typing.Optional[str]
 
         workspace_id : typing.Optional[str]
@@ -1129,6 +1315,7 @@ class AsyncAppsClient:
             method="POST",
             json={
                 "app_name": app_name,
+                "template_key": template_key,
                 "project_id": project_id,
                 "workspace_id": workspace_id,
                 "organization_id": organization_id,
@@ -1342,7 +1529,6 @@ class AsyncAppsClient:
         Args:
             app_id (str): The ID of the app to add the variant to.
             payload (AddVariantFromImagePayload): The payload containing information about the variant to add.
-            stoken_session (SessionContainer, optional): The session container. Defaults to Depends(verify_session()).
 
         Raises:
             HTTPException: If the feature flag is set to "demo" or if the image does not have a tag starting with the registry name (agenta-server) or if the image is not found or if the user does not have access to the app.
@@ -1435,6 +1621,202 @@ class AsyncAppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def add_variant_from_url(
+        self,
+        app_id: str,
+        *,
+        variant_name: str,
+        url: str,
+        base_name: typing.Optional[str] = OMIT,
+        config_name: typing.Optional[str] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> typing.Optional[typing.Any]:
+        """
+        Add a new variant to an app based on a URL.
+
+        Args:
+            app_id (str): The ID of the app to add the variant to.
+            payload (AddVariantFromURLPayload): The payload containing information about the variant to add.
+
+        Raises:
+            HTTPException: If the user does not have access to the app or if there is an error adding the variant.
+
+        Returns:
+            dict: The newly added variant.
+
+        Parameters
+        ----------
+        app_id : str
+
+        variant_name : str
+
+        url : str
+
+        base_name : typing.Optional[str]
+
+        config_name : typing.Optional[str]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        typing.Optional[typing.Any]
+            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.add_variant_from_url(
+                app_id="app_id",
+                variant_name="variant_name",
+                url="url",
+            )
+
+
+        asyncio.run(main())
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"apps/{jsonable_encoder(app_id)}/variant/from-service",
+            method="POST",
+            json={
+                "variant_name": variant_name,
+                "url": url,
+                "base_name": base_name,
+                "config_name": config_name,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        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)
+
+    async def add_variant_from_key(
+        self,
+        app_id: str,
+        *,
+        variant_name: str,
+        key: str,
+        base_name: typing.Optional[str] = OMIT,
+        config_name: typing.Optional[str] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> typing.Optional[typing.Any]:
+        """
+        Parameters
+        ----------
+        app_id : str
+
+        variant_name : str
+
+        key : str
+
+        base_name : typing.Optional[str]
+
+        config_name : typing.Optional[str]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        typing.Optional[typing.Any]
+            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.add_variant_from_key(
+                app_id="app_id",
+                variant_name="variant_name",
+                key="key",
+            )
+
+
+        asyncio.run(main())
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"apps/{jsonable_encoder(app_id)}/variant/from-template",
+            method="POST",
+            json={
+                "variant_name": variant_name,
+                "key": key,
+                "base_name": base_name,
+                "config_name": config_name,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        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)
+
     async def create_app_and_variant_from_template(
         self,
         *,

agenta/client/backend/client.py

@@ -3,7 +3,7 @@
 import typing
 import httpx
 from .core.client_wrapper import SyncClientWrapper
-from .observability.client import ObservabilityClient
+from .admin.client import AdminClient
 from .vault.client import VaultClient
 from .access_control.client import AccessControlClient
 from .scopes.client import ScopesClient
@@ -17,7 +17,7 @@ from .containers.client import ContainersClient
 from .environments.client import EnvironmentsClient
 from .bases.client import BasesClient
 from .configs.client import ConfigsClient
-from .observability_v_1.client import ObservabilityV1Client
+from .observability.client import ObservabilityClient
 from .core.request_options import RequestOptions
 from .types.list_api_keys_response import ListApiKeysResponse
 from .core.pydantic_utilities import parse_obj_as
@@ -35,7 +35,7 @@ import datetime as dt
 from .types.workspace_role_response import WorkspaceRoleResponse
 from .types.permission import Permission
 from .core.client_wrapper import AsyncClientWrapper
-from .observability.client import AsyncObservabilityClient
+from .admin.client import AsyncAdminClient
 from .vault.client import AsyncVaultClient
 from .access_control.client import AsyncAccessControlClient
 from .scopes.client import AsyncScopesClient
@@ -49,7 +49,7 @@ from .containers.client import AsyncContainersClient
 from .environments.client import AsyncEnvironmentsClient
 from .bases.client import AsyncBasesClient
 from .configs.client import AsyncConfigsClient
-from .observability_v_1.client import AsyncObservabilityV1Client
+from .observability.client import AsyncObservabilityClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -99,20 +99,16 @@ class AgentaApi:
         self._client_wrapper = SyncClientWrapper(
             base_url=base_url,
             api_key=api_key,
-            httpx_client=(
-                httpx_client
-                if httpx_client is not None
-                else (
-                    httpx.Client(
-                        timeout=_defaulted_timeout, follow_redirects=follow_redirects
-                    )
-                    if follow_redirects is not None
-                    else httpx.Client(timeout=_defaulted_timeout)
-                )
-            ),
+            httpx_client=httpx_client
+            if httpx_client is not None
+            else httpx.Client(
+                timeout=_defaulted_timeout, follow_redirects=follow_redirects
+            )
+            if follow_redirects is not None
+            else httpx.Client(timeout=_defaulted_timeout),
             timeout=_defaulted_timeout,
         )
-        self.observability = ObservabilityClient(client_wrapper=self._client_wrapper)
+        self.admin = AdminClient(client_wrapper=self._client_wrapper)
         self.vault = VaultClient(client_wrapper=self._client_wrapper)
         self.access_control = AccessControlClient(client_wrapper=self._client_wrapper)
         self.scopes = ScopesClient(client_wrapper=self._client_wrapper)
@@ -128,9 +124,7 @@ class AgentaApi:
         self.environments = EnvironmentsClient(client_wrapper=self._client_wrapper)
         self.bases = BasesClient(client_wrapper=self._client_wrapper)
         self.configs = ConfigsClient(client_wrapper=self._client_wrapper)
-        self.observability_v_1 = ObservabilityV1Client(
-            client_wrapper=self._client_wrapper
-        )
+        self.observability = ObservabilityClient(client_wrapper=self._client_wrapper)
 
     def list_api_keys(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -315,9 +309,6 @@ class AgentaApi:
         """
         This Function is called by the CLI and is used to validate an API key provided by a user in agenta init setup.
         Returns:
-
-
-
             bool: True. If the request reaches this point, the API key is valid.
 
         Parameters
@@ -1639,22 +1630,16 @@ class AsyncAgentaApi:
         self._client_wrapper = AsyncClientWrapper(
             base_url=base_url,
             api_key=api_key,
-            httpx_client=(
-                httpx_client
-                if httpx_client is not None
-                else (
-                    httpx.AsyncClient(
-                        timeout=_defaulted_timeout, follow_redirects=follow_redirects
-                    )
-                    if follow_redirects is not None
-                    else httpx.AsyncClient(timeout=_defaulted_timeout)
-                )
-            ),
+            httpx_client=httpx_client
+            if httpx_client is not None
+            else httpx.AsyncClient(
+                timeout=_defaulted_timeout, follow_redirects=follow_redirects
+            )
+            if follow_redirects is not None
+            else httpx.AsyncClient(timeout=_defaulted_timeout),
             timeout=_defaulted_timeout,
         )
-        self.observability = AsyncObservabilityClient(
-            client_wrapper=self._client_wrapper
-        )
+        self.admin = AsyncAdminClient(client_wrapper=self._client_wrapper)
         self.vault = AsyncVaultClient(client_wrapper=self._client_wrapper)
         self.access_control = AsyncAccessControlClient(
             client_wrapper=self._client_wrapper
@@ -1672,7 +1657,7 @@ class AsyncAgentaApi:
         self.environments = AsyncEnvironmentsClient(client_wrapper=self._client_wrapper)
         self.bases = AsyncBasesClient(client_wrapper=self._client_wrapper)
         self.configs = AsyncConfigsClient(client_wrapper=self._client_wrapper)
-        self.observability_v_1 = AsyncObservabilityV1Client(
+        self.observability = AsyncObservabilityClient(
             client_wrapper=self._client_wrapper
         )
 
@@ -1883,9 +1868,6 @@ class AsyncAgentaApi:
         """
         This Function is called by the CLI and is used to validate an API key provided by a user in agenta init setup.
         Returns:
-
-
-
             bool: True. If the request reaches this point, the API key is valid.
 
         Parameters

agenta/client/backend/core/http_client.py

@@ -148,9 +148,9 @@ def get_request_body(
         json_body = maybe_filter_request_body(json, request_options, omit)
 
     # If you have an empty JSON body, you should just send None
-    return (json_body if json_body != {} else None), (
-        data_body if data_body != {} else None
-    )
+    return (
+        json_body if json_body != {} else None
+    ), data_body if data_body != {} else None
 
 
 class HttpClient:

agenta/client/backend/evaluations/client.py

@@ -326,9 +326,6 @@ class EvaluationsClient:
             json={
                 "evaluations_ids": evaluations_ids,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1047,9 +1044,6 @@ class AsyncEvaluationsClient:
             json={
                 "evaluations_ids": evaluations_ids,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/human_evaluations/client.py

@@ -556,9 +556,7 @@ class HumanEvaluationsClient:
             method="PUT",
             json={
                 "vote": vote,
-                "score": convert_and_respect_annotation_metadata(
-                    object_=score, annotation=Score, direction="write"
-                ),
+                "score": score,
                 "correct_answer": correct_answer,
                 "outputs": convert_and_respect_annotation_metadata(
                     object_=outputs,
@@ -1408,9 +1406,7 @@ class AsyncHumanEvaluationsClient:
             method="PUT",
             json={
                 "vote": vote,
-                "score": convert_and_respect_annotation_metadata(
-                    object_=score, annotation=Score, direction="write"
-                ),
+                "score": score,
                 "correct_answer": correct_answer,
                 "outputs": convert_and_respect_annotation_metadata(
                     object_=outputs,

agenta/client/backend/observability/__init__.py

@@ -1 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
+
+from .types import Format, QueryAnalyticsResponse, QueryTracesResponse
+
+__all__ = ["Format", "QueryAnalyticsResponse", "QueryTracesResponse"]