agenta 0.25.3a1__tar.gz → 0.25.4a1__tar.gz

{agenta-0.25.3a1 → agenta-0.25.4a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.25.3a1
+Version: 0.25.4a1
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering

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

@@ -392,9 +392,12 @@ class entrypoint:
                 if inspect.iscoroutinefunction(func)
                 else func(*args, **func_params["params"])
             )
-
             data = self.patch_result(result)
         except Exception as e:
+            log.error(f"Agenta SDK - Routing Exception")
+
+            traceback.print_exc()
+
             self.handle_exception(e)
 
         with suppress():

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

@@ -1,4 +1,5 @@
 import inspect
+import traceback
 from functools import wraps
 from itertools import chain
 from typing import Callable, Optional, Any, Dict, List
@@ -63,7 +64,9 @@ class instrument:
                 not in (
                     ignore
                     if isinstance(ignore, list)
-                    else io.keys() if ignore is True else []
+                    else io.keys()
+                    if ignore is True
+                    else []
                 )
             }
 
@@ -137,6 +140,8 @@ class instrument:
                     try:
                         result = await func(*args, **kwargs)
                     except Exception as e:
+                        traceback.print_exc()
+
                         span.record_exception(e)
 
                         span.set_status("ERROR")
@@ -146,6 +151,7 @@ class instrument:
                     with suppress():
                         cost = None
                         usage = {}
+
                         if isinstance(result, dict):
                             cost = result.get("cost", None)
                             usage = result.get("usage", {})

{agenta-0.25.3a1 → agenta-0.25.4a1}/agenta/sdk/tracing/inline.py

@@ -60,7 +60,7 @@ def _p_ora(o, open="{", close="}", sep=": ", foo=repr):
         return f"[{', '.join([repr(el) for el in o])}]"
     elif isinstance(o, dict):
         o = OrderedDict(sorted(o.items()))
-        return f"{open}{', '.join([f"{foo(elk)}{sep}{_p_ora(elv)}" for elk, elv in o.items()])}{close}"
+        return f"{open}{', '.join([f'{foo(elk)}{sep}{_p_ora(elv)}' for elk, elv in o.items()])}{close}"
     else:
         if o is not None:
             return repr(o)
@@ -92,6 +92,7 @@ class LifecycleDTO(DisplayBase):
 
     updated_by_id: Optional[UUID] = None
 
+
 ### -------------------- ###
 ### services.shared.dtos ###
 ############################
@@ -306,6 +307,7 @@ class OTelSpanDTO(DisplayBase):
     parent: Optional[OTelContextDTO] = None
     links: Optional[List[OTelLinkDTO]] = None
 
+
 ### --------------------------- ###
 ### services.observability.dtos ###
 ###################################
@@ -321,7 +323,6 @@ from typing import List, Dict, OrderedDict
 def parse_span_dtos_to_span_idx(
     span_dtos: List[SpanCreateDTO],
 ) -> Dict[str, SpanCreateDTO]:
-
     span_idx = {span_dto.node.id: span_dto for span_dto in span_dtos}
 
     return span_idx
