agenta 0.38.2__tar.gz → 0.39.0__tar.gz

{agenta-0.38.2 → agenta-0.39.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agenta
-Version: 0.38.2
+Version: 0.39.0
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Keywords: LLMOps,LLM,evaluation,prompt engineering
 Author: Mahmoud Mabrouk
@@ -18,13 +18,15 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: fastapi (>=0.100.0)
 Requires-Dist: httpx (>=0.24,<0.28)
 Requires-Dist: importlib-metadata (>=8.0.0,<9.0)
-Requires-Dist: litellm (>=1.48.0,<2.0.0)
+Requires-Dist: jinja2 (>=3.1.6,<4.0.0)
+Requires-Dist: litellm (>=1.61.15,<2.0.0)
 Requires-Dist: opentelemetry-api (>=1.27.0,<2.0.0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.27.0,<2.0.0)
 Requires-Dist: opentelemetry-sdk (>=1.27.0,<2.0.0)
 Requires-Dist: pydantic (>=2)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
+Requires-Dist: structlog (>=25.2.0,<26.0.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Project-URL: Documentation, https://docs.agenta.ai
 Project-URL: Homepage, https://agenta.ai

{agenta-0.38.2 → agenta-0.39.0}/agenta/__init__.py

@@ -20,7 +20,7 @@ from .sdk.types import (
     PromptTemplate,
 )
 
-from .sdk.utils.logging import log as logging
+from .sdk.utils.logging import get_module_logger
 from .sdk.tracing import Tracing, get_tracer
 from .sdk.decorators.tracing import instrument
 from .sdk.tracing.conventions import Reference

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/agenta_init.py

@@ -3,7 +3,7 @@ from os import getenv
 from typing import Optional, Callable, Any
 from importlib.metadata import version
 
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.utils.globals import set_global
 from agenta.client.client import AgentaApi, AsyncAgentaApi
 
@@ -11,6 +11,9 @@ from agenta.sdk.tracing import Tracing
 from agenta.sdk.context.routing import routing_context
 
 
+log = get_module_logger(__file__)
+
+
 class AgentaSingleton:
     """Singleton class to save all the "global variables" for the sdk."""
 

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/decorators/routing.py

@@ -28,7 +28,7 @@ from agenta.sdk.context.tracing import (
 )
 from agenta.sdk.router import router
 from agenta.sdk.utils.exceptions import suppress, display_exception
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.utils.helpers import get_current_version
 from agenta.sdk.types import (
     MultipleChoice,
@@ -38,7 +38,7 @@ from agenta.sdk.types import (
 
 import agenta as ag
 
-log.setLevel("DEBUG")
+log = get_module_logger(__file__)
 
 AGENTA_RUNTIME_PREFIX = environ.get("AGENTA_RUNTIME_PREFIX", "")
 

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/decorators/tracing.py

@@ -5,6 +5,7 @@ from itertools import chain
 from inspect import iscoroutinefunction, getfullargspec
 
 from opentelemetry import baggage
+from opentelemetry.trace import NonRecordingSpan
 from opentelemetry.context import attach, detach, get_current
 from opentelemetry.baggage import set_baggage, get_all
 
@@ -12,8 +13,13 @@ from agenta.sdk.utils.exceptions import suppress
 from agenta.sdk.context.tracing import tracing_context
 from agenta.sdk.tracing.conventions import parse_span_kind
 
+
+from agenta.sdk.utils.logging import get_module_logger
+
 import agenta as ag
 
+log = get_module_logger(__name__)
+
 
 class instrument:  # pylint: disable=invalid-name
     DEFAULT_KEY = "__default__"
@@ -56,7 +62,7 @@ class instrument:  # pylint: disable=invalid-name
                     name=func.__name__,
                     kind=self.kind,
                     context=ctx,
-                ):
+                ) as span:
                     self._set_link()
 
                     self._pre_instrument(func, *args, **kwargs)
@@ -84,7 +90,7 @@ class instrument:  # pylint: disable=invalid-name
                     name=func.__name__,
                     kind=self.kind,
                     context=ctx,
-                ):
+                ) as span:
                     self._set_link()
 
                     self._pre_instrument(func, *args, **kwargs)
