agenta 0.27.6a2__tar.gz → 0.27.7__tar.gz

{agenta-0.27.6a2 → agenta-0.27.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.27.6a2
+Version: 0.27.7
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering

{agenta-0.27.6a2 → agenta-0.27.7}/agenta/cli/main.py

@@ -80,16 +80,11 @@ def cli():
 @click.command()
 @click.option("--app-name", "--app_name", default=None)
 @click.option("--backend-host", "backend_host", default=None)
-@click.option(
-    "--organisation-name",
-    "organisation_name",
-    default=None,
-    help="The name of the organisation",
-)
-def init(app_name: str, backend_host: str, organisation_name: str):
-    init_option = "Blank App" if backend_host != "" and app_name != "" else ""
+def init(app_name: str, backend_host: str):
     """Initialize a new Agenta app with the template files."""
 
+    init_option = "Blank App" if backend_host != "" and app_name != "" else ""
+
     api_key = os.getenv("AGENTA_API_KEY")
 
     if not app_name:
@@ -151,51 +146,9 @@ def init(app_name: str, backend_host: str, organisation_name: str):
             api_key=api_key if where_question == "On agenta cloud" else "",
         )
 
-        # list of user organizations
-        user_organizations = []
-
-        # validate the api key if it is provided
-        if where_question == "On agenta cloud":
-            try:
-                key_prefix = api_key.split(".")[0]
-                client.validate_api_key(key_prefix=key_prefix)
-            except Exception as ex:
-                click.echo(
-                    click.style(
-                        f"Error: Unable to validate API key.\nError: {ex}", fg="red"
-                    )
-                )
-                sys.exit(1)
-            # Make request to fetch user organizations after api key validation
-            try:
-                organizations = client.list_organizations()
-                if len(organizations) >= 1:
-                    user_organizations = organizations
-            except Exception as ex:
-                click.echo(click.style(f"Error: {ex}", fg="red"))
-                sys.exit(1)
-
-        organization = None
-        organization_choices = {}
-        if where_question == "On agenta cloud":
-            if not organisation_name:
-                organization_choices = {
-                    f"{org.name}": org for org in user_organizations
-                }
-                which_organization = questionary.select(
-                    "Which organization do you want to create the app for?",
-                    choices=list(organization_choices.keys()),
-                ).ask()
-                organisation_name = which_organization
-
-            organization = organization_choices.get(organisation_name)
-
         # Get app_id after creating new app in the backend server
         try:
-            app_id = client.apps.create_app(
-                app_name=app_name,
-                organization_id=organization.id if organization else None,
-            ).app_id
+            app_id = client.apps.create_app(app_name=app_name).app_id
         except Exception as ex:
             click.echo(click.style(f"Error: {ex}", fg="red"))
             sys.exit(1)

{agenta-0.27.6a2 → agenta-0.27.7}/agenta/client/backend/__init__.py

