agenta 0.25.4a1__py3-none-any.whl → 0.25.4a3__py3-none-any.whl

agenta/sdk/decorators/routing.py

@@ -656,8 +656,7 @@ class entrypoint:
 
         SHOW_DETAILS = True
         SHOW_DATA = False
-        SHOW_SPANS = True
-        SHOW_SPAN_ATTRIBUTES = False
+        SHOW_TRACE = False
 
         log.info("\n========= Result =========\n")
 
@@ -665,14 +664,14 @@ class entrypoint:
         if SHOW_DETAILS:
             log.info(f"latency:  {result.trace.get('latency')}")
             log.info(f"cost:     {result.trace.get('cost')}")
-            log.info(f"tokens:   {list(result.trace.get('tokens', {}).values())}")
+            log.info(f"usage:   {list(result.trace.get('usage', {}).values())}")
 
         if SHOW_DATA:
             log.info(" ")
             log.info(f"data:")
             log.info(json.dumps(result.data, indent=2))
 
-        if SHOW_SPANS:
+        if SHOW_TRACE:
             log.info(" ")
             log.info(f"trace:")
             log.info(f"----------------")

agenta/sdk/litellm/litellm.py

@@ -1,5 +1,7 @@
 import agenta as ag
 
+from opentelemetry.trace import SpanKind
+
 from agenta.sdk.tracing.spans import CustomSpan
 from agenta.sdk.utils.exceptions import suppress
 from agenta.sdk.utils.logging import log
@@ -42,10 +44,10 @@ def litellm_handler():
                 else "embedding"
             )
 
