agenta 0.27.7a2__py3-none-any.whl → 0.28.0__py3-none-any.whl

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/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/client/backend/evaluations/client.py

@@ -26,7 +26,6 @@ class EvaluationsClient:
     def fetch_evaluation_ids(
         self,
         *,
-        app_id: str,
         resource_type: str,
         resource_ids: typing.Optional[typing.Union[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
@@ -35,7 +34,6 @@ 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.
 
@@ -47,8 +45,6 @@ class EvaluationsClient:
 
         Parameters
         ----------
-        app_id : str
-
         resource_type : str
 
         resource_ids : typing.Optional[typing.Union[str, typing.Sequence[str]]]
@@ -70,7 +66,6 @@ class EvaluationsClient:
             base_url="https://yourhost.com/path/to/api",
         )
         client.evaluations.fetch_evaluation_ids(
-            app_id="app_id",
             resource_type="resource_type",
         )
         """
@@ -78,7 +73,6 @@ class EvaluationsClient:
             "evaluations/by_resource",
             method="GET",
             params={
-                "app_id": app_id,
                 "resource_type": resource_type,
                 "resource_ids": resource_ids,
             },
@@ -714,7 +708,6 @@ class AsyncEvaluationsClient:
     async def fetch_evaluation_ids(
         self,
         *,
-        app_id: str,
         resource_type: str,
         resource_ids: typing.Optional[typing.Union[str, typing.Sequence[str]]] = None,
         request_options: typing.Optional[RequestOptions] = None,
@@ -723,7 +716,6 @@ 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.
 
@@ -735,7 +727,6 @@ class AsyncEvaluationsClient:
 
         Parameters
         ----------
-        app_id : str
 
         resource_type : str
 
@@ -763,7 +754,6 @@ class AsyncEvaluationsClient:
 
         async def main() -> None:
             await client.evaluations.fetch_evaluation_ids(
-                app_id="app_id",
                 resource_type="resource_type",
             )
 
@@ -774,7 +764,6 @@ class AsyncEvaluationsClient:
             "evaluations/by_resource",
             method="GET",
             params={
-                "app_id": app_id,
                 "resource_type": resource_type,
                 "resource_ids": resource_ids,
             },

agenta/client/backend/testsets/client.py

@@ -28,7 +28,6 @@ class TestsetsClient:
         file: core.File,
         upload_type: typing.Optional[str] = OMIT,
         testset_name: typing.Optional[str] = OMIT,
-        app_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> TestSetSimpleResponse:
         """
@@ -51,8 +50,6 @@ class TestsetsClient:
 
         testset_name : typing.Optional[str]
 
-        app_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -77,7 +74,6 @@ class TestsetsClient:
             data={
                 "upload_type": upload_type,
                 "testset_name": testset_name,
-                "app_id": app_id,
             },
             files={
                 "file": file,
@@ -173,18 +169,16 @@ class TestsetsClient:
 
     def create_testset(
         self,
-        app_id: str,
         *,
         name: str,
         csvdata: typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]],
         request_options: typing.Optional[RequestOptions] = None,
     ) -> TestSetSimpleResponse:
         """
-        Create a testset with given name and app_name, save the testset to MongoDB.
+        Create a testset with given name, save the testset to MongoDB.
 
         Args:
         name (str): name of the test set.
-        app_name (str): name of the application.
         testset (Dict[str, str]): test set data.
 
         Returns:
@@ -192,8 +186,6 @@ class TestsetsClient:
 
         Parameters
         ----------
-        app_id : str
-
         name : str
 
         csvdata : typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]]
@@ -215,13 +207,12 @@ class TestsetsClient:
             base_url="https://yourhost.com/path/to/api",
         )
         client.testsets.create_testset(
-            app_id="app_id",
             name="name",
             csvdata=[{"key": "value"}],
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            f"testsets/{jsonable_encoder(app_id)}",
+            "testsets",
             method="POST",
             json={
                 "name": name,
@@ -405,7 +396,7 @@ class TestsetsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get_testsets(
-        self, *, app_id: str, request_options: typing.Optional[RequestOptions] = None
+        self, *, request_options: typing.Optional[RequestOptions] = None
     ) -> typing.List[TestSetOutputResponse]:
         """
         Get all testsets.
@@ -420,8 +411,6 @@ class TestsetsClient:
 
         Parameters
         ----------
-        app_id : str
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -438,16 +427,11 @@ class TestsetsClient:
             api_key="YOUR_API_KEY",
             base_url="https://yourhost.com/path/to/api",
         )
