agenta 0.27.5__py3-none-any.whl → 0.27.6__py3-none-any.whl

agenta/sdk/decorators/routing.py

@@ -14,10 +14,9 @@ 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
+from agenta.sdk.router import router as router
 from agenta.sdk.utils.exceptions import suppress
 from agenta.sdk.utils.logging import log
 from agenta.sdk.types import (
@@ -51,9 +50,6 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-_MIDDLEWARES = True
-
-
 app.include_router(router, prefix="")
 
 
@@ -125,26 +121,6 @@ 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"
@@ -354,9 +330,9 @@ class entrypoint:
         *args,
         **func_params,
     ):
-        log.info("---------------------------")
+        log.info(f"---------------------------")
         log.info(f"Agenta SDK - running route: {repr(self.route_path or '/')}")
-        log.info("---------------------------")
+        log.info(f"---------------------------")
 
         tracing_context.set(routing_context.get())
 

agenta/sdk/tracing/exporters.py

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

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.5.dist-info → agenta-0.27.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.27.5
+Version: 0.27.6
 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.27.5.dist-info → agenta-0.27.6.dist-info}/RECORD

@@ -147,7 +147,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=biG9W7zgZ6V8z9Ca6Oq4NC7m89vO97mnRwmy2vOYook,36987
+agenta/sdk/decorators/routing.py,sha256=qwvXBAlRHH9W94L93OK2h_sCm06NGFtjRkdz3Qy5xRs,36142
 agenta/sdk/decorators/tracing.py,sha256=rwxbxsDb6B0VaJf4qLPgyTMYNkJMFLsCiX2ZQ6W-zOw,7713
 agenta/sdk/litellm/__init__.py,sha256=Bpz1gfHQc0MN1yolWcjifLWznv6GjHggvRGQSpxpihM,37
 agenta/sdk/litellm/litellm.py,sha256=J9NefQ2yvfWQy9e0zmPZiRQDz5GM2ThWAw5XM8gCaqw,8461
@@ -156,17 +156,14 @@ agenta/sdk/managers/config.py,sha256=AuFfHYOkmilDdcAJt2nlw_WlA3ho4Htjf29FKTZGElM
 agenta/sdk/managers/deployment.py,sha256=SEokjZeh6n7HRKZ92Y0WncdG49hIFx-Z3B3HAl2kmUg,1174
 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=olVQ9Mm5E3dYDtjRkMXWGzJe_WkMTkYw7Yf5v9uKC0U,3999
-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
 agenta/sdk/tracing/attributes.py,sha256=zh8JQZSeYCLBeIRSopKJx6QQ-WEgw08Cr64DS_WOcT8,3833
 agenta/sdk/tracing/context.py,sha256=PSJdhcaOXSMAuGUBySpLKPKyx8duF3TJzhUEk2ufqPc,777
 agenta/sdk/tracing/conventions.py,sha256=JBtznBXZ3aRkGKkLl7cPwdMNh3w1G-H2Ta2YrAxbr38,950
-agenta/sdk/tracing/exporters.py,sha256=YvTke0RaxeOLqWOuhC5EFzYwFY39kcoBtDLfcyla3j4,1604
+agenta/sdk/tracing/exporters.py,sha256=mFK5vrL7X-pQmyH-c9vrmGtsjSkCBOR31q2M4ZsOo80,1568
 agenta/sdk/tracing/inline.py,sha256=jVIlmDIFSzXr-ofMbGlO8VFnNeiUL4C4yA8soED4AHI,34611
-agenta/sdk/tracing/processors.py,sha256=tjoz_uXm_2yD1Ozvz_CnYnsG82R6vmnYpjMhx2ztALs,3117
+agenta/sdk/tracing/processors.py,sha256=8hgwC44qtPDmQ5yurKA4T6rEVx5y927w2sDHdU5GoUA,3115
 agenta/sdk/tracing/spans.py,sha256=nqUOjjirBxB8Eacv8Qj4Ra_6rknGi3lbJdNyKmk5ODQ,3707
 agenta/sdk/tracing/tracing.py,sha256=50669Lr6XwRoIEWDqEFj-K4HRcYSaL9i5vqwARvP7bk,6778
 agenta/sdk/types.py,sha256=oEeSUQn4tMzV7dkSuucBC2YlAaxS-7qgkdlT763YfLM,7076
@@ -193,7 +190,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.27.5.dist-info/METADATA,sha256=cHZbd8qAC3uFIdxYpHopsLGFFPaoDHHiXc4L6O28Kn0,31736
-agenta-0.27.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-agenta-0.27.5.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.27.5.dist-info/RECORD,,
+agenta-0.27.6.dist-info/METADATA,sha256=P-PQ-0d6zRsQIF0CI38iSPozq41cpfP1hv5SU6KiMSc,31684
+agenta-0.27.6.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+agenta-0.27.6.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.27.6.dist-info/RECORD,,

{agenta-0.27.5.dist-info → agenta-0.27.6.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

agenta/sdk/middleware/auth.py

@@ -1,136 +0,0 @@
-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_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,
-            )
-
-            cached_policy = cache.get(_hash)
-
-            if not cached_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()
-
-                    cached_policy = {
-                        "effect": "allow",
-                        "credentials": auth.get("credentials"),
-                    }
-
-                    cache.put(_hash, cached_policy)
-
-            if cached_policy.get("effect") == "deny":
-                return Deny()
-
-            request.state.credentials = cached_policy.get("credentials")
-
-            print(f"credentials: {request.state.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/sdk/middleware/cache.py

@@ -1,43 +0,0 @@
-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)
-        # ---