-            kind = "CLIENT"
+            kind = SpanKind.CLIENT
 
             self.span = CustomSpan(
-                ag.tracer.start_span(name=f"litellm_{kind.lower()}", kind=kind)
+                ag.tracer.start_span(name=f"litellm_{kind.name.lower()}", kind=kind)
             )
 
             self.span.set_attributes(

agenta/sdk/tracing/inline.py

@@ -999,7 +999,7 @@ def parse_to_agenta_span_dto(
 ########################################
 
 
-from copy import deepcopy
+from litellm import cost_calculator
 from opentelemetry.sdk.trace import ReadableSpan
 
 
@@ -1032,6 +1032,7 @@ def parse_inline_trace(
     ###############################################
     ### services.observability.service.ingest() ###
     ### --------------------------------------- ###
+    calculate_cost(span_idx)
     cumulate_costs(span_id_tree, span_idx)
     cumulate_tokens(span_id_tree, span_idx)
     ### --------------------------------------- ###
@@ -1083,7 +1084,7 @@ def parse_inline_trace(
             "trace_id": trace_id,
             "latency": latency,
             "cost": cost,
-            "tokens": tokens,
+            "usage": tokens,
             "spans": spans,
         }
 
@@ -1267,3 +1268,38 @@ def _parse_to_legacy_span(span: SpanDTO) -> CreateSpan:
     )
 
     return legacy_span
+
+
+PAYING_TYPES = [
+    "embedding",
+    "query",
+    "completion",
+    "chat",
+    "rerank",
+]
+
+
+def calculate_cost(span_idx: Dict[str, SpanCreateDTO]):
+    for span in span_idx.values():
+        if span.node.type.name.lower() in PAYING_TYPES and span.meta and span.metrics:
+            try:
+                costs = cost_calculator.cost_per_token(
+                    model=span.meta.get("response.model"),
+                    prompt_tokens=span.metrics.get("unit.tokens.prompt", 0.0),
+                    completion_tokens=span.metrics.get("unit.tokens.completion", 0.0),
+                    call_type=span.node.type.name.lower(),
+                    response_time_ms=span.time.span // 1_000,
+                )
+
+                if not costs:
+                    continue
+
+                prompt_cost, completion_cost = costs
+                total_cost = prompt_cost + completion_cost
+
+                span.metrics["unit.costs.prompt"] = prompt_cost
+                span.metrics["unit.costs.completion"] = completion_cost
+                span.metrics["unit.costs.total"] = total_cost
+
+            except:
+                pass

{agenta-0.25.4a1.dist-info → agenta-0.25.4a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.25.4a1
+Version: 0.25.4a3
 Summary: The SDK for agenta is an open-source LLMOps platform.
 Home-page: https://agenta.ai
 Keywords: LLMOps,LLM,evaluation,prompt engineering
@@ -14,6 +14,7 @@ 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: Topic :: Software Development :: Libraries
 Requires-Dist: cachetools (>=5.3.3,<6.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
@@ -22,6 +23,7 @@ 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)

{agenta-0.25.4a1.dist-info → agenta-0.25.4a3.dist-info}/RECORD

@@ -141,17 +141,17 @@ agenta/sdk/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 agenta/sdk/context/routing.py,sha256=gOoOM88hSjIjzQ3ni68TjUoq7WtwSH3kB07YjCYvW2c,631
 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=iEHHCuMj38UZ49QWlt4j6LSmFNJWq4Um2j37OBTCLzM,35465
+agenta/sdk/decorators/routing.py,sha256=4vJsFwyXUx1cuzILVOzELDfv17QnYTXpIE2NwFnC__I,35427
 agenta/sdk/decorators/tracing.py,sha256=atMLiRpQCFSAVK-rPlN781DUq7gARe0XgJJHBKqBAUc,11657
 agenta/sdk/litellm/__init__.py,sha256=Bpz1gfHQc0MN1yolWcjifLWznv6GjHggvRGQSpxpihM,37
-agenta/sdk/litellm/litellm.py,sha256=klT72xYw3oSvdq5ZHkig2V2oVsqKI3JEHkgLAihQEwc,8235
+agenta/sdk/litellm/litellm.py,sha256=j4WyRTQdxLkvelaPm5BfUbaUxkbQXDhyr3yp9yXo1RQ,8289
 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=0Ld0A4eL6EAWwbhBY0Qp7MLWXXbBsd8EDtbBuwIy1PI,4775
 agenta/sdk/tracing/context.py,sha256=KDQYjRcmbpb6e0xEuX-bAQGhEjwx4H2nwybRPOKCDjo,578
 agenta/sdk/tracing/conventions.py,sha256=YFkKPls77sl5YOXrRjfn4erEjczMXThc7b-rRaVVTuo,722
 agenta/sdk/tracing/exporters.py,sha256=e-SfpN8dKQ0vuBZQTZ6qgIMBhyriOrVeLYJkv-us0Zs,1328
-agenta/sdk/tracing/inline.py,sha256=dtE-1GyEgoC1uiYIWtgUuzsjN10mUB6iQ3SrlT8082w,34605
+agenta/sdk/tracing/inline.py,sha256=o-lRHmcIXVrFLWIj-xeY9LNbkuR8G4IUubwlWVfNC30,35769
 agenta/sdk/tracing/processors.py,sha256=PRQpj8aOmOjvf71M48AtCurIxVFg2ZZWRtJLtlB4xyE,1974
 agenta/sdk/tracing/spans.py,sha256=AnQuuyuCGST6n_He4SF5WdrtMts9JlE8v6rVRdm2rRg,3570
 agenta/sdk/tracing/tracing.py,sha256=5r0whzLzF2bwYKZkUN3QDjq8AketEb-9sM4nqnO9zzM,5168
@@ -179,7 +179,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.25.4a1.dist-info/METADATA,sha256=Ele35Ur00s6c2VEjluz8LFm79r-QO11K7819WuaP0Gg,31646
-agenta-0.25.4a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agenta-0.25.4a1.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.25.4a1.dist-info/RECORD,,
+agenta-0.25.4a3.dist-info/METADATA,sha256=Ve2s3ouTz56d41dEWduIVk06vpAUxFxvq_lqU_0OLSs,31738
+agenta-0.25.4a3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+agenta-0.25.4a3.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.25.4a3.dist-info/RECORD,,

{agenta-0.25.4a1.dist-info → agenta-0.25.4a3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any