agenta 0.28.0__py3-none-any.whl → 0.28.0a1__py3-none-any.whl

agenta/cli/main.py

@@ -80,10 +80,15 @@ def cli():
 @click.command()
 @click.option("--app-name", "--app_name", default=None)
 @click.option("--backend-host", "backend_host", default=None)
-def init(app_name: str, backend_host: str):
-    """Initialize a new Agenta app with the template files."""
-
+@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 ""
+    """Initialize a new Agenta app with the template files."""
 
     api_key = os.getenv("AGENTA_API_KEY")
 
@@ -146,9 +151,51 @@ def init(app_name: str, backend_host: 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).app_id
+            app_id = client.apps.create_app(
+                app_name=app_name,
+                organization_id=organization.id if organization else None,
+            ).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,17 +176,19 @@ 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.
+        Retrieve a list of apps filtered by app_name and org_id.
 
         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.
+        List[App]: A list of apps filtered by app_name and org_id.
 
         Raises:
         HTTPException: If there was an error retrieving the list of apps.
@@ -195,6 +197,8 @@ class AppsClient:
         ----------
         app_name : typing.Optional[str]
 
+        workspace_id : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -216,7 +220,10 @@ class AppsClient:
         _response = self._client_wrapper.httpx_client.request(
             "apps",
             method="GET",
-            params={"app_name": app_name},
+            params={
+                "app_name": app_name,
+                "workspace_id": workspace_id,
+            },
             request_options=request_options,
         )
         try:
@@ -248,13 +255,15 @@ 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.
+        Create a new app for a user or organization.
 
         Args:
-        payload (CreateApp): The payload containing the app name.
+        payload (CreateApp): The payload containing the app name and organization ID (optional).
         stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
@@ -269,6 +278,10 @@ 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.
 
@@ -295,6 +308,8 @@ 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,
@@ -393,7 +408,7 @@ class AppsClient:
         request_options: typing.Optional[RequestOptions] = None,
     ) -> UpdateAppOutput:
         """
-        Update an app for a user.
+        Update an app for a user or organization.
 
         Args:
         app_id (str): The ID of the app.
@@ -572,6 +587,8 @@ 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:
         """
@@ -597,6 +614,10 @@ 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.
 
@@ -626,7 +647,9 @@ 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,
@@ -957,17 +980,19 @@ 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.
+        Retrieve a list of apps filtered by app_name and org_id.
 
         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.
+        List[App]: A list of apps filtered by app_name and org_id.
 
         Raises:
         HTTPException: If there was an error retrieving the list of apps.
@@ -976,6 +1001,8 @@ class AsyncAppsClient:
         ----------
         app_name : typing.Optional[str]
 
+        workspace_id : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1005,7 +1032,10 @@ class AsyncAppsClient:
         _response = await self._client_wrapper.httpx_client.request(
             "apps",
             method="GET",
-            params={"app_name": app_name},
+            params={
+                "app_name": app_name,
+                "workspace_id": workspace_id,
+            },
             request_options=request_options,
         )
         try:
@@ -1037,13 +1067,15 @@ 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.
+        Create a new app for a user or organization.
 
         Args:
-        payload (CreateApp): The payload containing the app name.
+        payload (CreateApp): The payload containing the app name and organization ID (optional).
         stoken_session (SessionContainer): The session container containing the user's session token.
 
         Returns:
@@ -1058,6 +1090,10 @@ 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.
 
@@ -1092,6 +1128,8 @@ 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,
@@ -1198,7 +1236,7 @@ class AsyncAppsClient:
         request_options: typing.Optional[RequestOptions] = None,
     ) -> UpdateAppOutput:
         """
-        Update an app for a user.
+        Update an app for a user or organization.
 
         Args:
         app_id (str): The ID of the app.
@@ -1393,6 +1431,8 @@ 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:
         """
@@ -1418,6 +1458,10 @@ 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.
 
@@ -1455,7 +1499,9 @@ 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/sdk/decorators/routing.py

@@ -373,19 +373,19 @@ class entrypoint:
 
     async def handle_success(self, result: Any, inline_trace: bool):
         data = None
-        tree = None
+        trace = dict()
 
         with suppress():
             data = self.patch_result(result)
 
             if inline_trace:
-                tree = await self.fetch_inline_trace(inline_trace)
+                trace = 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=tree)
+        return BaseResponse(data=data, tree=trace)
 
     def handle_failure(self, error: Exception):
         log.warning("--------------------------------------------------")

agenta/sdk/middleware/auth.py