@@ -1,6 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .types import (
+    AgentaNodeDto,
+    AgentaNodeDtoNodesValue,
+    AgentaNodesResponse,
+    AgentaRootDto,
+    AgentaRootsResponse,
+    AgentaTreeDto,
+    AgentaTreesResponse,
     AggregatedResult,
     AggregatedResultEvaluatorConfig,
     App,
@@ -8,6 +15,7 @@ from .types import (
     AppVariantRevision,
     BaseOutput,
     BodyImportTestset,
+    CollectStatusResponse,
     ConfigDb,
     ConfigDto,
     ConfigResponseModel,
@@ -32,6 +40,7 @@ from .types import (
     EvaluatorConfig,
     EvaluatorMappingOutputInterface,
     EvaluatorOutputInterface,
+    ExceptionDto,
     GetConfigResponse,
     HttpValidationError,
     HumanEvaluation,
@@ -43,30 +52,50 @@ from .types import (
     Image,
     InviteRequest,
     LifecycleDto,
+    LinkDto,
     ListApiKeysResponse,
     LlmRunRateLimit,
     LlmTokens,
     LmProvidersEnum,
     NewHumanEvaluation,
     NewTestset,
+    NodeDto,
+    NodeType,
+    OTelContextDto,
+    OTelEventDto,
+    OTelExtraDto,
+    OTelLinkDto,
+    OTelSpanDto,
+    OTelSpanKind,
+    OTelSpansResponse,
+    OTelStatusCode,
     Organization,
     OrganizationOutput,
     Outputs,
+    ParentDto,
     Permission,
     ReferenceDto,
     ReferenceRequestModel,
     Result,
+    RootDto,
     Score,
     SimpleEvaluationOutput,
     Span,
     SpanDetail,
+    SpanDto,
+    SpanDtoNodesValue,
     SpanStatusCode,
     SpanVariant,
+    StatusCode,
+    StatusDto,
     Template,
     TemplateImageInfo,
     TestSetOutputResponse,
     TestSetSimpleResponse,
+    TimeDto,
     TraceDetail,
+    TreeDto,
+    TreeType,
     UpdateAppOutput,
     Uri,
     ValidationError,
@@ -90,16 +119,25 @@ from . import (
     evaluations,
     evaluators,
     observability,
+    observability_v_1,
     testsets,
     variants,
 )
 from .client import AgentaApi, AsyncAgentaApi
 from .containers import ContainerTemplatesResponse
+from .observability_v_1 import Format, QueryTracesResponse
 from .variants import AddVariantFromBaseAndConfigResponse
 
 __all__ = [
     "AddVariantFromBaseAndConfigResponse",
     "AgentaApi",
+    "AgentaNodeDto",
+    "AgentaNodeDtoNodesValue",
+    "AgentaNodesResponse",
+    "AgentaRootDto",
+    "AgentaRootsResponse",
+    "AgentaTreeDto",
+    "AgentaTreesResponse",
     "AggregatedResult",
     "AggregatedResultEvaluatorConfig",
     "App",
@@ -108,6 +146,7 @@ __all__ = [
     "AsyncAgentaApi",
     "BaseOutput",
     "BodyImportTestset",
+    "CollectStatusResponse",
     "ConfigDb",
     "ConfigDto",
     "ConfigResponseModel",
@@ -133,6 +172,8 @@ __all__ = [
     "EvaluatorConfig",
     "EvaluatorMappingOutputInterface",
     "EvaluatorOutputInterface",
+    "ExceptionDto",
+    "Format",
     "GetConfigResponse",
     "HttpValidationError",
     "HumanEvaluation",
@@ -144,30 +185,51 @@ __all__ = [
     "Image",
     "InviteRequest",
     "LifecycleDto",
+    "LinkDto",
     "ListApiKeysResponse",
     "LlmRunRateLimit",
     "LlmTokens",
     "LmProvidersEnum",
     "NewHumanEvaluation",
     "NewTestset",
+    "NodeDto",
+    "NodeType",
+    "OTelContextDto",
+    "OTelEventDto",
+    "OTelExtraDto",
+    "OTelLinkDto",
+    "OTelSpanDto",
+    "OTelSpanKind",
+    "OTelSpansResponse",
+    "OTelStatusCode",
     "Organization",
     "OrganizationOutput",
     "Outputs",
+    "ParentDto",
     "Permission",
+    "QueryTracesResponse",
     "ReferenceDto",
     "ReferenceRequestModel",
     "Result",
+    "RootDto",
     "Score",
     "SimpleEvaluationOutput",
     "Span",
     "SpanDetail",
+    "SpanDto",
+    "SpanDtoNodesValue",
     "SpanStatusCode",
     "SpanVariant",
+    "StatusCode",
+    "StatusDto",
     "Template",
     "TemplateImageInfo",
     "TestSetOutputResponse",
     "TestSetSimpleResponse",
+    "TimeDto",
     "TraceDetail",
+    "TreeDto",
+    "TreeType",
     "UnprocessableEntityError",
     "UpdateAppOutput",
     "Uri",
@@ -189,6 +251,7 @@ __all__ = [
     "evaluations",
     "evaluators",
     "observability",
+    "observability_v_1",
     "testsets",
     "variants",
 ]

{agenta-0.27.6a2 → agenta-0.27.7}/agenta/client/backend/apps/client.py

@@ -176,19 +176,17 @@ class AppsClient:
         self,
         *,
         app_name: typing.Optional[str] = None,
-        workspace_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[App]:
         """
-        Retrieve a list of apps filtered by app_name and org_id.
+        Retrieve a list of apps filtered by app_name.
 
         Args:
         app_name (Optional[str]): The name of the app to filter by.
-        org_id (Optional[str]): The ID of the organization to filter by.
         stoken_session (SessionContainer): The session container.
 
         Returns:
-        List[App]: A list of apps filtered by app_name and org_id.
+        List[App]: A list of apps filtered by app_name.
 
         Raises:
         HTTPException: If there was an error retrieving the list of apps.
@@ -197,8 +195,6 @@ class AppsClient:
         ----------
         app_name : typing.Optional[str]
 
-        workspace_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -220,10 +216,7 @@ class AppsClient:
         _response = self._client_wrapper.httpx_client.request(
             "apps",
             method="GET",
-            params={
-                "app_name": app_name,
-                "workspace_id": workspace_id,
-            },
+            params={"app_name": app_name},
             request_options=request_options,
         )
         try:
@@ -255,15 +248,13 @@ class AppsClient:
         *,
         app_name: 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,
     ) -> CreateAppOutput:
         """
-        Create a new app for a user or organization.
+        Create a new app for a user.
 
         Args:
-        payload (CreateApp): The payload containing the app name and organization ID (optional).
+        payload (CreateApp): The payload containing the app name.
         stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
@@ -278,10 +269,6 @@ class AppsClient:
 
         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 +295,6 @@ class AppsClient:
             json={
                 "app_name": app_name,
                 "project_id": project_id,
-                "workspace_id": workspace_id,
-                "organization_id": organization_id,
             },
             request_options=request_options,
             omit=OMIT,
@@ -408,7 +393,7 @@ class AppsClient:
         request_options: typing.Optional[RequestOptions] = None,
     ) -> UpdateAppOutput:
         """
-        Update an app for a user or organization.
+        Update an app for a user.
 
         Args:
         app_id (str): The ID of the app.
@@ -587,8 +572,6 @@ class AppsClient:
         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:
         """
@@ -614,10 +597,6 @@ class AppsClient:
 
         project_id : typing.Optional[str]
 
-        workspace_id : typing.Optional[str]
-
-        organization_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -647,9 +626,7 @@ class AppsClient:
                 "app_name": app_name,
                 "template_id": template_id,
                 "project_id": project_id,
-                "workspace_id": workspace_id,
                 "env_vars": env_vars,
-                "organization_id": organization_id,
             },
             request_options=request_options,
             omit=OMIT,
@@ -980,19 +957,17 @@ class AsyncAppsClient:
         self,
         *,
         app_name: typing.Optional[str] = None,
-        workspace_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[App]:
         """
-        Retrieve a list of apps filtered by app_name and org_id.
+        Retrieve a list of apps filtered by app_name.
 
         Args:
         app_name (Optional[str]): The name of the app to filter by.
-        org_id (Optional[str]): The ID of the organization to filter by.
         stoken_session (SessionContainer): The session container.
 
         Returns:
-        List[App]: A list of apps filtered by app_name and org_id.
+        List[App]: A list of apps filtered by app_name.
 
         Raises:
         HTTPException: If there was an error retrieving the list of apps.
@@ -1001,8 +976,6 @@ class AsyncAppsClient:
         ----------
         app_name : typing.Optional[str]
 
-        workspace_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1032,10 +1005,7 @@ class AsyncAppsClient:
         _response = await self._client_wrapper.httpx_client.request(
             "apps",
             method="GET",
-            params={
-                "app_name": app_name,
-                "workspace_id": workspace_id,
-            },
+            params={"app_name": app_name},
             request_options=request_options,
         )
         try:
@@ -1067,15 +1037,13 @@ class AsyncAppsClient:
         *,
         app_name: 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,
     ) -> CreateAppOutput:
         """
-        Create a new app for a user or organization.
+        Create a new app for a user.
 
         Args:
-        payload (CreateApp): The payload containing the app name and organization ID (optional).
+        payload (CreateApp): The payload containing the app name.
         stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
@@ -1090,10 +1058,6 @@ class AsyncAppsClient:
 
         project_id : typing.Optional[str]
 
-        workspace_id : typing.Optional[str]
-
-        organization_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1128,8 +1092,6 @@ class AsyncAppsClient:
             json={
                 "app_name": app_name,
                 "project_id": project_id,
-                "workspace_id": workspace_id,
-                "organization_id": organization_id,
             },
             request_options=request_options,
             omit=OMIT,
@@ -1236,7 +1198,7 @@ class AsyncAppsClient:
         request_options: typing.Optional[RequestOptions] = None,
     ) -> UpdateAppOutput:
         """
-        Update an app for a user or organization.
+        Update an app for a user.
 
         Args:
         app_id (str): The ID of the app.
@@ -1431,8 +1393,6 @@ class AsyncAppsClient:
         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:
         """
@@ -1458,10 +1418,6 @@ class AsyncAppsClient:
 
         project_id : typing.Optional[str]
 
-        workspace_id : typing.Optional[str]
-
-        organization_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1499,9 +1455,7 @@ class AsyncAppsClient:
                 "app_name": app_name,
                 "template_id": template_id,
                 "project_id": project_id,
-                "workspace_id": workspace_id,
                 "env_vars": env_vars,
-                "organization_id": organization_id,
             },
             request_options=request_options,
             omit=OMIT,

{agenta-0.27.6a2 → agenta-0.27.7}/agenta/client/backend/client.py

@@ -13,6 +13,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 .core.request_options import RequestOptions
 from .types.list_api_keys_response import ListApiKeysResponse
 from .core.pydantic_utilities import parse_obj_as
@@ -40,6 +41,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
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -89,17 +91,13 @@ 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)
@@ -112,6 +110,9 @@ 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
+        )
 
     def list_api_keys(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -1619,17 +1620,13 @@ 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(
@@ -1644,6 +1641,9 @@ 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(
+            client_wrapper=self._client_wrapper
+        )
 
     async def list_api_keys(
         self, *, request_options: typing.Optional[RequestOptions] = None

{agenta-0.27.6a2 → agenta-0.27.7}/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:
@@ -250,7 +250,9 @@ class HttpClient:
             data=data_body,
             content=content,
             files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+                convert_file_dict_to_httpx_tuples(
+                    remove_omit_from_dict(remove_none_from_dict(files), omit)
+                )
                 if (files is not None and files is not omit)
                 else None
             ),
@@ -351,7 +353,9 @@ class HttpClient:
             data=data_body,
             content=content,
             files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+                convert_file_dict_to_httpx_tuples(
+                    remove_omit_from_dict(remove_none_from_dict(files), omit)
+                )
                 if (files is not None and files is not omit)
                 else None
             ),
@@ -458,7 +462,9 @@ class AsyncHttpClient:
             data=data_body,
             content=content,
             files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+                convert_file_dict_to_httpx_tuples(
+                    remove_omit_from_dict(remove_none_from_dict(files), omit)
+                )
                 if files is not None
                 else None
             ),
@@ -558,7 +564,9 @@ class AsyncHttpClient:
             data=data_body,
             content=content,
             files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+                convert_file_dict_to_httpx_tuples(
+                    remove_omit_from_dict(remove_none_from_dict(files), omit)
+                )
                 if files is not None
                 else None
             ),