agenta 0.25.4a3__tar.gz → 0.25.4a4__tar.gz

{agenta-0.25.4a3 → agenta-0.25.4a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.25.4a3
+Version: 0.25.4a4
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering
@@ -23,10 +23,6 @@ Requires-Dist: fastapi (>=0.100.0)
 Requires-Dist: httpx (>=0.24,<0.28)
 Requires-Dist: importlib-metadata (>=8.0.0,<9.0)
 Requires-Dist: ipdb (>=0.13)
-Requires-Dist: litellm (>=1.48.0,<2.0.0)
-Requires-Dist: opentelemetry-api (>=1.27.0,<2.0.0)
-Requires-Dist: opentelemetry-exporter-otlp (>=1.27.0,<2.0.0)
-Requires-Dist: opentelemetry-sdk (>=1.27.0,<2.0.0)
 Requires-Dist: posthog (>=3.1.0,<4.0.0)
 Requires-Dist: pydantic (>=2)
 Requires-Dist: pymongo (>=4.6.3,<5.0.0)

{agenta-0.25.4a3 → agenta-0.25.4a4}/agenta/__init__.py

@@ -1,5 +1,7 @@
 from .sdk.utils.preinit import PreInitObject
+from .sdk.context import get_contexts, save_context
 from .sdk.types import (
+    Context,
     DictInput,
     MultipleChoice,
     FloatParam,
@@ -13,17 +15,16 @@ from .sdk.types import (
     BinaryParam,
 )
 
-from .sdk.utils.logging import log as logging
-from .sdk.tracing import Tracing
+from .sdk.tracing.logger import llm_logger as logging
+from .sdk.tracing.llm_tracing import Tracing
 from .sdk.decorators.tracing import instrument
-from .sdk.decorators.routing import entrypoint, app, route
+from .sdk.decorators.llm_entrypoint import entrypoint, app, route
 from .sdk.agenta_init import Config, AgentaSingleton, init
-from .sdk.utils.costs import calculate_token_usage
+from .sdk.utils.helper.openai_cost import calculate_token_usage
 from .sdk.client import Agenta
-from .sdk.litellm import litellm as callbacks
+from .sdk.tracing import callbacks
 from .sdk.config_manager import ConfigManager
 from .sdk import assets as assets
-from .sdk import tracer
 
 config = PreInitObject("agenta.config", Config)
 DEFAULT_AGENTA_SINGLETON_INSTANCE = AgentaSingleton()

{agenta-0.25.4a3 → agenta-0.25.4a4}/agenta/client/backend/client.py

@@ -88,17 +88,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)
@@ -1607,17 +1603,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(

{agenta-0.25.4a3 → agenta-0.25.4a4}/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:
@@ -246,11 +246,9 @@ class HttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
-                if files is not None
-                else None
-            ),
+            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+            if files is not None
+            else None,
             timeout=timeout,
         )
 
@@ -347,11 +345,9 @@ class HttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
-                if files is not None
-                else None
-            ),
+            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+            if files is not None
+            else None,
             timeout=timeout,
         ) as stream:
             yield stream
@@ -451,11 +447,9 @@ class AsyncHttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
-                if files is not None
-                else None
-            ),
+            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+            if files is not None
+            else None,
             timeout=timeout,
         )
 
@@ -551,11 +545,9 @@ class AsyncHttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
-                if files is not None
-                else None
-            ),
+            files=convert_file_dict_to_httpx_tuples(remove_none_from_dict(files))
+            if files is not None
+            else None,
             timeout=timeout,
         ) as stream:
             yield stream

{agenta-0.25.4a3 → agenta-0.25.4a4}/agenta/client/backend/core/pydantic_utilities.py