@@ -27,8 +27,6 @@ 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")
@@ -63,6 +61,7 @@ class AuthorizationMiddleware(BaseHTTPMiddleware):
         self,
         request: Request,
         call_next: Callable,
+        project_id: Optional[UUID] = None,
     ):
         if AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED:
             return await call_next(request)
@@ -84,8 +83,6 @@ 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/sdk/tracing/inline.py

@@ -41,6 +41,7 @@ from uuid import UUID
 class TimeDTO(BaseModel):
     start: datetime
     end: datetime
+    span: int
 
 
 class StatusCode(Enum):
@@ -845,9 +846,12 @@ 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(
@@ -859,13 +863,6 @@ 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.28.0.dist-info → agenta-0.28.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.28.0
+Version: 0.28.0a1
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering
@@ -13,8 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: cachetools (>=5.3.3,<6.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)

{agenta-0.28.0.dist-info → agenta-0.28.0a1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 agenta/__init__.py,sha256=XXPgAjzPw5CXQpuQbDNpKRuoBL5X_YoobKeebjYHiSY,2101
 agenta/cli/evaluation_commands.py,sha256=fs6492tprPId9p8eGO02Xy-NCBm2RZNJLZWcUxugwd8,474
 agenta/cli/helper.py,sha256=P97HbNb_qzOyl5CM_MjAqWEBCdgebU6M81G_4UCmF1A,6288
-agenta/cli/main.py,sha256=drRCn7x9-rP3zcLXEIgAqVWS68g_vXnRyo4N7DGFBW8,7946
+agenta/cli/main.py,sha256=Wz0ODhoeKK3Qg_CFUhu6D909szk05tc8ZVBB6H1-w7k,9763
 agenta/cli/telemetry.py,sha256=GaFFRsE_NtrcSSJ10r2jhgFs5Sk8gf2C09Ox3gOr3eU,1317
 agenta/cli/variant_commands.py,sha256=HfKRZsajKOXwZD2OyzjSfNtSx1yI01wI1cfqpvoHETI,17400
 agenta/cli/variant_configs.py,sha256=PLiuMKadVzs6Gi2uYaT0pZzyULNHDXaTMDWboqpwWdU,1293
@@ -11,7 +11,7 @@ agenta/client/api.py,sha256=r5pwYD8DWppDrV4xaNYwUmwMLjWVNfVzxK_clIboEWg,2434
 agenta/client/api_models.py,sha256=zebfE2-0-SW1SvzyarzmSJMXqyiCLKrX2sHpzoX-RnU,623
 agenta/client/backend/__init__.py,sha256=Q7KdR_MAfYvg7LlGVXvOUZi4L_7k6pbSVc8vIaNy-Bg,5637
 agenta/client/backend/apps/__init__.py,sha256=9mUnTDeA1TxYvkj1l01A1prqsJV0ERRY2tzkY1fA4MQ,64
-agenta/client/backend/apps/client.py,sha256=QucGNzuxfkOH2OU4dQMd7BdOjRTw4ac31On5FED3vVI,52590
+agenta/client/backend/apps/client.py,sha256=UWLU8uGURZ2apjpAdqhAHsLTR3lSbaTNfdfMnibXzlA,54436
 agenta/client/backend/bases/__init__.py,sha256=9mUnTDeA1TxYvkj1l01A1prqsJV0ERRY2tzkY1fA4MQ,64
 agenta/client/backend/bases/client.py,sha256=BZsz5eXaa2voZdJXqgd5J5hPUuYvWwIcPCWyl49w-oY,6028
 agenta/client/backend/client.py,sha256=YkeIJbq_8_TKsF-L3x6fNoRazRaM0BzhYckaeUAB4vI,103549
@@ -181,7 +181,7 @@ agenta/sdk/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 agenta/sdk/context/routing.py,sha256=ycUgmJZyWhL4bHjKtUSAsTlt_0Fujr_6OpoaEH1lAN0,683
 agenta/sdk/context/tracing.py,sha256=UmmW15UFFsvxS0myS6aD9wBk5iNepNlQi4tEQ_ejfYM,96
 agenta/sdk/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agenta/sdk/decorators/routing.py,sha256=eU_Sq4OmRLpGBhbHj4j4PfEIN_HM1uLsy89OkK0_6O0,36576
+agenta/sdk/decorators/routing.py,sha256=v9iiL9z7ouVUCCsKDkc08q_JAQwR4mHzn4Q562FbNS8,36581
 agenta/sdk/decorators/tracing.py,sha256=vL5e6TVX6TQwO0t9raZwnzXHV3vElVT0pHS1vD-vzEo,8523
 agenta/sdk/litellm/__init__.py,sha256=Bpz1gfHQc0MN1yolWcjifLWznv6GjHggvRGQSpxpihM,37
 agenta/sdk/litellm/litellm.py,sha256=97eDU9MUTW6Wv2e7QYhCWLrRYwhaRqG6LVcedp3qNrk,7186
@@ -191,7 +191,7 @@ agenta/sdk/managers/deployment.py,sha256=SEokjZeh6n7HRKZ92Y0WncdG49hIFx-Z3B3HAl2
 agenta/sdk/managers/shared.py,sha256=e53jckQq5PIMpjdxADOonUj7o8aGfzmSvdeH5f43rGs,21497
 agenta/sdk/managers/variant.py,sha256=A5ga3mq3b0weUTXa9HO72MGaspthGcu1uK9K5OnP738,4172
 agenta/sdk/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agenta/sdk/middleware/auth.py,sha256=E7Uw0C3P7aZ9K_GYs8YComMjrKrNyE_SNJ4DXpQcf3Y,4156
+agenta/sdk/middleware/auth.py,sha256=H_UwEq5QioSkHZ3ipCtE3lrl7mxs5h9ULQvZHEtV8d4,4103
 agenta/sdk/middleware/cache.py,sha256=C_LEzFbulbCBIKtcut2T4qJzh90q4369WCsApDg3Vm0,902
 agenta/sdk/router.py,sha256=mOguvtOwl2wmyAgOuWTsf98pQwpNiUILKIo67W_hR3A,119
 agenta/sdk/tracing/__init__.py,sha256=rQNe5-zT5Kt7_CDhq-lnUIi1EYTBVzVf_MbfcIxVD98,41
@@ -199,7 +199,7 @@ agenta/sdk/tracing/attributes.py,sha256=zh8JQZSeYCLBeIRSopKJx6QQ-WEgw08Cr64DS_WO
 agenta/sdk/tracing/context.py,sha256=IpNENDGRrXWjs-vti5XheqwybQs0QdD-ii4aK0enNrM,803
 agenta/sdk/tracing/conventions.py,sha256=JBtznBXZ3aRkGKkLl7cPwdMNh3w1G-H2Ta2YrAxbr38,950
 agenta/sdk/tracing/exporters.py,sha256=YvTke0RaxeOLqWOuhC5EFzYwFY39kcoBtDLfcyla3j4,1604
-agenta/sdk/tracing/inline.py,sha256=sYocvSWjuQaun_XaBYNDQyNw4ETS2hFMbFg6g3RCdeg,31463
+agenta/sdk/tracing/inline.py,sha256=ncIvMKWpy1o-5l3i7YThj_pE3Oq6xvQfwyUfGsfUxzc,31405
 agenta/sdk/tracing/processors.py,sha256=tPf3Hx1TmnWSljvX28kYFOFrp4ImIXhlwAaR39sf5qU,2979
 agenta/sdk/tracing/spans.py,sha256=nqUOjjirBxB8Eacv8Qj4Ra_6rknGi3lbJdNyKmk5ODQ,3707
 agenta/sdk/tracing/tracing.py,sha256=RUSnQIWwfOFwhWbiyJfgC0wYtvcV1PusXTwNslV5WZo,6912
@@ -226,7 +226,7 @@ agenta/templates/simple_prompt/app.py,sha256=kODgF6lhzsaJPdgL5b21bUki6jkvqjWZzWR
 agenta/templates/simple_prompt/env.example,sha256=g9AE5bYcGPpxawXMJ96gh8oenEPCHTabsiOnfQo3c5k,70
 agenta/templates/simple_prompt/requirements.txt,sha256=ywRglRy7pPkw8bljmMEJJ4aOOQKrt9FGKULZ-DGkoBU,23
 agenta/templates/simple_prompt/template.toml,sha256=DQBtRrF4GU8LBEXOZ-GGuINXMQDKGTEG5y37tnvIUIE,60
-agenta-0.28.0.dist-info/METADATA,sha256=ls-DP_rlKu2AxB9H3hbou42HAnCZTNBPP9h1kq8ndWc,31617
-agenta-0.28.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-agenta-0.28.0.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.28.0.dist-info/RECORD,,
+agenta-0.28.0a1.dist-info/METADATA,sha256=drS8_Q9TXGZVroIT5H3lYucyazlnFU8w7x9lKHer-6g,31567
+agenta-0.28.0a1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+agenta-0.28.0a1.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.28.0a1.dist-info/RECORD,,

{agenta-0.28.0.dist-info → agenta-0.28.0a1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 1.5.2
 Root-Is-Purelib: true
 Tag: py3-none-any