agenta 0.28.2a2__py3-none-any.whl → 0.30.0__py3-none-any.whl

agenta/client/backend/client.py

@@ -4,6 +4,9 @@ import typing
 import httpx
 from .core.client_wrapper import SyncClientWrapper
 from .observability.client import ObservabilityClient
+from .vault.client import VaultClient
+from .access_control.client import AccessControlClient
+from .scopes.client import ScopesClient
 from .apps.client import AppsClient
 from .variants.client import VariantsClient
 from .evaluations.client import EvaluationsClient
@@ -19,9 +22,9 @@ from .types.list_api_keys_response import ListApiKeysResponse
 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 .errors.unprocessable_entity_error import UnprocessableEntityError
 from .types.http_validation_error import HttpValidationError
-from .core.jsonable_encoder import jsonable_encoder
 from .types.organization import Organization
 from .types.organization_output import OrganizationOutput
 from .types.invite_request import InviteRequest
@@ -32,6 +35,9 @@ from .types.workspace_role_response import WorkspaceRoleResponse
 from .types.permission import Permission
 from .core.client_wrapper import AsyncClientWrapper
 from .observability.client import AsyncObservabilityClient
+from .vault.client import AsyncVaultClient
+from .access_control.client import AsyncAccessControlClient
+from .scopes.client import AsyncScopesClient
 from .apps.client import AsyncAppsClient
 from .variants.client import AsyncVariantsClient
 from .evaluations.client import AsyncEvaluationsClient
@@ -101,6 +107,9 @@ class AgentaApi:
             timeout=_defaulted_timeout,
         )
         self.observability = ObservabilityClient(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)
         self.apps = AppsClient(client_wrapper=self._client_wrapper)
         self.variants = VariantsClient(client_wrapper=self._client_wrapper)
         self.evaluations = EvaluationsClient(client_wrapper=self._client_wrapper)
@@ -166,10 +175,7 @@ class AgentaApi:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create_api_key(
-        self,
-        *,
-        workspace_id: str,
-        request_options: typing.Optional[RequestOptions] = None,
+        self, *, request_options: typing.Optional[RequestOptions] = None
     ) -> str:
         """
         Creates an API key for a user.
@@ -182,8 +188,6 @@ class AgentaApi:
 
         Parameters
         ----------
-        workspace_id : str
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -200,16 +204,11 @@ class AgentaApi:
             api_key="YOUR_API_KEY",
             base_url="https://yourhost.com/path/to/api",
         )
-        client.create_api_key(
-            workspace_id="workspace_id",
-        )
+        client.create_api_key()
         """
         _response = self._client_wrapper.httpx_client.request(
             "keys",
             method="POST",
-            params={
-                "workspace_id": workspace_id,
-            },
             request_options=request_options,
         )
         try:
@@ -221,16 +220,6 @@ class AgentaApi:
                         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)
