agenta 0.27.6__tar.gz → 0.27.6a1__tar.gz

{agenta-0.27.6 → agenta-0.27.6a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.27.6
+Version: 0.27.6a1
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering
@@ -13,7 +13,8 @@ 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.9
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: cachetools (>=5.3.3,<6.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
@@ -21,16 +22,13 @@ Requires-Dist: docker (>=6.1.1,<8.0.0)
 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)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
-Requires-Dist: python-multipart (>=0.0.6,<0.0.10)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: questionary (>=1.10,<3.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/__init__.py

@@ -1,3 +1,5 @@
+from typing import Any, Callable, Optional
+
 from .sdk.utils.preinit import PreInitObject
 
 import agenta.client.backend.types as client_types  # pylint: disable=wrong-import-order
@@ -18,7 +20,7 @@ from .sdk.types import (
 )
 
 from .sdk.utils.logging import log as logging
-from .sdk.tracing import Tracing
+from .sdk.tracing import Tracing, get_tracer
 from .sdk.decorators.tracing import instrument
 from .sdk.tracing.conventions import Reference
 from .sdk.decorators.routing import entrypoint, app, route
@@ -36,15 +38,36 @@ config = PreInitObject("agenta.config", Config)
 DEFAULT_AGENTA_SINGLETON_INSTANCE = AgentaSingleton()
 
 types = client_types
-tracing = None
+
 api = None
 async_api = None
 
+tracing = DEFAULT_AGENTA_SINGLETON_INSTANCE.tracing  # type: ignore
+tracer = get_tracer(tracing)
 
-def init(*args, **kwargs):
-    global api, async_api, tracing, config
-    _init(*args, **kwargs)
 
-    tracing = DEFAULT_AGENTA_SINGLETON_INSTANCE.tracing  # type: ignore
+def init(
+    host: Optional[str] = None,
+    api_key: Optional[str] = None,
+    config_fname: Optional[str] = None,
+    redact: Optional[Callable[..., Any]] = None,
+    redact_on_error: Optional[bool] = True,
+    # DEPRECATING
+    app_id: Optional[str] = None,
+):
+    global api, async_api, tracing, tracer  # pylint: disable=global-statement
+
+    _init(
+        host=host,
+        api_key=api_key,
+        config_fname=config_fname,
+        redact=redact,
+        redact_on_error=redact_on_error,
+        app_id=app_id,
+    )
+
     api = DEFAULT_AGENTA_SINGLETON_INSTANCE.api  # type: ignore
     async_api = DEFAULT_AGENTA_SINGLETON_INSTANCE.async_api  # type: ignore
+
+    tracing = DEFAULT_AGENTA_SINGLETON_INSTANCE.tracing  # type: ignore
+    tracer = get_tracer(tracing)

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/__init__.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Callable, Any
 
 from .utils.preinit import PreInitObject  # always the first import!
 
@@ -43,17 +43,21 @@ tracer = get_tracer(tracing)
 
 def init(
     host: Optional[str] = None,
-    app_id: Optional[str] = None,
     api_key: Optional[str] = None,
     config_fname: Optional[str] = None,
+    redact: Optional[Callable[..., Any]] = None,
+    redact_on_error: Optional[bool] = True,
+    # DEPRECATING
+    app_id: Optional[str] = None,
 ):
-    global api, async_api, tracing, tracer
+    global api, async_api, tracing, tracer  # pylint: disable=global-statement
 
     _init(
         host=host,
         api_key=api_key,
         config_fname=config_fname,
-        # DEPRECATING
+        redact=redact,
+        redact_on_error=redact_on_error,
         app_id=app_id,
     )
 

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/agenta_init.py

@@ -1,7 +1,7 @@
 import logging
 import toml
 from os import getenv
-from typing import Optional
+from typing import Optional, Callable, Any
 from importlib.metadata import version
 
 from agenta.sdk.utils.logging import log
@@ -36,6 +36,8 @@ class AgentaSingleton:
         host: Optional[str] = None,
         api_key: Optional[str] = None,
         config_fname: Optional[str] = None,
+        redact: Optional[Callable[..., Any]] = None,
+        redact_on_error: Optional[bool] = True,
         # DEPRECATING
         app_id: Optional[str] = None,
     ) -> None:
@@ -91,6 +93,8 @@ class AgentaSingleton:
 
         self.tracing = Tracing(
             url=f"{self.host}/api/observability/v1/otlp/traces",  # type: ignore
+            redact=redact,
+            redact_on_error=redact_on_error,
         )
 
         self.tracing.configure(
@@ -258,7 +262,9 @@ def init(
     host: Optional[str] = None,
     api_key: Optional[str] = None,
     config_fname: Optional[str] = None,
-    # DEPRECATED
+    redact: Optional[Callable[..., Any]] = None,
+    redact_on_error: Optional[bool] = True,
+    # DEPRECATING
     app_id: Optional[str] = None,
 ):
     """Main function to initialize the agenta sdk.
@@ -289,7 +295,8 @@ def init(
         host=host,
         api_key=api_key,
         config_fname=config_fname,
-        # DEPRECATED
+        redact=redact,
+        redact_on_error=redact_on_error,
         app_id=app_id,
     )
 

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/decorators/routing.py

@@ -14,9 +14,10 @@ from os import environ
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi import Body, FastAPI, UploadFile, HTTPException
 
+from agenta.sdk.middleware.auth import AuthorizationMiddleware
 from agenta.sdk.context.routing import routing_context_manager, routing_context
 from agenta.sdk.context.tracing import tracing_context
-from agenta.sdk.router import router as router
+from agenta.sdk.router import router
 from agenta.sdk.utils.exceptions import suppress
 from agenta.sdk.utils.logging import log
 from agenta.sdk.types import (
@@ -50,6 +51,9 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+_MIDDLEWARES = True
+
+
 app.include_router(router, prefix="")
 
 
@@ -121,6 +125,26 @@ class entrypoint:
         route_path="",
         config_schema: Optional[BaseModel] = None,
     ):
+        ### --- Update Middleware --- #
+        try:
+            global _MIDDLEWARES  # pylint: disable=global-statement
+
+            if _MIDDLEWARES:
+                app.add_middleware(
+                    AuthorizationMiddleware,
+                    host=ag.DEFAULT_AGENTA_SINGLETON_INSTANCE.host,
+                    resource_id=ag.DEFAULT_AGENTA_SINGLETON_INSTANCE.app_id,
+                    resource_type="application",
+                )
+
+                _MIDDLEWARES = False
+
+        except:  # pylint: disable=bare-except
+            log.error("------------------------------------")
+            log.error("Agenta SDK - failed to secure route: %s", route_path)
+            log.error("------------------------------------")
+        ### --- Update Middleware --- #
+
         DEFAULT_PATH = "generate"
         PLAYGROUND_PATH = "/playground"
         RUN_PATH = "/run"
@@ -330,9 +354,9 @@ class entrypoint:
         *args,
         **func_params,
     ):
-        log.info(f"---------------------------")
+        log.info("---------------------------")
         log.info(f"Agenta SDK - running route: {repr(self.route_path or '/')}")
-        log.info(f"---------------------------")
+        log.info("---------------------------")
 
         tracing_context.set(routing_context.get())
 

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/decorators/tracing.py

@@ -19,6 +19,8 @@ class instrument:  # pylint: disable=invalid-name
         config: Optional[Dict[str, Any]] = None,
         ignore_inputs: Optional[bool] = None,
         ignore_outputs: Optional[bool] = None,
+        redact: Optional[Callable[..., Any]] = None,
+        redact_on_error: Optional[bool] = True,
         max_depth: Optional[int] = 2,
         # DEPRECATING
         kind: str = "task",
@@ -29,6 +31,8 @@ class instrument:  # pylint: disable=invalid-name
         self.config = config
         self.ignore_inputs = ignore_inputs
         self.ignore_outputs = ignore_outputs
+        self.redact = redact
+        self.redact_on_error = redact_on_error
         self.max_depth = max_depth
 
     def __call__(self, func: Callable[..., Any]):
@@ -109,12 +113,10 @@ class instrument:  # pylint: disable=invalid-name
                 )
 
             _inputs = self._redact(
-                self._parse(
-                    func,
-                    *args,
-                    **kwargs,
-                ),
-                self.ignore_inputs,
+                name=span.name,
+                field="inputs",
+                io=self._parse(func, *args, **kwargs),
+                ignore=self.ignore_inputs,
             )
             span.set_attributes(
                 attributes={"inputs": _inputs},
@@ -153,7 +155,12 @@ class instrument:  # pylint: disable=invalid-name
                 namespace="metrics.unit.tokens",
             )
 
-            _outputs = self._redact(self._patch(result), self.ignore_outputs)
+            _outputs = self._redact(
+                name=span.name,
+                field="outputs",
+                io=self._patch(result),
+                ignore=self.ignore_outputs,
+            )
             span.set_attributes(
                 attributes={"outputs": _outputs},
                 namespace="data",
@@ -192,6 +199,9 @@ class instrument:  # pylint: disable=invalid-name
 
     def _redact(
         self,
+        *,
+        name: str,
+        field: str,
         io: Dict[str, Any],
         ignore: Union[List[str], bool] = False,
     ) -> Dict[str, Any]:
@@ -220,6 +230,20 @@ class instrument:  # pylint: disable=invalid-name
             )
         }
 
+        if self.redact is not None:
+            try:
+                io = self.redact(name, field, io)
+            except:  # pylint: disable=bare-except
+                if self.redact_on_error:
+                    io = {}
+
+        if ag.tracing.redact is not None:
+            try:
+                io = ag.tracing.redact(name, field, io)
+            except:  # pylint: disable=bare-except
+                if ag.tracing.redact_on_error:
+                    io = {}
+
         return io
 
     def _patch(

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/litellm/litellm.py

@@ -89,16 +89,20 @@ def litellm_handler():
                 log.error("LiteLLM callback error: span not found.")
                 return
 
-            result = kwargs.get("complete_streaming_response")
+            try:
+                result = []
+                for choice in response_obj.choices:
+                    message = choice.message.__dict__
+                    result.append(message)
 
-            outputs = (
-                {"__default__": result} if not isinstance(result, dict) else result
-            )
+                outputs = {"completion": result}
+                self.span.set_attributes(
+                    attributes={"outputs": outputs},
+                    namespace="data",
+                )
 
-            self.span.set_attributes(
-                attributes={"outputs": outputs},
-                namespace="data",
-            )
+            except Exception as e:
+                pass
 
             self.span.set_attributes(
                 attributes={"total": kwargs.get("response_cost")},
@@ -194,16 +198,20 @@ def litellm_handler():
                 log.error("LiteLLM callback error: span not found.")
                 return
 
-            result = kwargs.get("complete_streaming_response")
+            try:
+                result = []
+                for choice in response_obj.choices:
+                    message = choice.message.__dict__
+                    result.append(message)
 
-            outputs = (
-                {"__default__": result} if not isinstance(result, dict) else result
-            )
+                outputs = {"completion": result}
+                self.span.set_attributes(
+                    attributes={"outputs": outputs},
+                    namespace="data",
+                )
 
-            self.span.set_attributes(
-                attributes={"outputs": outputs},
-                namespace="data",
-            )
+            except Exception as e:
+                pass
 
             self.span.set_attributes(
                 attributes={"total": kwargs.get("response_cost")},
@@ -236,17 +244,20 @@ def litellm_handler():
                 log.error("LiteLLM callback error: span not found.")
                 return
 
-            # result = kwargs.get("complete_streaming_response")
-            result = response_obj.choices[0].message.content
+            try:
+                result = []
+                for choice in response_obj.choices:
+                    message = choice.message.__dict__
+                    result.append(message)
 
-            outputs = (
-                {"__default__": result} if not isinstance(result, dict) else result
-            )
+                outputs = {"completion": result}
+                self.span.set_attributes(
+                    attributes={"outputs": outputs},
+                    namespace="data",
+                )
 
-            self.span.set_attributes(
-                attributes={"outputs": outputs},
-                namespace="data",
-            )
+            except Exception as e:
+                pass
 
             self.span.set_attributes(
                 attributes={"total": kwargs.get("response_cost")},

agenta-0.27.6a1/agenta/sdk/middleware/auth.py

@@ -0,0 +1,142 @@
+from typing import Callable, Optional
+from os import environ
+from uuid import UUID
+from json import dumps
+from traceback import format_exc
+
+import httpx
+from starlette.middleware.base import BaseHTTPMiddleware
+from fastapi import FastAPI, Request, Response
+
+from agenta.sdk.utils.logging import log
+from agenta.sdk.middleware.cache import TTLLRUCache
+
+AGENTA_SDK_AUTH_CACHE_CAPACITY = environ.get(
+    "AGENTA_SDK_AUTH_CACHE_CAPACITY",
+    512,
+)
+
+AGENTA_SDK_AUTH_CACHE_TTL = environ.get(
+    "AGENTA_SDK_AUTH_CACHE_TTL",
+    15 * 60,  # 15 minutes
+)
+
+AGENTA_SDK_AUTH_CACHE = str(environ.get("AGENTA_SDK_AUTH_CACHE", True)).lower() in (
+    "true",
+    "1",
+    "t",
+)
+
+AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED = str(
+    environ.get("AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED", False)
+).lower() in ("true", "1", "t")
+
+
+class Deny(Response):
+    def __init__(self) -> None:
+        super().__init__(status_code=401, content="Unauthorized")
+
+
+cache = TTLLRUCache(
+    capacity=AGENTA_SDK_AUTH_CACHE_CAPACITY,
+    ttl=AGENTA_SDK_AUTH_CACHE_TTL,
+)
+
+
+class AuthorizationMiddleware(BaseHTTPMiddleware):
+    def __init__(
+        self,
+        app: FastAPI,
+        host: str,
+        resource_id: UUID,
+        resource_type: str,
+    ):
+        super().__init__(app)
+
+        self.host = host
+        self.resource_id = resource_id
+        self.resource_type = resource_type
+
+    async def dispatch(
+        self,
+        request: Request,
+        call_next: Callable,
+        project_id: Optional[UUID] = None,
+    ):
+        if AGENTA_UNAUTHORIZED_EXECUTION_ALLOWED:
+            return await call_next(request)
+
+        try:
+            authorization = (
+                request.headers.get("Authorization")
+                or request.headers.get("authorization")
+                or None
+            )
+
+            headers = {"Authorization": authorization} if authorization else None
+
+            cookies = {"sAccessToken": request.cookies.get("sAccessToken")}
+
+            params = {
+                "action": "run_service",
+                "resource_type": self.resource_type,
+                "resource_id": self.resource_id,
+            }
+
+            if project_id:
+                params["project_id"] = project_id
+
+            _hash = dumps(
+                {
+                    "headers": headers,
+                    "cookies": cookies,
+                    "params": params,
+                },
+                sort_keys=True,
+            )
+
+            policy = None
+            if AGENTA_SDK_AUTH_CACHE:
+                policy = cache.get(_hash)
+
+            if not policy:
+                async with httpx.AsyncClient() as client:
+                    response = await client.get(
+                        f"{self.host}/api/permissions/verify",
+                        headers=headers,
+                        cookies=cookies,
+                        params=params,
+                    )
+
+                    if response.status_code != 200:
+                        cache.put(_hash, {"effect": "deny"})
+                        return Deny()
+
+                    auth = response.json()
+
+                    if auth.get("effect") != "allow":
+                        cache.put(_hash, {"effect": "deny"})
+                        return Deny()
+
+                    policy = {
+                        "effect": "allow",
+                        "credentials": auth.get("credentials"),
+                    }
+
+                    cache.put(_hash, policy)
+
+            if policy.get("effect") == "deny":
+                return Deny()
+
+            request.state.credentials = policy.get("credentials")
+
+            return await call_next(request)
+
+        except:  # pylint: disable=bare-except
+            log.error("------------------------------------------------------")
+            log.error("Agenta SDK - handling auth middleware exception below:")
+            log.error("------------------------------------------------------")
+            log.error(format_exc().strip("\n"))
+            log.error("------------------------------------------------------")
+
+            return Deny()

agenta-0.27.6a1/agenta/sdk/middleware/cache.py

@@ -0,0 +1,43 @@
+from time import time
+from collections import OrderedDict
+
+
+class TTLLRUCache:
+    def __init__(self, capacity: int, ttl: int):
+        self.cache = OrderedDict()
+        self.capacity = capacity
+        self.ttl = ttl
+
+    def get(self, key):
+        # CACHE
+        if key not in self.cache:
+            return None
+
+        value, expiry = self.cache[key]
+        # -----
+
+        # TTL
+        if time() > expiry:
+            del self.cache[key]
+
+            return None
+        # ---
+
+        # LRU
+        self.cache.move_to_end(key)
+        # ---
+
+        return value
+
+    def put(self, key, value):
+        # CACHE
+        if key in self.cache:
+            del self.cache[key]
+        # CACHE & LRU
+        elif len(self.cache) >= self.capacity:
+            self.cache.popitem(last=False)
+        # -----------
+
+        # TTL
+        self.cache[key] = (value, time() + self.ttl)
+        # ---

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/tracing/exporters.py

@@ -58,7 +58,7 @@ class InlineTraceExporter(SpanExporter):
         return trace
 
 
-OTLPSpanExporter._MAX_RETRY_TIMEOUT = 2
+OTLPSpanExporter._MAX_RETRY_TIMEOUT = 2  # pylint: disable=protected-access
 
 ConsoleExporter = ConsoleSpanExporter
 InlineExporter = InlineTraceExporter

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/tracing/processors.py

@@ -12,7 +12,7 @@ from opentelemetry.sdk.trace.export import (
 
 from agenta.sdk.utils.logging import log
 
-# LOAD CONTEXT, HERE
+# LOAD CONTEXT, HERE !
 
 
 class TraceProcessor(BatchSpanProcessor):

{agenta-0.27.6 → agenta-0.27.6a1}/agenta/sdk/tracing/tracing.py

@@ -1,4 +1,4 @@
-from typing import Optional, Any, Dict
+from typing import Optional, Any, Dict, Callable
 from enum import Enum
 
 from httpx import get as check
@@ -32,6 +32,8 @@ class Tracing(metaclass=Singleton):
     def __init__(
         self,
         url: str,
+        redact: Optional[Callable[..., Any]] = None,
+        redact_on_error: Optional[bool] = True,
     ) -> None:
         # ENDPOINT (OTLP)
         self.otlp_url = url
@@ -49,6 +51,10 @@ class Tracing(metaclass=Singleton):
         # INLINE SPANS for INLINE TRACES (INLINE PROCESSOR)
         self.inline_spans: Dict[str, Any] = dict()
 
+        # REDACT
+        self.redact = redact
+        self.redact_on_error = redact_on_error
+
     # PUBLIC
 
     def configure(

{agenta-0.27.6 → agenta-0.27.6a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.27.6"
+version = "0.27.6a1"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]
@@ -26,14 +26,11 @@ click = "^8.1.3"
 fastapi = ">=0.100.0"
 toml = "^0.10.2"
 questionary = ">=1.10,<3.0"
-ipdb = ">=0.13"
 python-dotenv = "^1.0.0"
-python-multipart = ">=0.0.6,<0.0.10"
 importlib-metadata = ">=8.0.0,<9.0"
 posthog = "^3.1.0"
 pydantic = ">=2"
 httpx = ">=0.24, <0.28"
-pymongo = "^4.6.3"
 cachetools = "^5.3.3"
 pyyaml = "^6.0.2"