agenta 0.28.2a1__py3-none-any.whl → 0.28.2a2__py3-none-any.whl

agenta/cli/main.py

@@ -47,9 +47,9 @@ def check_latest_version() -> Union[str, None]:
 
 
 def notify_update(available_version: str):
-    import importlib.metadata
+    import pkg_resources
 
-    installed_version = importlib.metadata.version("agenta")
+    installed_version = pkg_resources.get_distribution("agenta").version
     if available_version > installed_version:
         click.echo(
             click.style(

agenta/sdk/decorators/routing.py

@@ -18,7 +18,6 @@ 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.utils import helpers
 from agenta.sdk.utils.exceptions import suppress
 from agenta.sdk.utils.logging import log
 from agenta.sdk.types import (
@@ -288,9 +287,6 @@ class entrypoint:
         app.openapi_schema = None  # Forces FastAPI to re-generate the schema
         openapi_schema = app.openapi()
 
-        # Inject the current version of the SDK into the openapi_schema
-        openapi_schema["agenta_sdk"] = {"version": helpers.get_current_version()}
-
         for route in entrypoint.routes:
             self.override_schema(
                 openapi_schema=openapi_schema,

agenta/sdk/litellm/litellm.py

@@ -1,3 +1,4 @@
+from typing import Dict
 from opentelemetry.trace import SpanKind
 
 import agenta as ag
@@ -34,7 +35,7 @@ def litellm_handler():
         def __init__(self):
             super().__init__()
 
-            self.span = None
+            self.span: Dict[str, CustomSpan] = dict()
 
         def log_pre_api_call(
             self,
@@ -42,6 +43,12 @@ def litellm_handler():
             messages,
             kwargs,
         ):
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
             type = (  # pylint: disable=redefined-builtin
                 "chat"
                 if kwargs.get("call_type") in ["completion", "acompletion"]
@@ -50,29 +57,31 @@ def litellm_handler():
 
             kind = SpanKind.CLIENT
 
-            self.span = CustomSpan(
+            self.span[litellm_call_id] = CustomSpan(
                 ag.tracer.start_span(name=f"litellm_{kind.name.lower()}", kind=kind)
             )
 
-            self.span.set_attributes(
-                attributes={"node": type},
-                namespace="type",
-            )
+            span = self.span[litellm_call_id]
 
-            if not self.span:
+            if not span:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            if not span.is_recording():
                 log.error("Agenta SDK - litellm span not recording.")
                 return
 
-            self.span.set_attributes(
+            span.set_attributes(
+                attributes={"node": type},
+                namespace="type",
+            )
+
+            span.set_attributes(
                 attributes={"inputs": {"prompt": kwargs["messages"]}},
                 namespace="data",
             )
 
-            self.span.set_attributes(
+            span.set_attributes(
                 attributes={
                     "configuration": {
                         "model": kwargs.get("model"),
@@ -89,11 +98,19 @@ def litellm_handler():
             start_time,
             end_time,
         ):
-            if not self.span:
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
+            span = self.span[litellm_call_id]
+
+            if not span:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            if not span.is_recording():
                 return
 
         def log_success_event(
@@ -106,11 +123,19 @@ def litellm_handler():
             if kwargs.get("stream"):
                 return
 
-            if not self.span:
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            span = self.span[litellm_call_id]
+
+            if not span:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
+            if not span.is_recording():
                 return
 
             try:
@@ -120,7 +145,7 @@ def litellm_handler():
                     result.append(message)
 
                 outputs = {"completion": result}
-                self.span.set_attributes(
+                span.set_attributes(
                     attributes={"outputs": outputs},
                     namespace="data",
                 )
@@ -128,12 +153,12 @@ def litellm_handler():
             except Exception as e:
                 pass
 
-            self.span.set_attributes(
+            span.set_attributes(
                 attributes={"total": kwargs.get("response_cost")},
                 namespace="metrics.unit.costs",
             )
 
-            self.span.set_attributes(
+            span.set_attributes(
                 attributes=(
                     {
                         "prompt": response_obj.usage.prompt_tokens,
@@ -144,9 +169,9 @@ def litellm_handler():
                 namespace="metrics.unit.tokens",
             )
 
-            self.span.set_status(status="OK")
+            span.set_status(status="OK")
 
-            self.span.end()
+            span.end()
 
         def log_failure_event(
             self,
@@ -155,18 +180,26 @@ def litellm_handler():
             start_time,
             end_time,
         ):
-            if not self.span:
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            span = self.span[litellm_call_id]
+
+            if not span:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
+            if not span.is_recording():
                 return
 
-            self.span.record_exception(kwargs["exception"])
+            span.record_exception(kwargs["exception"])
 
-            self.span.set_status(status="ERROR")
+            span.set_status(status="ERROR")
 
-            self.span.end()
+            span.end()
 
         async def async_log_stream_event(
             self,
@@ -175,11 +208,22 @@ def litellm_handler():
             start_time,
             end_time,
         ):
-            if not self.span:
+            if kwargs.get("stream"):
+                return
+
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
+            span = self.span[litellm_call_id]
+
+            if not span:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            if not span.is_recording():
                 return
 
         async def async_log_success_event(
@@ -189,11 +233,19 @@ def litellm_handler():
             start_time,
             end_time,
         ):
-            if not self.span:
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
+            span = self.span[litellm_call_id]
+
+            if not span:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            if not span.is_recording():
                 return
 
             try:
@@ -203,7 +255,7 @@ def litellm_handler():
                     result.append(message)
 
                 outputs = {"completion": result}
-                self.span.set_attributes(
+                span.set_attributes(
                     attributes={"outputs": outputs},
                     namespace="data",
                 )
@@ -211,12 +263,12 @@ def litellm_handler():
             except Exception as e:
                 pass
 
-            self.span.set_attributes(
+            span.set_attributes(
                 attributes={"total": kwargs.get("response_cost")},
                 namespace="metrics.unit.costs",
             )
 
-            self.span.set_attributes(
+            span.set_attributes(
                 attributes=(
                     {
                         "prompt": response_obj.usage.prompt_tokens,
@@ -227,9 +279,9 @@ def litellm_handler():
                 namespace="metrics.unit.tokens",
             )
 
-            self.span.set_status(status="OK")
+            span.set_status(status="OK")
 
-            self.span.end()
+            span.end()
 
         async def async_log_failure_event(
             self,
@@ -238,17 +290,25 @@ def litellm_handler():
             start_time,
             end_time,
         ):
-            if not self.span:
+            litellm_call_id = kwargs.get("litellm_call_id")
+
+            if not litellm_call_id:
+                log.warning("Agenta SDK - litellm tracing failed")
+                return
+
+            span = self.span[litellm_call_id]
+
+            if not span:
                 log.warning("Agenta SDK - litellm tracing failed")
                 return
 
-            if not self.span.is_recording():
+            if not span.is_recording():
                 return
 
-            self.span.record_exception(kwargs["exception"])
+            span.record_exception(kwargs["exception"])
 
-            self.span.set_status(status="ERROR")
+            span.set_status(status="ERROR")
 
-            self.span.end()
+            span.end()
 
     return LitellmHandler()

agenta/sdk/tracing/inline.py

@@ -1143,7 +1143,4 @@ def calculate_costs(span_idx: Dict[str, SpanDTO]):
                 span.metrics["unit.costs.total"] = total_cost
 
             except:  # pylint: disable=bare-except
-                print("Failed to calculate costs:")
-                print(
-                    f"model={model}, prompt_tokens={prompt_tokens}, completion_tokens={completion_tokens}"
-                )
+                pass

agenta/sdk/tracing/processors.py

@@ -43,8 +43,6 @@ class TraceProcessor(BatchSpanProcessor):
         span: Span,
         parent_context: Optional[Context] = None,
     ) -> None:
-        # ADD LINKS FROM CONTEXT, HERE
-
         for key in self.references.keys():
             span.set_attribute(f"ag.refs.{key}", self.references[key])
 

{agenta-0.28.2a1.dist-info → agenta-0.28.2a2.dist-info}/METADATA

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

{agenta-0.28.2a1.dist-info → agenta-0.28.2a2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 agenta/__init__.py,sha256=XXPgAjzPw5CXQpuQbDNpKRuoBL5X_YoobKeebjYHiSY,2101
 agenta/cli/evaluation_commands.py,sha256=fs6492tprPId9p8eGO02Xy-NCBm2RZNJLZWcUxugwd8,474
 agenta/cli/helper.py,sha256=P97HbNb_qzOyl5CM_MjAqWEBCdgebU6M81G_4UCmF1A,6288
-agenta/cli/main.py,sha256=WJSp-kJ6j0bea64l5QJlnOPpLwTgNcN7Am4X2YZBP1A,7939
+agenta/cli/main.py,sha256=drRCn7x9-rP3zcLXEIgAqVWS68g_vXnRyo4N7DGFBW8,7946
 agenta/cli/telemetry.py,sha256=GaFFRsE_NtrcSSJ10r2jhgFs5Sk8gf2C09Ox3gOr3eU,1317
 agenta/cli/variant_commands.py,sha256=HfKRZsajKOXwZD2OyzjSfNtSx1yI01wI1cfqpvoHETI,17400
 agenta/cli/variant_configs.py,sha256=PLiuMKadVzs6Gi2uYaT0pZzyULNHDXaTMDWboqpwWdU,1293
@@ -181,10 +181,10 @@ 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=LN9UJO30rJESnw3yokISKjYHbkiMmycbqa8jonEz5mM,36712
+agenta/sdk/decorators/routing.py,sha256=vsR0fNRBvXnzHC-wjC8PkXlZ0XHw82tMbzhuFAWoqRA,36520
 agenta/sdk/decorators/tracing.py,sha256=vL5e6TVX6TQwO0t9raZwnzXHV3vElVT0pHS1vD-vzEo,8523
 agenta/sdk/litellm/__init__.py,sha256=Bpz1gfHQc0MN1yolWcjifLWznv6GjHggvRGQSpxpihM,37
-agenta/sdk/litellm/litellm.py,sha256=97eDU9MUTW6Wv2e7QYhCWLrRYwhaRqG6LVcedp3qNrk,7186
+agenta/sdk/litellm/litellm.py,sha256=Ke0It-jA1z0KQ2770gIlWIEgramZGmt1k0GjmpEnFV4,8793
 agenta/sdk/managers/__init__.py,sha256=SN-LRwG0pRRDV3u2Q4JiiSTigN3-mYpzGNM35RzT4mc,238
 agenta/sdk/managers/config.py,sha256=AuFfHYOkmilDdcAJt2nlw_WlA3ho4Htjf29FKTZGElM,11716
 agenta/sdk/managers/deployment.py,sha256=SEokjZeh6n7HRKZ92Y0WncdG49hIFx-Z3B3HAl2kmUg,1174
@@ -199,8 +199,8 @@ agenta/sdk/tracing/attributes.py,sha256=zh8JQZSeYCLBeIRSopKJx6QQ-WEgw08Cr64DS_WO
 agenta/sdk/tracing/context.py,sha256=IpNENDGRrXWjs-vti5XheqwybQs0QdD-ii4aK0enNrM,803
 agenta/sdk/tracing/conventions.py,sha256=JBtznBXZ3aRkGKkLl7cPwdMNh3w1G-H2Ta2YrAxbr38,950
 agenta/sdk/tracing/exporters.py,sha256=YvTke0RaxeOLqWOuhC5EFzYwFY39kcoBtDLfcyla3j4,1604
-agenta/sdk/tracing/inline.py,sha256=sYocvSWjuQaun_XaBYNDQyNw4ETS2hFMbFg6g3RCdeg,31463
-agenta/sdk/tracing/processors.py,sha256=tPf3Hx1TmnWSljvX28kYFOFrp4ImIXhlwAaR39sf5qU,2979
+agenta/sdk/tracing/inline.py,sha256=IBdy7AKtHYQ5yDObtAbqEixNAcOkBsw1DmgDTuQXID0,31284
+agenta/sdk/tracing/processors.py,sha256=R4TL8jDV1nx3HgINal82tjNu2rrSBziFfyis8aAL-cI,2939
 agenta/sdk/tracing/spans.py,sha256=nqUOjjirBxB8Eacv8Qj4Ra_6rknGi3lbJdNyKmk5ODQ,3707
 agenta/sdk/tracing/tracing.py,sha256=RUSnQIWwfOFwhWbiyJfgC0wYtvcV1PusXTwNslV5WZo,6912
 agenta/sdk/types.py,sha256=_lGsGSEaZJrUT4cVcT3zSpgEqex2jFaPtfpFeUEetbc,7247
@@ -208,7 +208,6 @@ agenta/sdk/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 agenta/sdk/utils/costs.py,sha256=i8C7ud__pThLS55XkN4YW8czXtGeXr2mx7jjcOFeiXg,5955
 agenta/sdk/utils/exceptions.py,sha256=UPO5aqNkpxevE7I_gW6O2B0FbtqqwgQobp5b6RQy_Ik,2132
 agenta/sdk/utils/globals.py,sha256=2HhyzWn55BbYNCZ3rT8dAxk1GGXuGQPbtq_THjaHbBw,372
-agenta/sdk/utils/helpers.py,sha256=utrxDoELpR6QgFgHCEAWrWW4TYWXA10q72Gs5R78Ens,181
 agenta/sdk/utils/logging.py,sha256=eFzEFuYpggfIhEKv09JZRqcDzkmZ482a_E2G-X0FK7Y,473
 agenta/sdk/utils/preinit.py,sha256=YlJL7RLfel0R7DFp-jK7OV-z4ZIQJM0oupYlk7g8b5o,1278
 agenta/sdk/utils/singleton.py,sha256=17Ph7LGnnV8HkPjImruKita2ni03Ari5jr0jqm__4sc,312
@@ -227,7 +226,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.28.2a1.dist-info/METADATA,sha256=V12g0Avxhkv0NXK0pUDis-62vBAsgAvHUm-7GS704OQ,29044
-agenta-0.28.2a1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-agenta-0.28.2a1.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.28.2a1.dist-info/RECORD,,
+agenta-0.28.2a2.dist-info/METADATA,sha256=69xnz5RPYthrXTLw6r_fmO7sT7BnVGqjrP_GsRZH_L0,29044
+agenta-0.28.2a2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+agenta-0.28.2a2.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.28.2a2.dist-info/RECORD,,

agenta/sdk/utils/helpers.py

@@ -1,8 +0,0 @@
-import importlib.metadata
-
-
-def get_current_version():
-    """Returns the current version of Agenta's SDK."""
-
-    version = importlib.metadata.version("agenta")
-    return version