@@ -291,9 +297,7 @@ class instrument:  # pylint: disable=invalid-name
             not in (
                 ignore
                 if isinstance(ignore, list)
-                else io.keys()
-                if ignore is True
-                else []
+                else io.keys() if ignore is True else []
             )
         }
 

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/litellm/litellm.py

@@ -5,7 +5,9 @@ import agenta as ag
 
 from agenta.sdk.tracing.spans import CustomSpan
 from agenta.sdk.utils.exceptions import suppress  # TODO: use it !
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
+
+log = get_module_logger(__file__)
 
 
 def litellm_handler():

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/managers/apps.py

@@ -1,11 +1,9 @@
-import logging
-
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.utils.exceptions import handle_exceptions
 
 import agenta as ag
 
-
-logger = logging.getLogger(__name__)
+log = get_module_logger(__file__)
 
 
 class AppManager:

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/managers/config.py

@@ -1,17 +1,17 @@
 import json
-import logging
 from pathlib import Path
 from typing import Optional, Type, TypeVar, Dict, Any, Union
 
 import yaml
 from pydantic import BaseModel
 
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.managers.shared import SharedManager
 from agenta.sdk.context.routing import routing_context
 
 T = TypeVar("T", bound=BaseModel)
 
-logger = logging.getLogger(__name__)
+log = get_module_logger(__file__)
 
 AVAILABLE_ENVIRONMENTS = ["development", "production", "staging"]
 

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/managers/shared.py

@@ -1,6 +1,6 @@
-import logging
 from typing import Optional, Dict, Any
 
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.utils.exceptions import handle_exceptions
 
 from agenta.sdk.types import (
@@ -13,8 +13,7 @@ from agenta.client.backend.types.reference_request_model import ReferenceRequest
 
 import agenta as ag
 
-
-logger = logging.getLogger(__name__)
+log = get_module_logger(__file__)
 
 
 class SharedManager:

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/middleware/auth.py

@@ -11,10 +11,12 @@ from fastapi.responses import JSONResponse
 from agenta.sdk.utils.cache import TTLLRUCache
 from agenta.sdk.utils.constants import TRUTHY
 from agenta.sdk.utils.exceptions import display_exception
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
 
 import agenta as ag
 
+log = get_module_logger(__file__)
+
 AGENTA_RUNTIME_PREFIX = getenv("AGENTA_RUNTIME_PREFIX", "")
 
 

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/middleware/otel.py

@@ -9,6 +9,10 @@ from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapProp
 from agenta.sdk.utils.exceptions import suppress
 from agenta.sdk.tracing.propagation import extract
 
+from agenta.sdk.utils.logging import get_module_logger
+
+log = get_module_logger(__name__)
+
 
 class OTelMiddleware(BaseHTTPMiddleware):
     def __init__(self, app: FastAPI):
@@ -17,8 +21,13 @@ class OTelMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: Callable):
         request.state.otel = {"baggage": {}, "traceparent": None}
 
+        headers = dict(request.headers)
+
+        if "newrelic" in headers:
+            headers["traceparent"] = None
+
         with suppress():
-            _, traceparent, baggage = extract(request.headers)
+            _, traceparent, baggage = extract(headers)
 
             request.state.otel = {"baggage": baggage, "traceparent": traceparent}
 

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/tracing/exporters.py

@@ -16,6 +16,10 @@ from agenta.sdk.context.exporting import (
 )
 from agenta.sdk.utils.cache import TTLLRUCache
 
