agenta 0.13.7a0__py3-none-any.whl → 0.13.8__py3-none-any.whl

agenta/client/backend/types/evaluation.py

@@ -27,6 +27,7 @@ class Evaluation(pydantic.BaseModel):
     status: Result
     aggregated_results: typing.List[AggregatedResult]
     average_cost: typing.Optional[Result]
+    total_cost: typing.Optional[Result]
     average_latency: typing.Optional[Result]
     created_at: dt.datetime
     updated_at: dt.datetime

agenta/sdk/agenta_decorator.py

@@ -399,32 +399,12 @@ def handle_terminal_run(
     agenta.config.set(**args_config_params)
 
     loop = asyncio.get_event_loop()
-
-    # Initialize tracing
-    tracing = agenta.llm_tracing()
-
-    # Start tracing
-    tracing.start_parent_span(
-        name=func.__name__,
-        inputs=args_func_params,
-        config=args_config_params,
-        environment="shell",  # type: ignore
-    )
-
     result = loop.run_until_complete(
         execute_function(
             func, **{"params": args_func_params, "config_params": args_config_params}
         )
     )
-
-    # End trace recording
-    tracing.end_recording(
-        outputs=result.dict(),
-        span=tracing.active_trace,  # type: ignore
-    )
-    print(
-        f"\n========== Result ==========\n\nMessage: {result.message}\nCost: {result.cost}\nToken Usage: {result.usage}"
-    )
+    print(result)
 
 
 def override_schema(openapi_schema: dict, func_name: str, endpoint: str, params: dict):

agenta/sdk/agenta_init.py

@@ -1,8 +1,9 @@
 import os
 import logging
-from typing import Optional
+from typing import Any, Optional
+
+from .utils.globals import set_global
 
-from agenta.sdk.utils.globals import set_global
 from agenta.client.backend.client import AgentaApi
 from agenta.sdk.tracing.llm_tracing import Tracing
 from agenta.client.exceptions import APIRequestError
@@ -12,17 +13,16 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
 
-class SDKClient(object):
-    """
-    Class to build SDK client instance.
-    """
-
-    def __init__(self, api_key: str, host: str):
-        self.api_key = api_key
-        self.host = host + "/api"
+BACKEND_URL_SUFFIX = os.environ.get("BACKEND_URL_SUFFIX", "api")
+CLIENT_API_KEY = os.environ.get("AGENTA_API_KEY")
+CLIENT_HOST = os.environ.get("AGENTA_HOST", "http://localhost")
 
-    def _build_sdk_client(self) -> AgentaApi:
-        return AgentaApi(base_url=self.host, api_key=self.api_key)
+# initialize the client with the backend url and api key
+backend_url = f"{CLIENT_HOST}/{BACKEND_URL_SUFFIX}"
+client = AgentaApi(
+    base_url=backend_url,
+    api_key=CLIENT_API_KEY if CLIENT_API_KEY else "",
+)
 
 
 class AgentaSingleton:
@@ -37,22 +37,15 @@ class AgentaSingleton:
             cls._instance = super(AgentaSingleton, cls).__new__(cls)
         return cls._instance
 
-    @property
-    def client(self):
-        """Builds sdk client instance.
-
-        Returns:
-            AgentaAPI: instance of agenta api backend
-        """
-
-        sdk_client = SDKClient(api_key=self.api_key, host=self.host)  # type: ignore
-        return sdk_client._build_sdk_client()
-
     def init(
         self,
+        app_name: Optional[str] = None,
+        base_name: Optional[str] = None,
+        api_key: Optional[str] = None,
+        base_id: Optional[str] = None,
         app_id: Optional[str] = None,
         host: Optional[str] = None,
-        api_key: Optional[str] = None,
+        **kwargs: Any,
     ) -> None:
         """Main function to initialize the singleton.
 
@@ -60,44 +53,57 @@ class AgentaSingleton:
         the function will look for them in environment variables.
 
         Args:
-            app_id (Optional[str]): ID of the Agenta application. Defaults to None. If not provided, will look for "AGENTA_APP_NAME" in environment variables.
+            app_name (Optional[str]): Name of the Agenta application. Defaults to None. If not provided, will look for "AGENTA_APP_NAME" in environment variables.
+            base_name (Optional[str]): Base name for the Agenta setup. Defaults to None. If not provided, will look for "AGENTA_BASE_NAME" in environment variables.
             host (Optional[str]): Host name of the backend server. Defaults to None. If not provided, will look for "AGENTA_HOST" in environment variables.
-            api_key (Optional[str]): API Key to use with the host of the backend server.
             kwargs (Any): Additional keyword arguments.
 
         Raises:
             ValueError: If `app_name`, `base_name`, or `host` are not specified either as arguments or in the environment variables.
         """
-
-        self.api_key = api_key or os.environ.get("AGENTA_API_KEY")
-        self.host = host or os.environ.get("AGENTA_HOST", "http://localhost")
-
-        app_id = app_id or os.environ.get("AGENTA_APP_ID")
-        if not app_id:
-            raise ValueError("App ID must be specified.")
-
-        base_id = os.environ.get("AGENTA_BASE_ID")
-        base_name = os.environ.get("AGENTA_BASE_NAME")
-        if base_id is None and (app_id is None or base_name is None):
-            print(
-                f"Warning: Your configuration will not be saved permanently since app_name and base_name are not provided."
-            )
-        else:
-            try:
-                base_id = self.get_app_base(app_id, base_name)  # type: ignore
-            except Exception as ex:
-                raise APIRequestError(
-                    f"Failed to get base id and/or app_id from the server with error: {ex}"
+        if app_name is None:
+            app_name = os.environ.get("AGENTA_APP_NAME")
+        if base_name is None:
+            base_name = os.environ.get("AGENTA_BASE_NAME")
+        if api_key is None:
+            api_key = os.environ.get("AGENTA_API_KEY")
+        if base_id is None:
+            base_id = os.environ.get("AGENTA_BASE_ID")
+        if host is None:
+            host = os.environ.get("AGENTA_HOST", "http://localhost")
+
+        if base_id is None:
+            if app_name is None or base_name is None:
+                print(
+                    f"Warning: Your configuration will not be saved permanently since app_name and base_name are not provided."
                 )
+            else:
+                try:
+                    app_id = self.get_app(app_name)
+                    base_id = self.get_app_base(app_id, base_name)
+                except Exception as ex:
+                    raise APIRequestError(
+                        f"Failed to get base id and/or app_id from the server with error: {ex}"
+                    )
 
-        self.app_id = app_id
         self.base_id = base_id
+        self.host = host
+        self.app_id = os.environ.get("AGENTA_APP_ID") if app_id is None else app_id
         self.variant_id = os.environ.get("AGENTA_VARIANT_ID")
         self.variant_name = os.environ.get("AGENTA_VARIANT_NAME")
+        self.api_key = api_key
         self.config = Config(base_id=base_id, host=host)
 
+    def get_app(self, app_name: str) -> str:
+        apps = client.apps.list_apps(app_name=app_name)
+        if len(apps) == 0:
+            raise APIRequestError(f"App with name {app_name} not found")
+
+        app_id = apps[0].app_id
+        return app_id
+
     def get_app_base(self, app_id: str, base_name: str) -> str:
-        bases = self.client.bases.list_bases(app_id=app_id, base_name=base_name)
+        bases = client.bases.list_bases(app_id=app_id, base_name=base_name)
         if len(bases) == 0:
             raise APIRequestError(f"No base was found for the app {app_id}")
         return bases[0].base_id
@@ -116,23 +122,11 @@ class Config:
     def __init__(self, base_id, host):
         self.base_id = base_id
         self.host = host
-
         if base_id is None or host is None:
             self.persist = False
         else:
             self.persist = True
 
-    @property
-    def client(self):
-        """Builds sdk client instance.
-
-        Returns:
-            AgentaAPI: instance of agenta api backend
-        """
-
-        sdk_client = SDKClient(api_key=self.api_key, host=self.host)  # type: ignore
-        return sdk_client._build_sdk_client()
-
     def register_default(self, overwrite=False, **kwargs):
         """alias for default"""
         return self.default(overwrite=overwrite, **kwargs)
@@ -163,7 +157,7 @@ class Config:
         if not self.persist:
             return
         try:
-            self.client.configs.save_config(
+            client.configs.save_config(
                 base_id=self.base_id,
                 config_name=config_name,
                 parameters=kwargs,
@@ -174,9 +168,7 @@ class Config:
                 "Failed to push the configuration to the server with error: " + str(ex)
             )
 
-    def pull(
-        self, config_name: str = "default", environment_name: Optional[str] = None
-    ):
+    def pull(self, config_name: str = "default", environment_name: str = None):
         """Pulls the parameters for the app variant from the server and sets them to the config"""
         if not self.persist and (
             config_name != "default" or environment_name is not None
@@ -187,12 +179,12 @@ class Config:
         if self.persist:
             try:
                 if environment_name:
-                    config = self.client.configs.get_config(
+                    config = client.configs.get_config(
                         base_id=self.base_id, environment_name=environment_name
                     )
 
                 else:
-                    config = self.client.configs.get_config(
+                    config = client.configs.get_config(
                         base_id=self.base_id,
                         config_name=config_name,
                     )
@@ -226,22 +218,15 @@ class Config:
             setattr(self, key, value)
 
 
-def init(
-    app_id: Optional[str] = None,
-    host: Optional[str] = None,
-    api_key: Optional[str] = None,
-):
+def init(app_name=None, base_name=None, **kwargs):
     """Main function to be called by the user to initialize the sdk.
 
     Args:
-        app_id (str): The Id of the app.
-        host (str): The host of the backend server.
-        api_key (str): The API key to use for the backend server.
+        app_name: _description_. Defaults to None.
+        base_name: _description_. Defaults to None.
     """
-
     singleton = AgentaSingleton()
-
-    singleton.init(app_id=app_id, host=host, api_key=api_key)
+    singleton.init(app_name=app_name, base_name=base_name, **kwargs)
     set_global(setup=singleton.setup, config=singleton.config)
 
 
@@ -250,7 +235,7 @@ def llm_tracing(max_workers: Optional[int] = None) -> Tracing:
 
     singleton = AgentaSingleton()
     return Tracing(
-        base_url=singleton.host,  # type: ignore
+        base_url=singleton.host,
         app_id=singleton.app_id,  # type: ignore
         variant_id=singleton.variant_id,  # type: ignore
         variant_name=singleton.variant_name,

{agenta-0.13.7a0.dist-info → agenta-0.13.8.dist-info}/METADATA

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

{agenta-0.13.7a0.dist-info → agenta-0.13.8.dist-info}/RECORD

@@ -61,7 +61,7 @@ agenta/client/backend/types/environment_output.py,sha256=dl0GKodeqB7kWK5mH6Y4iBp
 agenta/client/backend/types/environment_output_extended.py,sha256=WL1tA7HGax33eFL_ijPPYBJnbyz5NqTds2hnxxdgDQ8,1367
 agenta/client/backend/types/environment_revision.py,sha256=mSxckq5BtuJzQXBdxMKisdG3taGFi8MoVerkhmpIsjA,1128
 agenta/client/backend/types/error.py,sha256=iX_uV31o59d19V6-8yEAVC9RJanHGS8QvY8EC7HsIAk,996
-agenta/client/backend/types/evaluation.py,sha256=tVXTXDryqk3L7Dhl4zqSlczwcKlUIe0WgsqXGJ3ino0,1527
+agenta/client/backend/types/evaluation.py,sha256=9sVWkGPMr2mgHe2AKHsF7Gs5O-aTQEYdJdiJI-W8FYI,1567
 agenta/client/backend/types/evaluation_scenario.py,sha256=MqxMVliNQCGu1LCq2HMlx7YuZ1UQn4KJQtHZI6TsXoU,1497
 agenta/client/backend/types/evaluation_scenario_input.py,sha256=cf562ry0rYNvLWx3hvQu9uNPrdrI3lRZ0IAIiCn4-Fs,1027
 agenta/client/backend/types/evaluation_scenario_output.py,sha256=g4UjTs-c5pfEPyeCD2Jgf871Exxqy0a7iTy3eymjFQo,1076
@@ -127,8 +127,8 @@ agenta/docker/docker-assets/lambda_function.py,sha256=h4UZSSfqwpfsCgERv6frqwm_4J
 agenta/docker/docker-assets/main.py,sha256=7MI-21n81U7N7A0GxebNi0cmGWtJKcR2sPB6FcH2QfA,251
 agenta/docker/docker_utils.py,sha256=5uHMCzXkCvIsDdEiwbnnn97KkzsFbBvyMwogCsv_Z5U,3509
 agenta/sdk/__init__.py,sha256=jmeLRuXrew02ZruODZYIu4kpw0S8vV6JhMPQWFGtj30,648
-agenta/sdk/agenta_decorator.py,sha256=cU43p0k8-KZKKuAgNMTkPRMeH9WuZ69UpOmtECKBygE,17819
-agenta/sdk/agenta_init.py,sha256=APcEklQrRkFw0tssX1IXf3D-aCay5k4utekYLf-wSbk,9005
+agenta/sdk/agenta_decorator.py,sha256=6vz0G3YCRKRzK8JrQFyy8c2RIXy2kVMwyxTS093_8vQ,17296
+agenta/sdk/agenta_init.py,sha256=wDfStpe8_3ZXRLtikarwDKI_VpA1YW4eIz_3fXq39is,9044
 agenta/sdk/context.py,sha256=q-PxL05-I84puunUAs9LGsffEXcYhDxhQxjuOz2vK90,901
 agenta/sdk/router.py,sha256=0sbajvn5C7t18anH6yNo7-oYxldHnYfwcbmQnIXBePw,269
 agenta/sdk/tracing/context_manager.py,sha256=HskDaiORoOhjeN375gm05wYnieQzh5UnoIsnSAHkAyc,252
@@ -155,7 +155,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.13.7a0.dist-info/METADATA,sha256=6iiHRWDBO3XhVyIfq7bn8jFN7TG5BqwRTLLvFVClFN4,26433
-agenta-0.13.7a0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agenta-0.13.7a0.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.13.7a0.dist-info/RECORD,,
+agenta-0.13.8.dist-info/METADATA,sha256=770aElNz-Xpy004G7vSZyuazow8Ckk0y9mB3ZhNxYTA,26431
+agenta-0.13.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agenta-0.13.8.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.13.8.dist-info/RECORD,,