-        client.testsets.get_testsets(
-            app_id="app_id",
-        )
+        client.testsets.get_testsets()
         """
         _response = self._client_wrapper.httpx_client.request(
             "testsets",
             method="GET",
-            params={
-                "app_id": app_id,
-            },
             request_options=request_options,
         )
         try:
@@ -557,7 +541,6 @@ class AsyncTestsetsClient:
         file: core.File,
         upload_type: typing.Optional[str] = OMIT,
         testset_name: typing.Optional[str] = OMIT,
-        app_id: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> TestSetSimpleResponse:
         """
@@ -580,8 +563,6 @@ class AsyncTestsetsClient:
 
         testset_name : typing.Optional[str]
 
-        app_id : typing.Optional[str]
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -614,7 +595,6 @@ class AsyncTestsetsClient:
             data={
                 "upload_type": upload_type,
                 "testset_name": testset_name,
-                "app_id": app_id,
             },
             files={
                 "file": file,
@@ -718,18 +698,16 @@ class AsyncTestsetsClient:
 
     async def create_testset(
         self,
-        app_id: str,
         *,
         name: str,
         csvdata: typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]],
         request_options: typing.Optional[RequestOptions] = None,
     ) -> TestSetSimpleResponse:
         """
-        Create a testset with given name and app_name, save the testset to MongoDB.
+        Create a testset with given name, save the testset to MongoDB.
 
         Args:
         name (str): name of the test set.
-        app_name (str): name of the application.
         testset (Dict[str, str]): test set data.
 
         Returns:
@@ -737,8 +715,6 @@ class AsyncTestsetsClient:
 
         Parameters
         ----------
-        app_id : str
-
         name : str
 
         csvdata : typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]]
@@ -765,7 +741,6 @@ class AsyncTestsetsClient:
 
         async def main() -> None:
             await client.testsets.create_testset(
-                app_id="app_id",
                 name="name",
                 csvdata=[{"key": "value"}],
             )
@@ -774,7 +749,7 @@ class AsyncTestsetsClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            f"testsets/{jsonable_encoder(app_id)}",
+            "testsets",
             method="POST",
             json={
                 "name": name,
@@ -974,7 +949,7 @@ class AsyncTestsetsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get_testsets(
-        self, *, app_id: str, request_options: typing.Optional[RequestOptions] = None
+        self, *, request_options: typing.Optional[RequestOptions] = None
     ) -> typing.List[TestSetOutputResponse]:
         """
         Get all testsets.
@@ -989,8 +964,6 @@ class AsyncTestsetsClient:
 
         Parameters
         ----------
-        app_id : str
-
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1012,9 +985,7 @@ class AsyncTestsetsClient:
 
 
         async def main() -> None:
-            await client.testsets.get_testsets(
-                app_id="app_id",
-            )
+            await client.testsets.get_testsets()
 
 
         asyncio.run(main())
@@ -1022,9 +993,6 @@ class AsyncTestsetsClient:
         _response = await self._client_wrapper.httpx_client.request(
             "testsets",
             method="GET",
-            params={
-                "app_id": app_id,
-            },
             request_options=request_options,
         )
         try:

agenta/sdk/agenta_init.py

@@ -1,4 +1,3 @@
-import logging
 import toml
 from os import getenv
 from typing import Optional, Callable, Any
@@ -11,10 +10,6 @@ from agenta.sdk.tracing import Tracing
 from agenta.client.exceptions import APIRequestError
 
 
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
-
-
 class AgentaSingleton:
     """Singleton class to save all the "global variables" for the sdk."""
 
@@ -164,7 +159,7 @@ class Config:
         try:
             self.push(config_name="default", overwrite=overwrite, **kwargs)
         except Exception as ex:
-            logger.warning(
+            log.warning(
                 "Unable to push the default configuration to the server. %s", str(ex)
             )
 
@@ -185,7 +180,7 @@ class Config:
                 overwrite=overwrite,
             )
         except Exception as ex:
-            logger.warning(
+            log.warning(
                 "Failed to push the configuration to the server with error: %s", ex
             )
 
@@ -212,14 +207,14 @@ class Config:
                         config_name=config_name,
                     )
             except Exception as ex:
-                logger.warning(
+                log.warning(
                     "Failed to pull the configuration from the server with error: %s",
                     str(ex),
                 )
         try:
             self.set(**{"current_version": config.current_version, **config.parameters})
         except Exception as ex:
-            logger.warning("Failed to set the configuration with error: %s", str(ex))
+            log.warning("Failed to set the configuration with error: %s", str(ex))
 
     def all(self):
         """Returns all the parameters for the app variant"""