@@ -330,7 +331,6 @@ def parse_span_dtos_to_span_idx(
 def parse_span_idx_to_span_id_tree(
     span_idx: Dict[str, SpanCreateDTO],
 ) -> OrderedDict:
-
     span_id_tree = OrderedDict()
     index = {}
 
@@ -352,7 +352,6 @@ def cumulate_costs(
     spans_id_tree: OrderedDict,
     spans_idx: Dict[str, SpanCreateDTO],
 ) -> None:
-
     def _get_unit(span: SpanCreateDTO):
         if span.metrics is not None:
             return span.metrics.get("unit.costs.total", 0.0)
@@ -382,7 +381,6 @@ def cumulate_tokens(
     spans_id_tree: OrderedDict,
     spans_idx: Dict[str, dict],
 ) -> None:
-
     def _get_unit(span: SpanCreateDTO):
         _tokens = {
             "prompt": 0.0,
@@ -429,9 +427,15 @@ def cumulate_tokens(
         if tokens.get("prompt", 0.0) != 0.0:
             span.metrics["acc.tokens.prompt"] = tokens.get("prompt", 0.0)
         if tokens.get("completion", 0.0) != 0.0:
-            span.metrics["acc.tokens.completion"] = tokens.get("completion", 0.0) if tokens.get("completion", 0.0) != 0.0 else None
+            span.metrics["acc.tokens.completion"] = (
+                tokens.get("completion", 0.0)
+                if tokens.get("completion", 0.0) != 0.0
+                else None
+            )
         if tokens.get("total", 0.0) != 0.0:
-            span.metrics["acc.tokens.total"] = tokens.get("total", 0.0) if tokens.get("total", 0.0) != 0.0 else None
+            span.metrics["acc.tokens.total"] = (
+                tokens.get("total", 0.0) if tokens.get("total", 0.0) != 0.0 else None
+            )
 
     _cumulate_tree_dfs(spans_id_tree, spans_idx, _get_unit, _get_acc, _acc, _set)
 
@@ -500,6 +504,7 @@ def _connect_tree_dfs(
         if len(parent_span.nodes) == 0:
             parent_span.nodes = None
 
+
 ### ---------------------------- ###
 ### services.observability.utils ###
 ####################################
@@ -631,7 +636,6 @@ def _unmarshal_attributes(
         level = unmarshalled
 
         for i, part in enumerate(keys[:-1]):
-
             if part.isdigit():
                 part = int(part)
 
@@ -803,7 +807,6 @@ def _parse_from_links(
 def _parse_from_attributes(
     otel_span_dto: OTelSpanDTO,
 ) -> Tuple[dict, dict, dict, dict, dict]:
-
     # DATA
     _data = _get_attributes(otel_span_dto.attributes, "data")
 
@@ -990,6 +993,7 @@ def parse_to_agenta_span_dto(
 
     return span_dto
 
+
 ### -------------------------------- ###
 ### apis.fastapi.observability.utils ###
 ########################################
@@ -1008,7 +1012,7 @@ def parse_inline_trace(
     ############################################################
     ### apis.fastapi.observability.api.otlp_collect_traces() ###
     ### ---------------------------------------------------- ###
-    span_dtos = [               
+    span_dtos = [
         parse_from_otel_span_dto(project_id, otel_span_dto)
         for otel_span_dto in otel_span_dtos
     ]
@@ -1033,13 +1037,15 @@ def parse_inline_trace(
     ### --------------------------------------- ###
     ### services.observability.service.ingest() ###
     ###############################################
-    
+
     ##############################################
     ### services.observability.service.query() ###
     ### -------------------------------------- ###
     connect_children(span_id_tree, span_idx)
-    root_span_dtos = [span_dto for span_dto in span_idx.values()]
-    agenta_span_dtos = [parse_to_agenta_span_dto(span_dto) for span_dto in root_span_dtos]
+    root_span_dtos = [span_idx[span_id] for span_id in span_id_tree.keys()]
+    agenta_span_dtos = [
+        parse_to_agenta_span_dto(span_dto) for span_dto in root_span_dtos
+    ]
     ### -------------------------------------- ###
     ### services.observability.service.query() ###
     ##############################################
@@ -1048,17 +1054,25 @@ def parse_inline_trace(
     inline_trace = None
 
     if LEGACY:
-        legacy_spans = [_parse_to_legacy_span(span_dto) for span_dto in span_idx.values()]
+        legacy_spans = [
+            _parse_to_legacy_span(span_dto) for span_dto in span_idx.values()
+        ]
 
-        root_span = root_span_dtos[0]
+        root_span = agenta_span_dtos[0]
 
         trace_id = root_span.root.id.hex
-        latency = root_span.time.span
+        latency = root_span.time.span / 1_000_000
         cost = root_span.metrics.get("acc", {}).get("costs", {}).get("total", 0.0)
         tokens = {
-            "prompt_tokens": root_span.metrics.get("acc", {}).get("tokens", {}).get("prompt", 0),
-            "completion_tokens": root_span.metrics.get("acc", {}).get("tokens", {}).get("completion", 0),
-            "total_tokens": root_span.metrics.get("acc", {}).get("tokens", {}).get("total", 0),
+            "prompt_tokens": root_span.metrics.get("acc", {})
+            .get("tokens", {})
+            .get("prompt", 0),
+            "completion_tokens": root_span.metrics.get("acc", {})
+            .get("tokens", {})
+            .get("completion", 0),
+            "total_tokens": root_span.metrics.get("acc", {})
+            .get("tokens", {})
+            .get("total", 0),
         }
 
         spans = [
@@ -1072,13 +1086,14 @@ def parse_inline_trace(
             "tokens": tokens,
             "spans": spans,
         }
-    
+
     else:
         spans = [
-            loads(span_dto.model_dump_json(exclude_none=True)) for span_dto in agenta_span_dtos
+            loads(span_dto.model_dump_json(exclude_none=True))
+            for span_dto in agenta_span_dtos
         ]
 
-        inline_trace = spans # turn into Agenta Model ?
+        inline_trace = spans  # turn into Agenta Model ?
 
     return inline_trace
 
@@ -1095,7 +1110,10 @@ def _parse_readable_spans(
                 span_id=_int_to_hex(span.get_span_context().span_id, 64),
             ),
             name=span.name,
-            kind=OTelSpanKind("SPAN_KIND_" + (span.kind if isinstance(span.kind, str) else span.kind.name)),
+            kind=OTelSpanKind(
+                "SPAN_KIND_"
+                + (span.kind if isinstance(span.kind, str) else span.kind.name)
+            ),
             start_time=_timestamp_ns_to_datetime(span.start_time),
             end_time=_timestamp_ns_to_datetime(span.end_time),
             status_code=OTelStatusCode("STATUS_CODE_" + span.status.status_code.name),
@@ -1109,10 +1127,14 @@ def _parse_readable_spans(
                 )
                 for event in span.events
             ],
-            parent=OTelContextDTO(
-                trace_id=_int_to_hex(span.parent.trace_id, 128),
-                span_id=_int_to_hex(span.parent.span_id, 64)
-            ) if span.parent else None,
+            parent=(
+                OTelContextDTO(
+                    trace_id=_int_to_hex(span.parent.trace_id, 128),
+                    span_id=_int_to_hex(span.parent.span_id, 64),
+                )
+                if span.parent
+                else None
+            ),
             links=[
                 OTelLinkDTO(
                     context=OTelContextDTO(
@@ -1125,7 +1147,6 @@ def _parse_readable_spans(
             ],
         )
 
-
         otel_span_dtos.append(otel_span_dto)
 
     return otel_span_dtos
@@ -1209,14 +1230,32 @@ def _parse_to_legacy_span(span: SpanDTO) -> CreateSpan:
         environment=span.meta.get("environment") if span.meta else None,
         config=span.meta.get("configuration") if span.meta else None,
         #
-        tokens=LlmTokens(
-            prompt_tokens=span.metrics.get("acc", {}).get("tokens", {}).get("prompt", 0.0),
-            completion_tokens=span.metrics.get("acc", {}).get("tokens", {}).get("completion", 0.0),
-            total_tokens=span.metrics.get("acc", {}).get("tokens", {}).get("total", 0.0),
-        ) if span.metrics else None,
-        cost=span.metrics.get("acc", {}).get("costs", {}).get("total", 0.0) if span.metrics else None,
+        tokens=(
+            LlmTokens(
+                prompt_tokens=span.metrics.get("acc", {})
+                .get("tokens", {})
+                .get("prompt", 0.0),
+                completion_tokens=span.metrics.get("acc", {})
+                .get("tokens", {})
+                .get("completion", 0.0),
+                total_tokens=span.metrics.get("acc", {})
+                .get("tokens", {})
+                .get("total", 0.0),
+            )
+            if span.metrics
+            else None
+        ),
+        cost=(
+            span.metrics.get("acc", {}).get("costs", {}).get("total", 0.0)
+            if span.metrics
+            else None
+        ),
         #
-        app_id=span.refs.get("application", {}).get("id", "missing-app-id") if span.refs else "missing-app-id",
+        app_id=(
+            span.refs.get("application", {}).get("id", "missing-app-id")
+            if span.refs
+            else "missing-app-id"
+        ),
         #
         attributes=attributes,
         #

{agenta-0.25.3a1 → agenta-0.25.4a1}/agenta/sdk/tracing/tracing.py

@@ -34,8 +34,7 @@ class Tracing(metaclass=Singleton):
         url: str,
     ) -> None:
         # ENDPOINT (OTLP)
-        # self.otlp_url = url
-        self.otlp_url = "http://127.0.0.1:8000/api/observability/v1/otlp/traces"
+        self.otlp_url = url
         # AUTHENTICATION (OTLP)
         self.project_id: Optional[str] = None
         # AUTHORIZATION (OTLP)
@@ -62,17 +61,20 @@ class Tracing(metaclass=Singleton):
         app_id: Optional[str] = None,
     ):
         # AUTHENTICATION (OTLP)
-        # self.project_id = project_id
-        self.project_id = "f7943e42-ec69-498e-bf58-8db034b9286e"
+        self.project_id = project_id  # "f7943e42-ec69-498e-bf58-8db034b9286e"
+        self.app_id = app_id
         # AUTHORIZATION (OTLP)
         self.api_key = api_key
         # HEADERS (OTLP)
-        self.headers = {"AG-PROJECT-ID": self.project_id}
+        self.headers = {}
+        if project_id:
+            self.headers.update(**{"AG-PROJECT-ID": project_id})
+        if app_id:
+            self.headers.update(**{"AG-APP-ID": app_id})
         if api_key:
-            # self.headers.update(**{"Authorization": f"Api-Key {self.api_key}"})
             self.headers.update(**{"Authorization": self.api_key})
         # REFERENCES
-        self.references = {"application.id": app_id}
+        self.references = {"application_id": app_id}
 
         # TRACER PROVIDER
         self.tracer_provider = TracerProvider(
@@ -94,7 +96,7 @@ class Tracing(metaclass=Singleton):
         try:
             log.info(f"Connecting to the remote trace receiver at {self.otlp_url}...")
 
-            check(self.otlp_url, headers=self.headers)
+            check(self.otlp_url, headers=self.headers, timeout=1)
 
             log.info(f"Connection established.")
 
@@ -104,7 +106,8 @@ class Tracing(metaclass=Singleton):
             )
 
             self.tracer_provider.add_span_processor(_otlp)
-        except:
+        except Exception as e:
+            log.error(e)
             log.warning(f"Connection failed.")
             log.warning(
                 f"Warning: Your traces will not be exported since {self.otlp_url} is unreachable."
@@ -159,7 +162,7 @@ class Tracing(metaclass=Singleton):
         if not otel_spans:
             return {}
 
-        inline_trace = parse_inline_trace(self.project_id, otel_spans)
+        inline_trace = parse_inline_trace(self.project_id or self.app_id, otel_spans)
 
         return inline_trace
 

{agenta-0.25.3a1 → agenta-0.25.4a1}/agenta/sdk/utils/exceptions.py

@@ -14,5 +14,6 @@ class suppress(AbstractContextManager):
         if exc_type is None:
             return
         else:
+            print("Agenta SDK - Tracing Exception")
             log.error(f"{exc_type.__name__}: {exc_value}\n{format_exc()}")
             return

{agenta-0.25.3a1 → agenta-0.25.4a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "agenta"
-version = "0.25.3a1"
+version = "0.25.4a1"
 description = "The SDK for agenta is an open-source LLMOps platform."
 readme = "README.md"
 authors = ["Mahmoud Mabrouk <mahmoud@agenta.ai>"]