+from agenta.sdk.utils.logging import get_module_logger
+
+log = get_module_logger(__file__)
+
 
 class InlineTraceExporter(SpanExporter):
     def __init__(

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/tracing/processors.py

@@ -13,9 +13,11 @@ from opentelemetry.sdk.trace.export import (
     _DEFAULT_EXPORT_TIMEOUT_MILLIS,
 )
 
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.tracing.conventions import Reference
 
+log = get_module_logger(__file__)
+
 
 class TraceProcessor(BatchSpanProcessor):
     def __init__(

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/tracing/tracing.py

@@ -15,7 +15,7 @@ from opentelemetry.sdk.resources import Resource
 
 from agenta.sdk.utils.singleton import Singleton
 from agenta.sdk.utils.exceptions import suppress
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
 from agenta.sdk.tracing.processors import TraceProcessor
 from agenta.sdk.tracing.exporters import InlineExporter, OTLPExporter
 from agenta.sdk.tracing.spans import CustomSpan
@@ -24,6 +24,8 @@ from agenta.sdk.tracing.conventions import Reference, is_valid_attribute_key
 from agenta.sdk.tracing.propagation import extract, inject
 from agenta.sdk.utils.cache import TTLLRUCache
 
+log = get_module_logger(__file__)
+
 
 class Tracing(metaclass=Singleton):
     VERSION = "0.1.0"

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/utils/exceptions.py

@@ -3,7 +3,9 @@ from traceback import format_exc
 from functools import wraps
 from inspect import iscoroutinefunction
 
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
+
+log = get_module_logger(__file__)
 
 
 def display_exception(message: str):

agenta-0.39.0/agenta/sdk/utils/logging.py

@@ -0,0 +1,276 @@
+from typing import Any, Optional
+
+import os
+import re
+import sys
+import logging
+
+import structlog
+from structlog.typing import EventDict, WrappedLogger, Processor
+
+# from datetime import datetime
+# from logging.handlers import RotatingFileHandler
+
+# from opentelemetry.trace import get_current_span
+# from opentelemetry._logs import set_logger_provider
+# from opentelemetry.sdk._logs import LoggingHandler, LoggerProvider
+# from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
+# from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
+
+TRACE_LEVEL = 1
+logging.TRACE = TRACE_LEVEL
+logging.addLevelName(TRACE_LEVEL, "TRACE")
+
+
+def trace(self, message, *args, **kwargs):
+    if self.isEnabledFor(TRACE_LEVEL):
+        self._log(TRACE_LEVEL, message, args, **kwargs)
+
+
+logging.Logger.trace = trace
+
+
+def bound_logger_trace(self, *args, **kwargs):
+    return self._proxy_to_logger("trace", *args, **kwargs)
+
+
+structlog.stdlib.BoundLogger.trace = bound_logger_trace
+
+# ENV VARS
+LOG_CONSOLE_ENABLED = os.getenv("LOG_CONSOLE_ENABLED", "true") == "true"
+LOG_CONSOLE_LEVEL = os.getenv("LOG_CONSOLE_LEVEL", "TRACE").upper()
+
+# LOG_OTLP_ENABLED = os.getenv("LOG_OTLP_ENABLED", "false") == "true"
+# LOG_OTLP_LEVEL = os.getenv("LOG_OTLP_LEVEL", "INFO").upper()
+
+# LOG_FILE_ENABLED = os.getenv("LOG_FILE_ENABLED", "true") == "true"
+# LOG_FILE_LEVEL = os.getenv("LOG_FILE_LEVEL", "WARNING").upper()
+# LOG_FILE_BASE = os.getenv("LOG_FILE_PATH", "error")
+# LOG_FILE_DATE = datetime.utcnow().strftime("%Y-%m-%d")
+# LOG_FILE_PATH = f"{LOG_FILE_BASE}-{LOG_FILE_DATE}.log"
+
+# COLORS
+LEVEL_COLORS = {
+    "TRACE": "\033[97m",
+    "DEBUG": "\033[38;5;39m",
+    "INFO": "\033[38;5;70m",
+    "INFO.": "\033[38;5;70m",
+    "WARNING": "\033[38;5;214m",
+    "WARN.": "\033[38;5;214m",
+    "ERROR": "\033[38;5;203m",
+    "CRITICAL": "\033[38;5;199m",
+    "FATAL": "\033[1;37;41m",
+}
+RESET = "\033[0m"
+
+SEVERITY_NUMBERS = {
+    "TRACE": 1,
+    "DEBUG": 5,
+    "INFO": 9,
+    "INFO.": 9,
+    "WARNING": 13,
+    "WARN.": 13,
+    "ERROR": 17,
+    "CRITICAL": 21,
+    "FATAL": 21,
+}
+
+# PROCESSORS
+
+
+def process_positional_args(_, __, event_dict: EventDict) -> EventDict:
+    args = event_dict.pop("positional_args", ())
+    if args and isinstance(event_dict.get("event"), str):
+        try:
+            event_dict["event"] = event_dict["event"] % args
+        except Exception:
+            event_dict["event"] = f"{event_dict['event']} {args}"
+    return event_dict
+
+
+# def add_trace_context(_, __, event_dict: EventDict) -> EventDict:
+#     span = get_current_span()
+#     if span and span.get_span_context().is_valid:
+#         ctx = span.get_span_context()
+#         event_dict["TraceId"] = format(ctx.trace_id, "032x")
+#         event_dict["SpanId"] = format(ctx.span_id, "016x")
+#     return event_dict
+
+
+def add_logger_info(
+    logger: WrappedLogger, method_name: str, event_dict: EventDict
+) -> EventDict:
+    level = method_name.upper()
+    if level == "CRITICAL":
+        level = "FATAL"
+    elif level == "WARNING":
+        level = "WARN."
+    elif level == "INFO":
+        level = "INFO."
+
+    event_dict["level"] = level
+    event_dict["SeverityText"] = level
+    event_dict["SeverityNumber"] = SEVERITY_NUMBERS.get(level, 9)
+    event_dict["LoggerName"] = logger.name
+    event_dict["MethodName"] = method_name
+    return event_dict
+
+
+def colored_console_renderer() -> Processor:
+    hidden = {
+        "SeverityText",
+        "SeverityNumber",
+        "MethodName",
+        "logger_factory",
+        "LoggerName",
+        "level",
+    }
+
+    def render(_, __, event_dict: EventDict) -> str:
+        ts = event_dict.pop("Timestamp", "")[:23] + "Z"
+        level = event_dict.pop("level", "INFO")
+        msg = event_dict.pop("event", "")
+        color = LEVEL_COLORS.get(level, "")
+        padded = f"[{level:<5}]"
+        logger = f"\033[38;5;245m[{event_dict.pop('logger', '')}]\033[0m"
+        extras = " ".join(
+            f"\033[38;5;245m{k}={v}\033[0m"
+            for k, v in event_dict.items()
+            if k not in hidden
+        )
+        return f"{ts} {color}{padded}{RESET} {msg} {logger} {extras}"
+
+    return render
+
+
+# def plain_renderer() -> Processor:
+#     hidden = {
+#         "SeverityText",
+#         "SeverityNumber",
+#         "MethodName",
+#         "logger_factory",
+#         "LoggerName",
+#         "level",
+#     }
+
+#     def render(_, __, event_dict: EventDict) -> str:
+#         ts = event_dict.pop("Timestamp", "")[:23] + "Z"
+#         level = event_dict.get("level", "")
+#         msg = event_dict.pop("event", "")
+#         padded = f"[{level:<5}]"
+#         logger = f"[{event_dict.pop('logger', '')}]"
+#         extras = " ".join(f"{k}={v}" for k, v in event_dict.items() if k not in hidden)
+#         return f"{ts} {padded} {msg} {logger} {extras}"
+
+#     return render
+
+
+# def json_renderer() -> Processor:
+#     return structlog.processors.JSONRenderer()
+
+
+SHARED_PROCESSORS: list[Processor] = [
+    structlog.processors.TimeStamper(fmt="iso", utc=True, key="Timestamp"),
+    process_positional_args,
+    # add_trace_context,
+    add_logger_info,
+    structlog.processors.format_exc_info,
+    structlog.processors.dict_tracebacks,
+]
+
+
+def create_struct_logger(
+    processors: list[Processor], name: str
+) -> structlog.stdlib.BoundLogger:
+    logger = logging.getLogger(name)
+    logger.setLevel(TRACE_LEVEL)
+    return structlog.wrap_logger(
+        logger,
+        processors=SHARED_PROCESSORS + processors,
+        wrapper_class=structlog.stdlib.BoundLogger,
+        logger_factory=structlog.stdlib.LoggerFactory(),
+        cache_logger_on_first_use=True,
+    )
+
+
+# CONFIGURE HANDLERS AND STRUCTLOG LOGGERS
+handlers = []
+loggers = []
+
+if LOG_CONSOLE_ENABLED:
+    h = logging.StreamHandler(sys.stdout)
+    h.setLevel(getattr(logging, LOG_CONSOLE_LEVEL, TRACE_LEVEL))
+    h.setFormatter(logging.Formatter("%(message)s"))
+    logging.getLogger("console").addHandler(h)
+    loggers.append(create_struct_logger([colored_console_renderer()], "console"))
+
+# if LOG_FILE_ENABLED:
+#     h = RotatingFileHandler(LOG_FILE_PATH, maxBytes=10 * 1024 * 1024, backupCount=5)
+#     h.setLevel(getattr(logging, LOG_FILE_LEVEL, logging.WARNING))
+#     h.setFormatter(logging.Formatter("%(message)s"))
+#     logging.getLogger("file").addHandler(h)
+#     loggers.append(create_struct_logger([plain_renderer()], "file"))
+
+# if LOG_OTLP_ENABLED:
+#     provider = LoggerProvider()
+#     exporter = OTLPLogExporter()
+#     provider.add_log_record_processor(BatchLogRecordProcessor(exporter))
+#     set_logger_provider(provider)
+#     h = LoggingHandler(
+#         level=getattr(logging, LOG_OTLP_LEVEL, logging.INFO), logger_provider=provider
+#     )
+#     h.setFormatter(logging.Formatter("%(message)s"))
+#     logging.getLogger("otel").addHandler(h)
+#     loggers.append(create_struct_logger([json_renderer()], "otel"))
+
+
+class MultiLogger:
+    def __init__(self, *loggers: structlog.stdlib.BoundLogger):
+        self._loggers = loggers
+
+    def _log(self, level: str, *args: Any, **kwargs: Any):
+        for l in self._loggers:
+            getattr(l, level)(*args, **kwargs)
+
+    def debug(self, *a, **k):
+        self._log("debug", *a, **k)
+
+    def info(self, *a, **k):
+        self._log("info", *a, **k)
+
+    def warning(self, *a, **k):
+        self._log("warning", *a, **k)
+
+    def warn(self, *a, **k):
+        self._log("warn", *a, **k)
+
+    def error(self, *a, **k):
+        self._log("error", *a, **k)
+
+    def critical(self, *a, **k):
+        self._log("critical", *a, **k)
+
+    def fatal(self, *a, **k):
+        self._log("fatal", *a, **k)
+
+    def trace(self, *a, **k):
+        self._log("trace", *a, **k)
+
+    def bind(self, **kwargs):
+        return MultiLogger(*(l.bind(**kwargs) for l in self._loggers))
+
+
+multi_logger = MultiLogger(*loggers)
+
+
+def get_logger(name: Optional[str] = None) -> MultiLogger:
+    return multi_logger.bind(logger=name)
+
+
+def get_module_logger(path: str) -> MultiLogger:
+    match = re.search(r"(?:/sdk|/api)(/.*)", path)
+    if match:
+        trimmed = match.group(0).lstrip("/")
+        dotted = trimmed.removesuffix(".py").replace("/", ".")
+        return get_logger(dotted)
+    return get_logger(os.path.basename(path).removesuffix(".py"))

{agenta-0.38.2 → agenta-0.39.0}/agenta/sdk/utils/timing.py

@@ -1,7 +1,9 @@
 import time
 from functools import wraps
 
-from agenta.sdk.utils.logging import log
+from agenta.sdk.utils.logging import get_module_logger
+
+log = get_module_logger(__file__)
 
 
 def timeit(func):

{agenta-0.38.2 → agenta-0.39.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.38.2"
+version = "0.39.0"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]
@@ -28,10 +28,12 @@ importlib-metadata = ">=8.0.0,<9.0"
 httpx = ">=0.24, <0.28"
 pyyaml = "^6.0.2"
 toml = "^0.10.2"
-litellm ="^1.48.0"
+litellm = "^1.61.15"
+jinja2 = "^3.1.6"
 opentelemetry-api = ">=1.27.0,<2.0.0"
 opentelemetry-sdk = ">=1.27.0,<2.0.0"
-opentelemetry-exporter-otlp-proto-http = ">=1.27.0,<2.0.0"
+opentelemetry-exporter-otlp-proto-http =">=1.27.0,<2.0.0"
+structlog= "^25.2.0"
 
 [tool.poetry.group.dev.dependencies]
 posthog = "^3.1.0"

agenta-0.38.2/agenta/sdk/utils/logging.py

@@ -1,21 +0,0 @@
-import logging
-from os import getenv
-
-
-class Logger:
-    def __init__(self, name="agenta.logger", level=logging.WARNING):
-        if getenv("AGENTA_DEBUG"):
-            level = logging.DEBUG
-
-        self.logger = logging.getLogger(name)
-        self.logger.setLevel(level)
-
-        console_handler = logging.StreamHandler()
-        self.logger.addHandler(console_handler)
-
-    @property
-    def log(self) -> logging.Logger:
-        return self.logger
-
-
-log = Logger().log