agenta 0.44.4__py3-none-any.whl → 0.45.1__py3-none-any.whl

agenta/sdk/decorators/routing.py

@@ -363,20 +363,44 @@ class entrypoint:
         tree = None
         content_type = "text/plain"
         tree_id = None
+        trace_id = None
+        span_id = None
 
         with suppress():
             if isinstance(result, (dict, list)):
                 content_type = "application/json"
             data = self.patch_result(result)
 
-            tree, tree_id = await self.fetch_inline_trace(inline)
+            (
+                tree,
+                tree_id,
+                trace_id,
+                span_id,
+            ) = await self.fetch_inline_trace(inline)
 
         try:
             return BaseResponse(
-                data=data, tree=tree, content_type=content_type, tree_id=tree_id
+                data=data,
+                tree=tree,
+                content_type=content_type,
+                tree_id=tree_id,
+                trace_id=trace_id,
+                span_id=span_id,
             )
         except:  # pylint: disable=bare-except
-            return BaseResponse(data=data, content_type=content_type)
+            try:
+                return BaseResponse(
+                    data=data,
+                    content_type=content_type,
+                    tree_id=tree_id,
+                    trace_id=trace_id,
+                    span_id=span_id,
+                )
+            except:  # pylint: disable=bare-except
+                return BaseResponse(
+                    data=data,
+                    content_type=content_type,
+                )
 
     def handle_failure(
         self,
@@ -444,8 +468,10 @@ class entrypoint:
 
         link = context.link
 
-        _tree_id = link.get("tree_id") if link else None  # in int format
-        tree_id = str(UUID(int=_tree_id)) if _tree_id else None  # in uuid_as_str format
+        _trace_id = link.get("trace_id") if link else None  # in int format
+        tree_id = (
+            str(UUID(int=_trace_id)) if _trace_id else None
+        )  # in uuid_as_str format
 
         return tree_id
 
@@ -461,24 +487,28 @@ class entrypoint:
 
         link = context.link
 
+        _trace_id = link.get("trace_id") if link else None  # in int format
+        _span_id = link.get("span_id") if link else None  # in int format
+
         tree = None
-        _tree_id = link.get("tree_id") if link else None  # in int format
-        tree_id = str(UUID(int=_tree_id)) if _tree_id else None  # in uuid_as_str format
+        tree_id = str(UUID(int=_trace_id)) if _trace_id else None
+        trace_id = UUID(int=_trace_id).hex if _trace_id else None
+        span_id = UUID(int=_span_id).hex[16:] if _span_id else None
 
-        if _tree_id is not None:
+        if _trace_id is not None:
             if inline:
                 remaining_steps = NOFSTEPS
                 while (
-                    not ag.tracing.is_inline_trace_ready(_tree_id)
+                    not ag.tracing.is_inline_trace_ready(_trace_id)
                     and remaining_steps > 0
                 ):
                     await sleep(TIMESTEP)
 
                     remaining_steps -= 1
 
-                tree = ag.tracing.get_inline_trace(_tree_id)
+                tree = ag.tracing.get_inline_trace(_trace_id)
 
-        return tree, tree_id
+        return tree, tree_id, trace_id, span_id
 
     # --- OpenAPI --- #
 

agenta/sdk/decorators/tracing.py

@@ -131,8 +131,8 @@ class instrument:  # pylint: disable=invalid-name
 
         if not context.link:
             context.link = {
-                "tree_id": span.get_span_context().trace_id,
-                "node_id": span.get_span_context().span_id,
+                "trace_id": span.get_span_context().trace_id,
+                "span_id": span.get_span_context().span_id,
             }
 
             tracing_context.set(context)

agenta/sdk/litellm/mockllm.py

@@ -1,23 +1,31 @@
 from typing import Optional, Protocol, Any
+from os import environ
+
+from agenta.sdk.utils.logging import get_module_logger
 
 from agenta.sdk.litellm.mocks import MOCKS
 from agenta.sdk.context.routing import routing_context
 
+AGENTA_LITELLM_MOCK = environ.get("AGENTA_LITELLM_MOCK") or None
+
+log = get_module_logger(__name__)
+
 
 class LitellmProtocol(Protocol):
-    async def acompletion(self, *args: Any, **kwargs: Any) -> Any:
-        ...
+    async def acompletion(self, *args: Any, **kwargs: Any) -> Any: ...
 
 
 litellm: Optional[LitellmProtocol] = None  # pylint: disable=invalid-name
 
 
 async def acompletion(*args, **kwargs):
-    mock = routing_context.get().mock
+    mock = AGENTA_LITELLM_MOCK or routing_context.get().mock
 
     if mock:
+        log.debug("Mocking litellm: %s.", mock)
+
         if mock not in MOCKS:
-            raise ValueError(f"Mock {mock} not found")
+            mock = "hello"
 
         return MOCKS[mock](*args, **kwargs)
 

agenta/sdk/litellm/mocks/__init__.py

@@ -1,4 +1,5 @@
 from typing import Callable
+from asyncio import sleep
 
 from pydantic import BaseModel
 
@@ -30,7 +31,26 @@ def hello_mock_response(*args, **kwargs) -> MockResponseModel:
 def chat_mock_response(*args, **kwargs) -> MockResponseModel:
     return MockResponseModel(
         choices=[
-            MockChoiceModel(message=MockMessageModel(content="world", role="assistant"))
+            MockChoiceModel(
+                message=MockMessageModel(
+                    content="world",
+                    role="assistant",
+                )
+            )
+        ],
+    )
+
+
+def delay_mock_response(*args, **kwargs) -> MockResponseModel:
+    sleep(2)
+
+    return MockResponseModel(
+        choices=[
+            MockChoiceModel(
+                message=MockMessageModel(
+                    content="delay",
+                )
+            )
         ],
     )
 
@@ -38,4 +58,5 @@ def chat_mock_response(*args, **kwargs) -> MockResponseModel:
 MOCKS: dict[str, Callable[..., MockResponseModel]] = {
     "hello": hello_mock_response,
     "chat": chat_mock_response,
+    "delay": delay_mock_response,
 }

agenta/sdk/managers/apps.py

@@ -12,11 +12,6 @@ AppType = Literal["SERVICE:completion", "SERVICE:chat", "CUSTOM"]
 DEFAULT_APP_TYPE = "SERVICE:completion"
 
 
-AppType = Literal["SERVICE:completion", "SERVICE:chat", "CUSTOM"]
-
-DEFAULT_APP_TYPE = "SERVICE:completion"
-
-
 class AppManager:
     @classmethod
     @handle_exceptions()

agenta/sdk/middleware/config.py

@@ -92,15 +92,21 @@ class ConfigMiddleware(BaseHTTPMiddleware):
                 return parameters, references
 
         config = {}
-        async with httpx.AsyncClient() as client:
-            response = await client.post(
-                f"{self.host}/api/variants/configs/fetch",
-                headers=headers,
-                json=refs,
-            )
-
-            if response.status_code == 200:
-                config = response.json()
+
+        is_test_path = request.url.path.endswith("/test")
+        are_refs_missing = not variant_ref and not environment_ref
+        should_fetch = not is_test_path or not are_refs_missing
+
+        if should_fetch:
+            async with httpx.AsyncClient() as client:
+                response = await client.post(
+                    f"{self.host}/api/variants/configs/fetch",
+                    headers=headers,
+                    json=refs,
+                )
+
+                if response.status_code == 200:
+                    config = response.json()
 
         if not config:
             config["application_ref"] = refs[

agenta/sdk/tracing/inline.py

@@ -160,6 +160,9 @@ class OTelExtraDTO(BaseModel):
 
 
 class SpanDTO(BaseModel):
+    trace_id: str
+    span_id: str
+
     scope: Optional[ProjectScopeDTO] = None
 
     lifecycle: Optional[LifecycleDTO] = None
@@ -792,6 +795,9 @@ def _parse_from_attributes(
 def parse_from_otel_span_dto(
     otel_span_dto: OTelSpanDTO,
 ) -> SpanDTO:
+    trace_id = str(otel_span_dto.context.trace_id[2:])
+    span_id = str(otel_span_dto.context.span_id[2:])
+
     lifecyle = LifecycleDTO(
         created_at=datetime.now(),
     )
@@ -800,7 +806,7 @@ def parse_from_otel_span_dto(
 
     types = _parse_from_types(otel_span_dto)
 
-    tree_id = UUID(otel_span_dto.context.trace_id[2:])
+    tree_id = UUID(trace_id)
 
     tree_type: str = types.get("tree")
 
@@ -809,7 +815,7 @@ def parse_from_otel_span_dto(
         type=tree_type.lower() if tree_type else None,
     )
 
-    node_id = UUID(tree_id.hex[16:] + otel_span_dto.context.span_id[2:])
+    node_id = UUID(trace_id[16:] + span_id)
 
     node_type = NodeType.TASK
     try:
@@ -871,6 +877,8 @@ def parse_from_otel_span_dto(
     )
 
     span_dto = SpanDTO(
+        trace_id=trace_id,
+        span_id=span_id,
         lifecycle=lifecyle,
         root=root,
         tree=tree,

agenta/sdk/tracing/processors.py

@@ -1,8 +1,9 @@
 from typing import Optional, Dict, List
+from threading import Lock
 
 from opentelemetry.baggage import get_all as get_baggage
 from opentelemetry.context import Context
-from opentelemetry.sdk.trace import Span
+from opentelemetry.sdk.trace import Span, SpanProcessor
 from opentelemetry.sdk.trace.export import (
     SpanExporter,
     ReadableSpan,
@@ -154,3 +155,32 @@ class TraceProcessor(BatchSpanProcessor):
         # --- INLINE
 
         return trace
+
+
+# Internal storage for the last ended span context
+_last_ended_span_context = None
+_lock = Lock()
+
+
+def _set_last_ended(span_ctx) -> None:
+    """Set the last ended span context"""
+    with _lock:
+        global _last_ended_span_context
+        _last_ended_span_context = span_ctx
+
+
+def _get_last_ended():
+    """Get the last ended span context"""
+    with _lock:
+        return _last_ended_span_context
+
+
+class EndedSpanRecorder(SpanProcessor):
+    """Records the last ended span context for later reference.
+
+    This allows accessing span information even after the span has been ended,
+    which is useful for linking annotations to auto-instrumented spans.
+    """
+
+    def on_end(self, span):
+        _set_last_ended(span.get_span_context())

agenta/sdk/tracing/tracing.py

@@ -1,8 +1,11 @@
 from typing import Optional, Any, Dict, Callable
 from enum import Enum
+from uuid import UUID
 
+from pydantic import BaseModel
 from httpx import get as check
 
+
 from opentelemetry.trace import (
     get_current_span,
     set_tracer_provider,
@@ -10,13 +13,19 @@ from opentelemetry.trace import (
     Status,
     StatusCode,
 )
+from opentelemetry.sdk import trace
 from opentelemetry.sdk.trace import Span, Tracer, TracerProvider
 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 get_module_logger
-from agenta.sdk.tracing.processors import TraceProcessor
+from agenta.sdk.tracing.processors import (
+    TraceProcessor,
+    EndedSpanRecorder,
+    _get_last_ended,
+)
 from agenta.sdk.tracing.exporters import InlineExporter, OTLPExporter
 from agenta.sdk.tracing.spans import CustomSpan
 from agenta.sdk.tracing.inline import parse_inline_trace
@@ -24,9 +33,27 @@ 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
 
+from agenta.sdk.context.tracing import tracing_context
+
 log = get_module_logger(__name__)
 
 
+_original_init = trace.TracerProvider.__init__
+
+
+def patched_init(self, *args, **kwargs):
+    _original_init(self, *args, **kwargs)
+    self.add_span_processor(EndedSpanRecorder())
+
+
+trace.TracerProvider.__init__ = patched_init
+
+
+class Link(BaseModel):
+    trace_id: str
+    span_id: str
+
+
 class Tracing(metaclass=Singleton):
     VERSION = "0.1.0"
 
@@ -242,6 +269,61 @@ class Tracing(metaclass=Singleton):
     ):
         return inject(*args, **kwargs)
 
+    def get_current_span_context(self):
+        """Get the current active span context if available.
+
+        Returns:
+            SpanContext or None if no active span
+        """
+        span = get_current_span()
+        ctx = span.get_span_context()
+        return ctx if ctx and ctx.is_valid else None
+
+    def get_last_span_context(self):
+        """Get the last closed span context if available.
+
+        This is useful for accessing span information after a span has closed,
+        particularly with auto-instrumentation libraries.
+
+        Returns:
+            SpanContext or None if no spans have been closed
+        """
+        return _get_last_ended()
+
+    def get_span_context(self):
+        """Get the most relevant span context.
+
+        First tries to get the current active span context.
+        If no active span exists, falls back to the last closed span.
+
+        Returns:
+            SpanContext or None if no relevant span context is available
+        """
+        return self.get_current_span_context() or self.get_last_span_context()
+
+    def build_invocation_link(self, span_ctx=None) -> Optional[Link]:
+        """
+        Builds a Link object containing the hex-formatted trace_id and span_id
+        from the current (or fallback last ended) span context.
+        Useful to link annotations to spans.
+
+        Args:
+            span_ctx: Optional SpanContext to convert to a Link
+
+        Returns:
+            Link object with trace_id and span_id or None if no valid context
+        """
+        if span_ctx is None:
+            span_ctx = self.get_span_context()
+
+        if span_ctx and span_ctx.is_valid:
+            return Link(
+                trace_id=f"{span_ctx.trace_id:032x}",
+                span_id=f"{span_ctx.span_id:016x}",
+            )
+
+        return None
+
 
 def get_tracer(
     tracing: Tracing,

agenta/sdk/types.py

@@ -39,6 +39,8 @@ class BaseResponse(BaseModel):
     content_type: Optional[str] = "string"
     tree: Optional[AgentaNodesResponse] = None
     tree_id: Optional[str] = None
+    trace_id: Optional[str] = None
+    span_id: Optional[str] = None
 
     model_config = ConfigDict(use_enum_values=True, exclude_none=True)
 

{agenta-0.44.4.dist-info → agenta-0.45.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agenta
-Version: 0.44.4
+Version: 0.45.1
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Keywords: LLMOps,LLM,evaluation,prompt engineering
 Author: Mahmoud Mabrouk

{agenta-0.44.4.dist-info → agenta-0.45.1.dist-info}/RECORD

@@ -206,14 +206,14 @@ agenta/sdk/context/exporting.py,sha256=16X8fgMhl58gehSlqANX97FiKxx4TkGiG4d2B0-7Z
 agenta/sdk/context/routing.py,sha256=FEsjw8EttI1SMyUo96ptcUsvHJnhoKwdr1szlkxxJNU,598
 agenta/sdk/context/tracing.py,sha256=xjErrXP1Nq1AfL-Cif1l-lNEfs12eQ3v_VCRgoKe7nY,743
 agenta/sdk/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agenta/sdk/decorators/routing.py,sha256=B3nplfdFk774KLf_cs72ovx_06nfdpYM8tp6RHd38Z0,24799
-agenta/sdk/decorators/tracing.py,sha256=n3AZWw8HHKUoIHD79_ktPQcoZRIw3RthSxU5xkO-skg,10109
+agenta/sdk/decorators/routing.py,sha256=L3o0Q9flBfb2UIfCIx0OWzkP0W-45_GQ3-Ri8phwNlU,25678
+agenta/sdk/decorators/tracing.py,sha256=pABMVFtqD99W3ErqWDFUmymmXiXdzhdAJG01l-CTLVQ,10110
 agenta/sdk/litellm/__init__.py,sha256=Bpz1gfHQc0MN1yolWcjifLWznv6GjHggvRGQSpxpihM,37
 agenta/sdk/litellm/litellm.py,sha256=dCjw0H_jD3L3UQ3l9SbLm5dfeIGnel6dPtQYJ78beYM,10202
-agenta/sdk/litellm/mockllm.py,sha256=8V6dqdv8eA4P-VoXIwHNYlIjHG189P14POSfSfluVw0,678
-agenta/sdk/litellm/mocks/__init__.py,sha256=0bGjOOWXz8BxE0rvRWciPP7SAegO2mgi_UtWw8jTlDk,866
+agenta/sdk/litellm/mockllm.py,sha256=mu14jL-hk4OmzW5HdqX6T5_D5nYYhkQf4SVIZhdGdCc,894
+agenta/sdk/litellm/mocks/__init__.py,sha256=BH92MtQNPLfbN6ERk13XuDjVnNHy9joi7E_I3heUDC4,1299
 agenta/sdk/managers/__init__.py,sha256=SN-LRwG0pRRDV3u2Q4JiiSTigN3-mYpzGNM35RzT4mc,238
-agenta/sdk/managers/apps.py,sha256=hfkXat6cgZUDdW02LlMaMgO1e05m1Me3BKgSyFF9kVc,2359
+agenta/sdk/managers/apps.py,sha256=BeAlTJlOOM0Wh_XWgjve65Mt-LwFgib_swu-1wvGQi4,2250
 agenta/sdk/managers/config.py,sha256=Dl1L4KGvj3h_temzJzn7FVHacABRuB2Q7_x98EpZJQo,7494
 agenta/sdk/managers/deployment.py,sha256=SEokjZeh6n7HRKZ92Y0WncdG49hIFx-Z3B3HAl2kmUg,1174
 agenta/sdk/managers/secrets.py,sha256=QFWLQY3Enev187sNOvV3yBBYFwcPoDnInwgwlRD0SEw,7458
@@ -222,7 +222,7 @@ agenta/sdk/managers/variant.py,sha256=A5ga3mq3b0weUTXa9HO72MGaspthGcu1uK9K5OnP73
 agenta/sdk/managers/vault.py,sha256=054ce9X_xKa2M4NtQWz-GugO6q_pYVWCP3IxbAJJcRw,337
 agenta/sdk/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agenta/sdk/middleware/auth.py,sha256=xS8lVlPmapvxz_bbZ2XPxcllA0kK7iFR8TMoMVymp4M,10156
-agenta/sdk/middleware/config.py,sha256=9yFFlrkcoGNczj0ZfkbliWIt1S84cnEvB4RMCzdbBWc,7715
+agenta/sdk/middleware/config.py,sha256=g3f81uywYCcgT_TSQxZ5O1Db9wGmPuRMlf-8WKqWqdA,7963
 agenta/sdk/middleware/cors.py,sha256=q3r7lGkrIdMcT_vuhsburMcjG7pyl7w0ycxrIrGJ2e8,921
 agenta/sdk/middleware/inline.py,sha256=ee8E4XBGcRSrHTvblqX1yRXuTN_sxLm7lY1jnywrBG8,901
 agenta/sdk/middleware/mock.py,sha256=bCUN9iJBxePyN9MBwBpJs-_iCNkUQeUjIIu3WElS1oQ,759
@@ -233,12 +233,12 @@ agenta/sdk/tracing/__init__.py,sha256=rQNe5-zT5Kt7_CDhq-lnUIi1EYTBVzVf_MbfcIxVD9
 agenta/sdk/tracing/attributes.py,sha256=DwjjOk3mGOvz0jYu8EYr3hhItvawK5GX80_MfciqPrc,5559
 agenta/sdk/tracing/conventions.py,sha256=JBtznBXZ3aRkGKkLl7cPwdMNh3w1G-H2Ta2YrAxbr38,950
 agenta/sdk/tracing/exporters.py,sha256=Vs1aQLRrWvYgWxjPmlfBWTN4wmUzBREqjTdIV1XcV9o,3251
-agenta/sdk/tracing/inline.py,sha256=tY9mH1zMlJMqf2WWKJdakLtMHJKNeYRaynqvsPeqpTY,31312
-agenta/sdk/tracing/processors.py,sha256=MZZvvjL2HeFIS2TKX0nrxTenoY0_oKHdNEU7QgxeNpk,4310
+agenta/sdk/tracing/inline.py,sha256=ShPAAjk_26I4hgrmC6y0n-I9gxB3Q4VeEYhhsLHInPU,31454
+agenta/sdk/tracing/processors.py,sha256=vDzQItQnDG_bL5rWRZjh-8DOLcfhXJcMVCAbStiTVDA,5102
 agenta/sdk/tracing/propagation.py,sha256=EeOqDMqnh_MoEhGd1do_vy_tQBYUcoC8kpLqVoZeqg0,2561
 agenta/sdk/tracing/spans.py,sha256=nqUOjjirBxB8Eacv8Qj4Ra_6rknGi3lbJdNyKmk5ODQ,3707
-agenta/sdk/tracing/tracing.py,sha256=62y9ZAs8ZfjOZmlTYVHniewqZRZeNwz76XGd8cczmY4,7211
-agenta/sdk/types.py,sha256=247cPB451E91icR198wTXvJG0Hgm2HNtC0H2MmqUwTE,19042
+agenta/sdk/tracing/tracing.py,sha256=Yv42drWc2tVu4YugHKWYsgTSf1y7Y9boYL8akxKT4eA,9503
+agenta/sdk/types.py,sha256=Xpmm0D2pJKfoEWWXojvSIUEhU-kNrjF_eFmrPD4JYA4,19111
 agenta/sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agenta/sdk/utils/cache.py,sha256=69pQCtmh10DiYoOdKv4t2fCYDQCuWZtH4uy36kXewpw,1372
 agenta/sdk/utils/constants.py,sha256=zW3R4rjXOo2L5lz6q84l_zYuOM9u4mpPRHw_B1Dr_hI,67
@@ -250,6 +250,6 @@ agenta/sdk/utils/logging.py,sha256=gBk2ecRvltN7f8qtnUHXBiZPWOdArN_b5civ_3w_Oek,8
 agenta/sdk/utils/preinit.py,sha256=YlJL7RLfel0R7DFp-jK7OV-z4ZIQJM0oupYlk7g8b5o,1278
 agenta/sdk/utils/singleton.py,sha256=17Ph7LGnnV8HkPjImruKita2ni03Ari5jr0jqm__4sc,312
 agenta/sdk/utils/timing.py,sha256=nZR-kudVUtKFlHuBhztgSGxj7FVnCB4Uv6sfg-1dkrQ,1556
-agenta-0.44.4.dist-info/METADATA,sha256=7-ZCP9mKjOEiYLVoT8D2-5QMBotT-WMxXMjI-_DiMhQ,31418
-agenta-0.44.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-agenta-0.44.4.dist-info/RECORD,,
+agenta-0.45.1.dist-info/METADATA,sha256=mWM-73TJT8NOj9Lsf-vNfnXS8vWmnMGhKR9BnWEqq1Y,31418
+agenta-0.45.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+agenta-0.45.1.dist-info/RECORD,,