agenta 0.27.8a2__tar.gz → 0.28.0__tar.gz

{agenta-0.27.8a2 → agenta-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.27.8a2
+Version: 0.28.0
 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.8a2 → agenta-0.28.0}/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.8a2 → agenta-0.28.0}/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.8a2 → agenta-0.28.0}/agenta/sdk/decorators/routing.py

@@ -373,19 +373,19 @@ class entrypoint:
 
     async def handle_success(self, result: Any, inline_trace: bool):
         data = None
-        trace = None
+        tree = None
 
         with suppress():
             data = self.patch_result(result)
 
             if inline_trace:
-                trace = await self.fetch_inline_trace(inline_trace)
+                tree = await self.fetch_inline_trace(inline_trace)
 
         log.info(f"----------------------------------")
         log.info(f"Agenta SDK - exiting with success: 200")
         log.info(f"----------------------------------")
 
-        return BaseResponse(data=data, tree=trace)
+        return BaseResponse(data=data, tree=tree)
 
     def handle_failure(self, error: Exception):
         log.warning("--------------------------------------------------")

{agenta-0.27.8a2 → agenta-0.28.0}/agenta/sdk/middleware/auth.py

@@ -27,6 +27,8 @@ AGENTA_SDK_AUTH_CACHE = str(environ.get("AGENTA_SDK_AUTH_CACHE", True)).lower()
     "t",
 )
 
+AGENTA_SDK_AUTH_CACHE = False
+
 AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED = str(
     environ.get("AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED", False)
 ).lower() in ("true", "1", "t")
@@ -61,7 +63,6 @@ class AuthorizationMiddleware(BaseHTTPMiddleware):
         self,
         request: Request,
         call_next: Callable,
-        project_id: Optional[UUID] = None,
     ):
         if AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED:
             return await call_next(request)
@@ -83,6 +84,8 @@ class AuthorizationMiddleware(BaseHTTPMiddleware):
                 "resource_id": self.resource_id,
             }
 
+            project_id = request.query_params.get("project_id")
+
             if project_id:
                 params["project_id"] = project_id
 

{agenta-0.27.8a2 → agenta-0.28.0}/agenta/sdk/tracing/inline.py

@@ -41,7 +41,6 @@ from uuid import UUID
 class TimeDTO(BaseModel):
     start: datetime
     end: datetime
-    span: int
 
 
 class StatusCode(Enum):
@@ -846,12 +845,9 @@ def parse_from_otel_span_dto(
         else None
     )
 
-    duration = (otel_span_dto.end_time - otel_span_dto.start_time).total_seconds()
-
     time = TimeDTO(
         start=otel_span_dto.start_time,
         end=otel_span_dto.end_time,
-        span=round(duration * 1_000_000),  # microseconds
     )
 
     status = StatusDTO(
@@ -863,6 +859,13 @@ def parse_from_otel_span_dto(
 
     data, metrics, meta, tags, refs = _parse_from_attributes(otel_span_dto)
 
+    duration = (otel_span_dto.end_time - otel_span_dto.start_time).total_seconds()
+
+    if metrics is None:
+        metrics = dict()
+
+    metrics["acc.duration.total"] = round(duration * 1_000, 3)  # milliseconds
+
     root_id = str(tree_id)
     if refs is not None:
         root_id = refs.get("scenario.id", root_id)

{agenta-0.27.8a2 → agenta-0.28.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.27.8a2"
+version = "0.28.0"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]