@@ -476,6 +465,9 @@ class AgentaApi:
                 "description": description,
                 "type": type,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -660,6 +652,9 @@ class AgentaApi:
                 "description": description,
                 "updated_at": updated_at,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -821,6 +816,9 @@ class AgentaApi:
             json={
                 "email": email,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -910,6 +908,9 @@ class AgentaApi:
             json={
                 "token": token,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -986,6 +987,9 @@ class AgentaApi:
                 "description": description,
                 "type": type,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1065,6 +1069,9 @@ class AgentaApi:
                 "description": description,
                 "updated_at": updated_at,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1262,6 +1269,9 @@ class AgentaApi:
                 "organization_id": organization_id,
                 "role": role,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1632,6 +1642,11 @@ class AsyncAgentaApi:
         self.observability = AsyncObservabilityClient(
             client_wrapper=self._client_wrapper
         )
+        self.vault = AsyncVaultClient(client_wrapper=self._client_wrapper)
+        self.access_control = AsyncAccessControlClient(
+            client_wrapper=self._client_wrapper
+        )
+        self.scopes = AsyncScopesClient(client_wrapper=self._client_wrapper)
         self.apps = AsyncAppsClient(client_wrapper=self._client_wrapper)
         self.variants = AsyncVariantsClient(client_wrapper=self._client_wrapper)
         self.evaluations = AsyncEvaluationsClient(client_wrapper=self._client_wrapper)
@@ -1705,10 +1720,7 @@ class AsyncAgentaApi:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create_api_key(
-        self,
-        *,
-        workspace_id: str,
-        request_options: typing.Optional[RequestOptions] = None,
+        self, *, request_options: typing.Optional[RequestOptions] = None
     ) -> str:
         """
         Creates an API key for a user.
@@ -1721,8 +1733,6 @@ class AsyncAgentaApi:
 
         Parameters
         ----------
-        workspace_id : str
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1744,9 +1754,7 @@ class AsyncAgentaApi:
 
 
         async def main() -> None:
-            await client.create_api_key(
-                workspace_id="workspace_id",
-            )
+            await client.create_api_key()
 
 
         asyncio.run(main())
@@ -1754,9 +1762,6 @@ class AsyncAgentaApi:
         _response = await self._client_wrapper.httpx_client.request(
             "keys",
             method="POST",
-            params={
-                "workspace_id": workspace_id,
-            },
             request_options=request_options,
         )
         try:
@@ -1768,16 +1773,6 @@ class AsyncAgentaApi:
                         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)
@@ -2055,6 +2050,9 @@ class AsyncAgentaApi:
                 "description": description,
                 "type": type,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -2263,6 +2261,9 @@ class AsyncAgentaApi:
                 "description": description,
                 "updated_at": updated_at,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -2440,6 +2441,9 @@ class AsyncAgentaApi:
             json={
                 "email": email,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -2537,6 +2541,9 @@ class AsyncAgentaApi:
             json={
                 "token": token,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -2621,6 +2628,9 @@ class AsyncAgentaApi:
                 "description": description,
                 "type": type,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -2708,6 +2718,9 @@ class AsyncAgentaApi:
                 "description": description,
                 "updated_at": updated_at,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -2929,6 +2942,9 @@ class AsyncAgentaApi:
                 "organization_id": organization_id,
                 "role": role,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/configs/client.py

@@ -143,6 +143,9 @@ class ConfigsClient:
                 "parameters": parameters,
                 "overwrite": overwrite,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -434,6 +437,9 @@ class AsyncConfigsClient:
                 "parameters": parameters,
                 "overwrite": overwrite,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/containers/client.py

@@ -156,6 +156,9 @@ class ContainersClient:
             json={
                 "variant_id": variant_id,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -468,6 +471,9 @@ class AsyncContainersClient:
             json={
                 "variant_id": variant_id,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/core/file.py

@@ -43,23 +43,28 @@ def convert_file_dict_to_httpx_tuples(
     return httpx_tuples
 
 
-def with_content_type(*, file: File, content_type: str) -> File:
-    """ """
+def with_content_type(*, file: File, default_content_type: str) -> File:
+    """
+    This function resolves to the file's content type, if provided, and defaults
+    to the default_content_type value if not.
+    """
     if isinstance(file, tuple):
         if len(file) == 2:
             filename, content = cast(Tuple[Optional[str], FileContent], file)  # type: ignore
-            return (filename, content, content_type)
+            return (filename, content, default_content_type)
         elif len(file) == 3:
-            filename, content, _ = cast(
+            filename, content, file_content_type = cast(
                 Tuple[Optional[str], FileContent, Optional[str]], file
             )  # type: ignore
-            return (filename, content, content_type)
+            out_content_type = file_content_type or default_content_type
+            return (filename, content, out_content_type)
         elif len(file) == 4:
-            filename, content, _, headers = cast(  # type: ignore
+            filename, content, file_content_type, headers = cast(  # type: ignore
                 Tuple[Optional[str], FileContent, Optional[str], Mapping[str, str]],
                 file,
             )
-            return (filename, content, content_type, headers)
+            out_content_type = file_content_type or default_content_type
+            return (filename, content, out_content_type, headers)
         else:
             raise ValueError(f"Unexpected tuple length: {len(file)}")
-    return (None, file, content_type)
+    return (None, file, default_content_type)

agenta/client/backend/environments/client.py

@@ -70,6 +70,9 @@ class EnvironmentsClient:
                 "environment_name": environment_name,
                 "variant_id": variant_id,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -162,6 +165,9 @@ class AsyncEnvironmentsClient:
                 "environment_name": environment_name,
                 "variant_id": variant_id,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/evaluations/client.py

@@ -34,6 +34,7 @@ class EvaluationsClient:
         Fetches evaluation ids for a given resource type and id.
 
         Arguments:
+        app_id (str): The ID of the app for which to fetch evaluations.
         resource_type (str): The type of resource for which to fetch evaluations.
         resource_ids List[ObjectId]: The IDs of resource for which to fetch evaluations.
 
@@ -250,6 +251,9 @@ class EvaluationsClient:
                 "lm_providers_keys": lm_providers_keys,
                 "correct_answer_column": correct_answer_column,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -322,6 +326,9 @@ class EvaluationsClient:
             json={
                 "evaluations_ids": evaluations_ids,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -716,6 +723,7 @@ class AsyncEvaluationsClient:
         Fetches evaluation ids for a given resource type and id.
 
         Arguments:
+        app_id (str): The ID of the app for which to fetch evaluations.
         resource_type (str): The type of resource for which to fetch evaluations.
         resource_ids List[ObjectId]: The IDs of resource for which to fetch evaluations.
 
@@ -727,7 +735,6 @@ class AsyncEvaluationsClient:
 
         Parameters
         ----------
-
         resource_type : str
 
         resource_ids : typing.Optional[typing.Union[str, typing.Sequence[str]]]
@@ -957,6 +964,9 @@ class AsyncEvaluationsClient:
                 "lm_providers_keys": lm_providers_keys,
                 "correct_answer_column": correct_answer_column,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1037,6 +1047,9 @@ class AsyncEvaluationsClient:
             json={
                 "evaluations_ids": evaluations_ids,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/evaluators/client.py

@@ -122,6 +122,9 @@ class EvaluatorsClient:
                 "inputs": inputs,
                 "mapping": mapping,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -209,6 +212,9 @@ class EvaluatorsClient:
                 "settings": settings,
                 "credentials": credentials,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -364,6 +370,9 @@ class EvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -511,6 +520,9 @@ class EvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -726,6 +738,9 @@ class AsyncEvaluatorsClient:
                 "inputs": inputs,
                 "mapping": mapping,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -821,6 +836,9 @@ class AsyncEvaluatorsClient:
                 "settings": settings,
                 "credentials": credentials,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -992,6 +1010,9 @@ class AsyncEvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1155,6 +1176,9 @@ class AsyncEvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )