agenta 0.27.0a8__py3-none-any.whl → 0.27.0a12__py3-none-any.whl

agenta/__init__.py

@@ -1,4 +1,7 @@
 from .sdk.utils.preinit import PreInitObject
+
+import agenta.client.backend.types as client_types  # pylint: disable=wrong-import-order
+
 from .sdk.types import (
     DictInput,
     MultipleChoice,
@@ -18,14 +21,29 @@ from .sdk.tracing import Tracing
 from .sdk.decorators.tracing import instrument
 from .sdk.tracing.conventions import Reference
 from .sdk.decorators.routing import entrypoint, app, route
-from .sdk.agenta_init import Config, AgentaSingleton, init
+from .sdk.agenta_init import Config, AgentaSingleton, init as _init
 from .sdk.utils.costs import calculate_token_usage
 from .sdk.client import Agenta
 from .sdk.litellm import litellm as callbacks
-from .sdk.config_manager import ConfigManager
+from .sdk.managers.config import ConfigManager
+from .sdk.managers.variant import VariantManager
+from .sdk.managers.deployment import DeploymentManager
 from .sdk import assets as assets
 from .sdk import tracer
 
 config = PreInitObject("agenta.config", Config)
 DEFAULT_AGENTA_SINGLETON_INSTANCE = AgentaSingleton()
-tracing = DEFAULT_AGENTA_SINGLETON_INSTANCE.tracing  # type: ignore
+
+types = client_types
+tracing = None
+api = None
+async_api = None
+
+
+def init(*args, **kwargs):
+    global api, async_api, tracing, config
+    _init(*args, **kwargs)
+
+    tracing = DEFAULT_AGENTA_SINGLETON_INSTANCE.tracing  # type: ignore
+    api = DEFAULT_AGENTA_SINGLETON_INSTANCE.api  # type: ignore
+    async_api = DEFAULT_AGENTA_SINGLETON_INSTANCE.async_api  # type: ignore

agenta/client/backend/__init__.py

@@ -9,6 +9,8 @@ from .types import (
     BaseOutput,
     BodyImportTestset,
     ConfigDb,
+    ConfigDto,
+    ConfigResponseModel,
     CorrectAnswer,
     CreateAppOutput,
     CreateSpan,
@@ -28,6 +30,8 @@ from .types import (
     EvaluationType,
     Evaluator,
     EvaluatorConfig,
+    EvaluatorMappingOutputInterface,
+    EvaluatorOutputInterface,
     GetConfigResponse,
     HttpValidationError,
     HumanEvaluation,
@@ -38,6 +42,7 @@ from .types import (
     HumanEvaluationUpdate,
     Image,
     InviteRequest,
+    LifecycleDto,
     ListApiKeysResponse,
     LlmRunRateLimit,
     LlmTokens,
@@ -48,6 +53,8 @@ from .types import (
     OrganizationOutput,
     Outputs,
     Permission,
+    ReferenceDto,
+    ReferenceRequestModel,
     Result,
     Score,
     SimpleEvaluationOutput,
@@ -102,6 +109,8 @@ __all__ = [
     "BaseOutput",
     "BodyImportTestset",
     "ConfigDb",
+    "ConfigDto",
+    "ConfigResponseModel",
     "ContainerTemplatesResponse",
     "CorrectAnswer",
     "CreateAppOutput",
@@ -122,6 +131,8 @@ __all__ = [
     "EvaluationType",
     "Evaluator",
     "EvaluatorConfig",
+    "EvaluatorMappingOutputInterface",
+    "EvaluatorOutputInterface",
     "GetConfigResponse",
     "HttpValidationError",
     "HumanEvaluation",
@@ -132,6 +143,7 @@ __all__ = [
     "HumanEvaluationUpdate",
     "Image",
     "InviteRequest",
+    "LifecycleDto",
     "ListApiKeysResponse",
     "LlmRunRateLimit",
     "LlmTokens",
@@ -142,6 +154,8 @@ __all__ = [
     "OrganizationOutput",
     "Outputs",
     "Permission",
+    "ReferenceDto",
+    "ReferenceRequestModel",
     "Result",
     "Score",
     "SimpleEvaluationOutput",

agenta/client/backend/apps/client.py

@@ -176,7 +176,6 @@ class AppsClient:
         self,
         *,
         app_name: typing.Optional[str] = None,
-        org_id: typing.Optional[str] = None,
         workspace_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[App]:
@@ -198,8 +197,6 @@ class AppsClient:
         ----------
         app_name : typing.Optional[str]
 
-        org_id : typing.Optional[str]
-
         workspace_id : typing.Optional[str]
 
         request_options : typing.Optional[RequestOptions]
@@ -225,7 +222,6 @@ class AppsClient:
             method="GET",
             params={
                 "app_name": app_name,
-                "org_id": org_id,
                 "workspace_id": workspace_id,
             },
             request_options=request_options,
@@ -258,8 +254,9 @@ class AppsClient:
         self,
         *,
         app_name: str,
-        organization_id: typing.Optional[str] = OMIT,
+        project_id: typing.Optional[str] = OMIT,
         workspace_id: typing.Optional[str] = OMIT,
+        organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CreateAppOutput:
         """
@@ -279,10 +276,12 @@ class AppsClient:
         ----------
         app_name : str
 
-        organization_id : typing.Optional[str]
+        project_id : typing.Optional[str]
 
         workspace_id : typing.Optional[str]
 
+        organization_id : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -308,8 +307,9 @@ class AppsClient:
             method="POST",
             json={
                 "app_name": app_name,
-                "organization_id": organization_id,
+                "project_id": project_id,
                 "workspace_id": workspace_id,
+                "organization_id": organization_id,
             },
             request_options=request_options,
             omit=OMIT,
@@ -586,8 +586,9 @@ class AppsClient:
         app_name: str,
         template_id: str,
         env_vars: typing.Dict[str, str],
-        organization_id: typing.Optional[str] = OMIT,
+        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:
         """
@@ -611,10 +612,12 @@ class AppsClient:
 
         env_vars : typing.Dict[str, str]
 
-        organization_id : typing.Optional[str]
+        project_id : typing.Optional[str]
 
         workspace_id : typing.Optional[str]
 
+        organization_id : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -643,9 +646,10 @@ class AppsClient:
             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,
-                "workspace_id": workspace_id,
             },
             request_options=request_options,
             omit=OMIT,
@@ -976,7 +980,6 @@ class AsyncAppsClient:
         self,
         *,
         app_name: typing.Optional[str] = None,
-        org_id: typing.Optional[str] = None,
         workspace_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[App]:
@@ -998,8 +1001,6 @@ class AsyncAppsClient:
         ----------
         app_name : typing.Optional[str]
 
-        org_id : typing.Optional[str]
-
         workspace_id : typing.Optional[str]
 
         request_options : typing.Optional[RequestOptions]
@@ -1033,7 +1034,6 @@ class AsyncAppsClient:
             method="GET",
             params={
                 "app_name": app_name,
-                "org_id": org_id,
                 "workspace_id": workspace_id,
             },
             request_options=request_options,
@@ -1066,8 +1066,9 @@ class AsyncAppsClient:
         self,
         *,
         app_name: str,
-        organization_id: typing.Optional[str] = OMIT,
+        project_id: typing.Optional[str] = OMIT,
         workspace_id: typing.Optional[str] = OMIT,
+        organization_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> CreateAppOutput:
         """
@@ -1087,10 +1088,12 @@ class AsyncAppsClient:
         ----------
         app_name : str
 
-        organization_id : typing.Optional[str]
+        project_id : typing.Optional[str]
 
         workspace_id : typing.Optional[str]
 
+        organization_id : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1124,8 +1127,9 @@ class AsyncAppsClient:
             method="POST",
             json={
                 "app_name": app_name,
-                "organization_id": organization_id,
+                "project_id": project_id,
                 "workspace_id": workspace_id,
+                "organization_id": organization_id,
             },
             request_options=request_options,
             omit=OMIT,
@@ -1426,8 +1430,9 @@ class AsyncAppsClient:
         app_name: str,
         template_id: str,
         env_vars: typing.Dict[str, str],
-        organization_id: typing.Optional[str] = OMIT,
+        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:
         """
@@ -1451,10 +1456,12 @@ class AsyncAppsClient:
 
         env_vars : typing.Dict[str, str]
 
-        organization_id : typing.Optional[str]
+        project_id : typing.Optional[str]
 
         workspace_id : typing.Optional[str]
 
+        organization_id : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1491,9 +1498,10 @@ class AsyncAppsClient:
             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,
-                "workspace_id": workspace_id,
             },
             request_options=request_options,
             omit=OMIT,

agenta/client/backend/client.py

@@ -24,6 +24,7 @@ from .core.jsonable_encoder import jsonable_encoder
 from .types.organization import Organization
 from .types.organization_output import OrganizationOutput
 from .types.invite_request import InviteRequest
+from .core.serialization import convert_and_respect_annotation_metadata
 from .types.workspace_response import WorkspaceResponse
 import datetime as dt
 from .types.workspace_role_response import WorkspaceRoleResponse
@@ -732,7 +733,11 @@ class AgentaApi:
         _response = self._client_wrapper.httpx_client.request(
             f"organizations/{jsonable_encoder(org_id)}/workspaces/{jsonable_encoder(workspace_id)}/invite",
             method="POST",
-            json=request,
+            json=convert_and_respect_annotation_metadata(
+                object_=request,
+                annotation=typing.Sequence[InviteRequest],
+                direction="write",
+            ),
             request_options=request_options,
             omit=OMIT,
         )
@@ -847,6 +852,7 @@ class AgentaApi:
         org_id: str,
         workspace_id: str,
         *,
+        project_id: str,
         token: str,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.Optional[typing.Any]:
@@ -867,6 +873,8 @@ class AgentaApi:
 
         workspace_id : str
 
+        project_id : str
+
         token : str
 
         request_options : typing.Optional[RequestOptions]
@@ -888,12 +896,16 @@ class AgentaApi:
         client.accept_invitation(
             org_id="org_id",
             workspace_id="workspace_id",
+            project_id="project_id",
             token="token",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
             f"organizations/{jsonable_encoder(org_id)}/workspaces/{jsonable_encoder(workspace_id)}/invite/accept",
             method="POST",
+            params={
+                "project_id": project_id,
+            },
             json={
                 "token": token,
             },
@@ -2333,7 +2345,11 @@ class AsyncAgentaApi:
         _response = await self._client_wrapper.httpx_client.request(
             f"organizations/{jsonable_encoder(org_id)}/workspaces/{jsonable_encoder(workspace_id)}/invite",
             method="POST",
-            json=request,
+            json=convert_and_respect_annotation_metadata(
+                object_=request,
+                annotation=typing.Sequence[InviteRequest],
+                direction="write",
+            ),
             request_options=request_options,
             omit=OMIT,
         )
@@ -2456,6 +2472,7 @@ class AsyncAgentaApi:
         org_id: str,
         workspace_id: str,
         *,
+        project_id: str,
         token: str,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.Optional[typing.Any]:
@@ -2476,6 +2493,8 @@ class AsyncAgentaApi:
 
         workspace_id : str
 
+        project_id : str
+
         token : str
 
         request_options : typing.Optional[RequestOptions]
@@ -2502,6 +2521,7 @@ class AsyncAgentaApi:
             await client.accept_invitation(
                 org_id="org_id",
                 workspace_id="workspace_id",
+                project_id="project_id",
                 token="token",
             )
 
@@ -2511,6 +2531,9 @@ class AsyncAgentaApi:
         _response = await self._client_wrapper.httpx_client.request(
             f"organizations/{jsonable_encoder(org_id)}/workspaces/{jsonable_encoder(workspace_id)}/invite/accept",
             method="POST",
+            params={
+                "project_id": project_id,
+            },
             json={
                 "token": token,
             },

agenta/client/backend/containers/client.py

@@ -387,7 +387,11 @@ class AsyncContainersClient:
             files={
                 "tar_file": tar_file,
             },
-            request_options=request_options,
+            request_options=(
+                {**request_options, "timeout_in_seconds": 600}
+                if request_options
+                else {"timeout_in_seconds": 600}
+            ),
             omit=OMIT,
         )
         try:

agenta/client/backend/core/__init__.py

@@ -3,7 +3,7 @@
 from .api_error import ApiError
 from .client_wrapper import AsyncClientWrapper, BaseClientWrapper, SyncClientWrapper
 from .datetime_utils import serialize_datetime
-from .file import File, convert_file_dict_to_httpx_tuples
+from .file import File, convert_file_dict_to_httpx_tuples, with_content_type
 from .http_client import AsyncHttpClient, HttpClient
 from .jsonable_encoder import jsonable_encoder
 from .pydantic_utilities import (
@@ -43,4 +43,5 @@ __all__ = [
     "universal_field_validator",
     "universal_root_validator",
     "update_forward_refs",
+    "with_content_type",
 ]

agenta/client/backend/core/client_wrapper.py

@@ -40,9 +40,9 @@ class SyncClientWrapper(BaseClientWrapper):
         super().__init__(api_key=api_key, base_url=base_url, timeout=timeout)
         self.httpx_client = HttpClient(
             httpx_client=httpx_client,
-            base_headers=self.get_headers(),
-            base_timeout=self.get_timeout(),
-            base_url=self.get_base_url(),
+            base_headers=self.get_headers,
+            base_timeout=self.get_timeout,
+            base_url=self.get_base_url,
         )
 
 
@@ -58,7 +58,7 @@ class AsyncClientWrapper(BaseClientWrapper):
         super().__init__(api_key=api_key, base_url=base_url, timeout=timeout)
         self.httpx_client = AsyncHttpClient(
             httpx_client=httpx_client,
-            base_headers=self.get_headers(),
-            base_timeout=self.get_timeout(),
-            base_url=self.get_base_url(),
+            base_headers=self.get_headers,
+            base_timeout=self.get_timeout,
+            base_url=self.get_base_url,
         )

agenta/client/backend/core/file.py

@@ -1,30 +1,30 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
+from typing import IO, Dict, List, Mapping, Optional, Tuple, Union, cast
 
 # File typing inspired by the flexibility of types within the httpx library
 # https://github.com/encode/httpx/blob/master/httpx/_types.py
-FileContent = typing.Union[typing.IO[bytes], bytes, str]
-File = typing.Union[
+FileContent = Union[IO[bytes], bytes, str]
+File = Union[
     # file (or bytes)
     FileContent,
     # (filename, file (or bytes))
-    typing.Tuple[typing.Optional[str], FileContent],
+    Tuple[Optional[str], FileContent],
     # (filename, file (or bytes), content_type)
-    typing.Tuple[typing.Optional[str], FileContent, typing.Optional[str]],
+    Tuple[Optional[str], FileContent, Optional[str]],
     # (filename, file (or bytes), content_type, headers)
-    typing.Tuple[
-        typing.Optional[str],
+    Tuple[
+        Optional[str],
         FileContent,
-        typing.Optional[str],
-        typing.Mapping[str, str],
+        Optional[str],
+        Mapping[str, str],
     ],
 ]
 
 
 def convert_file_dict_to_httpx_tuples(
-    d: typing.Dict[str, typing.Union[File, typing.List[File]]],
-) -> typing.List[typing.Tuple[str, File]]:
+    d: Dict[str, Union[File, List[File]]],
+) -> List[Tuple[str, File]]:
     """
     The format we use is a list of tuples, where the first element is the
     name of the file and the second is the file object. Typically HTTPX wants
@@ -41,3 +41,25 @@ def convert_file_dict_to_httpx_tuples(
         else:
             httpx_tuples.append((key, file_like))
     return httpx_tuples
+
+
+def with_content_type(*, file: File, content_type: str) -> File:
+    """ """
+    if isinstance(file, tuple):
+        if len(file) == 2:
+            filename, content = cast(Tuple[Optional[str], FileContent], file)  # type: ignore
+            return (filename, content, content_type)
+        elif len(file) == 3:
+            filename, content, _ = cast(
+                Tuple[Optional[str], FileContent, Optional[str]], file
+            )  # type: ignore
+            return (filename, content, content_type)
+        elif len(file) == 4:
+            filename, content, _, headers = cast(  # type: ignore
+                Tuple[Optional[str], FileContent, Optional[str], Mapping[str, str]],
+                file,
+            )
+            return (filename, content, content_type, headers)
+        else:
+            raise ValueError(f"Unexpected tuple length: {len(file)}")
+    return (None, file, content_type)

agenta/client/backend/core/http_client.py

@@ -158,9 +158,9 @@ class HttpClient:
         self,
         *,
         httpx_client: httpx.Client,
-        base_timeout: typing.Optional[float],
-        base_headers: typing.Dict[str, str],
-        base_url: typing.Optional[str] = None,
+        base_timeout: typing.Callable[[], typing.Optional[float]],
+        base_headers: typing.Callable[[], typing.Dict[str, str]],
+        base_url: typing.Optional[typing.Callable[[], str]] = None,
     ):
         self.base_url = base_url
         self.base_timeout = base_timeout
@@ -168,7 +168,10 @@ class HttpClient:
         self.httpx_client = httpx_client
 
     def get_base_url(self, maybe_base_url: typing.Optional[str]) -> str:
-        base_url = self.base_url if maybe_base_url is None else maybe_base_url
+        base_url = maybe_base_url
+        if self.base_url is not None and base_url is None:
+            base_url = self.base_url()
+
         if base_url is None:
             raise ValueError(
                 "A base_url is required to make this request, please provide one and try again."
@@ -200,7 +203,7 @@ class HttpClient:
             request_options.get("timeout_in_seconds")
             if request_options is not None
             and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(
@@ -213,7 +216,7 @@ class HttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
                         **(
                             request_options.get("additional_headers", {}) or {}
@@ -248,7 +251,7 @@ class HttpClient:
             content=content,
             files=(
                 convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
-                if files is not None
+                if (files is not None and files is not omit)
                 else None
             ),
             timeout=timeout,
@@ -302,7 +305,7 @@ class HttpClient:
             request_options.get("timeout_in_seconds")
             if request_options is not None
             and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(
@@ -315,7 +318,7 @@ class HttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
                         **(
                             request_options.get("additional_headers", {})
@@ -349,7 +352,7 @@ class HttpClient:
             content=content,
             files=(
                 convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
-                if files is not None
+                if (files is not None and files is not omit)
                 else None
             ),
             timeout=timeout,
@@ -362,9 +365,9 @@ class AsyncHttpClient:
         self,
         *,
         httpx_client: httpx.AsyncClient,
-        base_timeout: typing.Optional[float],
-        base_headers: typing.Dict[str, str],
-        base_url: typing.Optional[str] = None,
+        base_timeout: typing.Callable[[], typing.Optional[float]],
+        base_headers: typing.Callable[[], typing.Dict[str, str]],
+        base_url: typing.Optional[typing.Callable[[], str]] = None,
     ):
         self.base_url = base_url
         self.base_timeout = base_timeout
@@ -372,7 +375,10 @@ class AsyncHttpClient:
         self.httpx_client = httpx_client
 
     def get_base_url(self, maybe_base_url: typing.Optional[str]) -> str:
-        base_url = self.base_url if maybe_base_url is None else maybe_base_url
+        base_url = maybe_base_url
+        if self.base_url is not None and base_url is None:
+            base_url = self.base_url()
+
         if base_url is None:
             raise ValueError(
                 "A base_url is required to make this request, please provide one and try again."
@@ -404,7 +410,7 @@ class AsyncHttpClient:
             request_options.get("timeout_in_seconds")
             if request_options is not None
             and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(
@@ -418,7 +424,7 @@ class AsyncHttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
                         **(
                             request_options.get("additional_headers", {}) or {}
@@ -506,7 +512,7 @@ class AsyncHttpClient:
             request_options.get("timeout_in_seconds")
             if request_options is not None
             and request_options.get("timeout_in_seconds") is not None
-            else self.base_timeout
+            else self.base_timeout()
         )
 
         json_body, data_body = get_request_body(
@@ -519,7 +525,7 @@ class AsyncHttpClient:
             headers=jsonable_encoder(
                 remove_none_from_dict(
                     {
-                        **self.base_headers,
+                        **self.base_headers(),
                         **(headers if headers is not None else {}),
                         **(
                             request_options.get("additional_headers", {})