@@ -77,8 +77,6 @@ def to_jsonable_with_fallback(
 class UniversalBaseModel(pydantic.BaseModel):
     class Config:
         populate_by_name = True
-        # smart_union = True
-        # allow_population_by_field_name = True
         json_encoders = {dt.datetime: serialize_datetime}
 
     def json(self, **kwargs: typing.Any) -> str:

agenta-0.25.4a4/agenta/sdk/__init__.py

@@ -0,0 +1,27 @@
+from .utils.preinit import PreInitObject  # always the first import!
+from .context import get_contexts, save_context
+from .types import (
+    Context,
+    DictInput,
+    MultipleChoice,
+    FloatParam,
+    InFile,
+    IntParam,
+    MultipleChoiceParam,
+    GroupedMultipleChoiceParam,
+    TextParam,
+    MessagesInput,
+    FileInputURL,
+    BinaryParam,
+)
+
+from .tracing.llm_tracing import Tracing
+from .decorators.tracing import instrument
+from .decorators.llm_entrypoint import entrypoint, app, route
+from .agenta_init import Config, AgentaSingleton, init
+from .utils.helper.openai_cost import calculate_token_usage
+from .config_manager import ConfigManager
+
+config = PreInitObject("agenta.config", Config)
+DEFAULT_AGENTA_SINGLETON_INSTANCE = AgentaSingleton()
+tracing = DEFAULT_AGENTA_SINGLETON_INSTANCE.tracing  # type: ignore

{agenta-0.25.4a3 → agenta-0.25.4a4}/agenta/sdk/agenta_init.py

@@ -2,12 +2,10 @@ import os
 import logging
 import toml
 from typing import Optional
-from importlib.metadata import version
 
-from agenta.sdk.utils.logging import log
 from agenta.sdk.utils.globals import set_global
 from agenta.client.backend.client import AgentaApi
-from agenta.sdk.tracing import Tracing
+from agenta.sdk.tracing.llm_tracing import Tracing
 from agenta.client.exceptions import APIRequestError
 
 
@@ -19,8 +17,9 @@ class AgentaSingleton:
     """Singleton class to save all the "global variables" for the sdk."""
 
     _instance = None
+    setup = None
     config = None
-    tracing = None
+    tracing: Optional[Tracing] = None
 
     def __new__(cls):
         if not cls._instance:
@@ -29,18 +28,11 @@ class AgentaSingleton:
 
     def init(
         self,
-        *,
+        app_id: Optional[str] = None,
         host: Optional[str] = None,
-        project_id: Optional[str] = None,
         api_key: Optional[str] = None,
         config_fname: Optional[str] = None,
-        #
-        app_id: Optional[str] = None,
     ) -> None:
-        log.info(f"\n--------------------------------")
-        log.info(f"Using Agenta Python SDK version: {version('agenta')}")
-        log.info(f"--------------------------------\n")
-
         """Main function to initialize the singleton.
 
         Initializes the singleton with the given `app_id`, `host`, and `api_key`. The order of precedence for these variables is:
@@ -62,20 +54,20 @@ class AgentaSingleton:
         Raises:
             ValueError: If `app_id` is not specified either as an argument, in the config file, or in the environment variables.
         """
-
         config = {}
         if config_fname:
             config = toml.load(config_fname)
 
+        self.app_id = app_id or config.get("app_id") or os.environ.get("AGENTA_APP_ID")
         self.host = (
             host
-            or os.environ.get("AGENTA_HOST")
             or config.get("backend_host")
-            or config.get("host")
-            or "https://cloud.agenta.ai"
+            or os.environ.get("AGENTA_HOST", "https://cloud.agenta.ai")
+        )
+        self.api_key = (
+            api_key or config.get("api_key") or os.environ.get("AGENTA_API_KEY")
         )
 
-        self.app_id = app_id or config.get("app_id") or os.environ.get("AGENTA_APP_ID")
         if not self.app_id:
             raise ValueError(
                 "App ID must be specified. You can provide it in one of the following ways:\n"
@@ -83,60 +75,26 @@ class AgentaSingleton:
                 "2. In the configuration file specified by config_fname.\n"
                 "3. As an environment variable 'AGENTA_APP_ID'."
             )
-
-        self.project_id = (
-            project_id
-            or config.get("project_id")
-            or os.environ.get("AGENTA_PROJECT_ID")
-        )
-
-        self.api_key = (
-            api_key or config.get("api_key") or os.environ.get("AGENTA_API_KEY")
-        )
-
-        self.tracing = Tracing(
-            url=f"{self.host}/api/observability/v1/traces",  # type: ignore
-        )
-
-        self.tracing.configure(
-            project_id=self.project_id,
-            api_key=self.api_key,
-            # DEPRECATED
-            app_id=self.app_id,
-        )
-
         self.base_id = os.environ.get("AGENTA_BASE_ID")
+        if self.base_id is None:
+            print(
+                "Warning: Your configuration will not be saved permanently since base_id is not provided."
+            )
 
-        self.config = Config(
-            host=self.host,
-            base_id=self.base_id,
-            api_key=self.api_key,
-        )
+        self.config = Config(base_id=self.base_id, host=self.host, api_key=self.api_key)  # type: ignore
 
 
 class Config:
-    def __init__(
-        self,
-        host: str,
-        base_id: Optional[str] = None,
-        api_key: Optional[str] = "",
-    ):
-        self.host = host
-
+    def __init__(self, base_id: str, host: str, api_key: Optional[str] = ""):
         self.base_id = base_id
-
-        if self.base_id is None:
-            print(
-                "Warning: Your configuration will not be saved permanently since base_id is not provided.\n"
-            )
+        self.host = host
 
         if base_id is None or host is None:
             self.persist = False
         else:
             self.persist = True
             self.client = AgentaApi(
-                base_url=self.host + "/api",
-                api_key=api_key if api_key else "",
+                base_url=self.host + "/api", api_key=api_key if api_key else ""
             )
 
     def register_default(self, overwrite=False, **kwargs):
@@ -250,12 +208,11 @@ class Config:
 
 
 def init(
+    app_id: Optional[str] = None,
     host: Optional[str] = None,
-    project_id: Optional[str] = None,
     api_key: Optional[str] = None,
     config_fname: Optional[str] = None,
-    # DEPRECATED
-    app_id: Optional[str] = None,
+    max_workers: Optional[int] = None,
 ):
     """Main function to initialize the agenta sdk.
 
@@ -281,16 +238,12 @@ def init(
 
     singleton = AgentaSingleton()
 
-    singleton.init(
-        host=host,
-        project_id=project_id,
-        api_key=api_key,
-        config_fname=config_fname,
-        # DEPRECATED
-        app_id=app_id,
-    )
+    singleton.init(app_id=app_id, host=host, api_key=api_key, config_fname=config_fname)
 
-    set_global(
-        config=singleton.config,
-        tracing=singleton.tracing,
+    tracing = Tracing(
+        host=singleton.host,  # type: ignore
+        app_id=singleton.app_id,  # type: ignore
+        api_key=singleton.api_key,
+        max_workers=max_workers,
     )
+    set_global(setup=singleton.setup, config=singleton.config, tracing=tracing)

{agenta-0.25.4a3 → agenta-0.25.4a4}/agenta/sdk/config_manager.py

@@ -7,7 +7,7 @@ import yaml
 from pydantic import BaseModel, ValidationError
 
 from agenta.client.backend.client import AgentaApi
-from agenta.sdk.context.routing import routing_context
+from agenta.sdk.decorators.llm_entrypoint import route_context
 
 from . import AgentaSingleton
 
@@ -47,7 +47,7 @@ class ConfigManager:
             3. 'variant'
             Only one of these should be provided.
         """
-        context = routing_context.get()
+        context = route_context.get()
         if ("config" in context and context["config"]) and (
             ("environment" in context and context["environment"])
             or ("variant" in context and context["variant"])

agenta-0.25.4a4/agenta/sdk/context.py

@@ -0,0 +1,41 @@
+import json
+import sqlite3
+from typing import List
+from .types import Context
+
+
+def setup_db():
+    conn = sqlite3.connect("context.db")
+    c = conn.cursor()
+    c.execute(
+        """
+    CREATE TABLE IF NOT EXISTS contexts
+    (id INTEGER PRIMARY KEY AUTOINCREMENT, context TEXT)
+    """
+    )
+    conn.commit()
+    conn.close()
+
+
+def get_contexts() -> List[Context]:
+    contexts = []
+    conn = sqlite3.connect("context.db")
+    c = conn.cursor()
+    for row in c.execute("SELECT * FROM contexts"):
+        context_data = json.loads(row[1])
+        contexts.append(Context.parse_obj(context_data))
+    conn.close()
+    return contexts
+
+
+def save_context(result: Context):
+    conn = sqlite3.connect("context.db")
+    c = conn.cursor()
+    c.execute(
+        """
+    INSERT INTO contexts (context) VALUES (?)
+    """,
+        (json.dumps(result.dict()),),
+    )
+    conn.commit()
+    conn.close()

agenta-0.25.4a4/agenta/sdk/decorators/base.py

@@ -0,0 +1,10 @@
+# Stdlib Imports
+from typing import Any, Callable
+
+
+class BaseDecorator:
+    def __init__(self):
+        pass
+
+    def __call__(self, func: Callable[..., Any]) -> Callable[..., Any]:
+        raise NotImplementedError