agenta 0.20.0a3__py3-none-any.whl → 0.20.0a6__py3-none-any.whl

agenta/client/backend/resources/observability/client.py

@@ -772,14 +772,6 @@ class AsyncObservabilityClient:
             ],
         )
         """
-
-        logging.debug("----")
-        logging.debug(
-            urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/", "observability/trace/"
-            ),
-        )
-        logging.debug(self._client_wrapper.get_headers())
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(

agenta/client/backend/types/span.py

@@ -26,7 +26,9 @@ class Span(pydantic.BaseModel):
     spankind: str
     status: SpanStatusCode
     metadata: typing.Dict[str, typing.Any]
+    trace_id: str
     user_id: typing.Optional[str]
+    content: typing.Dict[str, typing.Any]
     children: typing.Optional[typing.List[Span]]
 
     def json(self, **kwargs: typing.Any) -> str:

agenta/sdk/agenta_init.py

@@ -68,12 +68,6 @@ class AgentaSingleton:
             api_key or config.get("api_key") or os.environ.get("AGENTA_API_KEY")
         )
 
-        print(api_key)
-        print(config.get("api_key"))
-        print(os.environ.get("AGENTA_API_KEY"))
-        print(self.api_key)
-        print(os.environ)
-
         if not self.app_id:
             raise ValueError(
                 "App ID must be specified. You can provide it in one of the following ways:\n"

agenta/sdk/decorators/llm_entrypoint.py

@@ -161,7 +161,7 @@ class entrypoint(BaseDecorator):
             entrypoint.routes.append(
                 {
                     "func": func.__name__,
-                    "endpoint": DEFAULT_PATH,
+                    "endpoint": route,
                     "params": {**config_params, **func_signature.parameters},
                 }
             )
@@ -171,7 +171,7 @@ class entrypoint(BaseDecorator):
         entrypoint.routes.append(
             {
                 "func": func.__name__,
-                "endpoint": route[1:].replace("/", "_"),
+                "endpoint": route,
                 "params": {**config_params, **func_signature.parameters},
             }
         )
@@ -331,32 +331,31 @@ class entrypoint(BaseDecorator):
             if isinstance(result, Context):
                 save_context(result)
 
-            DEFAULT_KEY = "message"
+            data = result
 
-            if isinstance(result, Dict):
+            # PATCH : if result is not a dict, make it a dict
+            if not isinstance(result, dict):
                 data = result
-
-                # EVENTUALLY THIS PATCH SHOULD BE REMOVED
-                # PATCH: if message in result then only keep message key/value
-                # DEFAULT_KEY = "message"
-
-                if "message" in result.keys():
-                    data = {DEFAULT_KEY: result["message"]}
-                # END OF PATCH
-
-            elif isinstance(result, str):
-                data = {DEFAULT_KEY: result}
-            elif isinstance(result, int) or isinstance(result, float):
-                data = {DEFAULT_KEY: str(result)}
+            else:
+                # PATCH : if result is a legacy dict, clean it up
+                if (
+                    "message" in result.keys()
+                    and "cost" in result.keys()
+                    and "usage" in result.keys()
+                ):
+                    data = {"message": result["message"]}
+            # END OF PATH
 
             if data is None:
-                warning = (
+                data = (
                     "Function executed successfully, but did return None. \n Are you sure you did not forget to return a value?",
                 )
 
-                data = {"message": warning}
+            response = BaseResponse(data=data, trace=trace)
 
-            return BaseResponse(data=data, trace=trace)
+            logging.debug(response)
+
+            return response
 
         except Exception as e:
             self.handle_exception(e)
@@ -565,7 +564,7 @@ class entrypoint(BaseDecorator):
         print("-> data")
         print(json.dumps(result.data, indent=2))
         print("-> trace")
-        # print(json.dumps(result.trace, indent=2))
+        print(json.dumps(result.trace, indent=2))
 
     def override_schema(
         self, openapi_schema: dict, func: str, endpoint: str, params: dict
@@ -636,6 +635,9 @@ class entrypoint(BaseDecorator):
 
             return param_type
 
+        # Goes from '/some/path' to 'some_path'
+        endpoint = endpoint[1:].replace("/", "_")
+
         schema_to_override = openapi_schema["components"]["schemas"][
             f"Body_{func}_{endpoint}_post"
         ]["properties"]

agenta/sdk/decorators/tracing.py

@@ -65,19 +65,24 @@ class instrument(BaseDecorator):
                 ):
                     result = await func(*args, **kwargs)
 
-                    outputs = result
+                    TRACE_DEFAULT_KEY = "__default__"
 
-                    # EVENTUALLY THIS PATCH SHOULD BE REMOVED
-                    # PATCH : if result is not a dict, make it a dict, in span
-                    DEFAULT_KEY = "default"
+                    outputs = result
 
+                    # PATCH : if result is not a dict, make it a dict
                     if not isinstance(result, dict):
-                        value = result
-
-                        if result.__class__.__module__ != "__builtin__":
-                            value = repr(value)
-
-                        outputs = {DEFAULT_KEY: result}
+                        outputs = {TRACE_DEFAULT_KEY: result}
+                    else:
+                        # PATCH : if result is a legacy dict, clean it up
+                        if (
+                            "message" in result.keys()
+                            and "cost" in result.keys()
+                            and "usage" in result.keys()
+                        ):
+                            outputs = {"message": result["message"]}
+
+                            ag.tracing.store_cost(result["cost"])
+                            ag.tracing.store_usage(result["usage"])
                     # END OF PATH
 
                     ag.tracing.store_outputs(outputs)
@@ -97,19 +102,24 @@ class instrument(BaseDecorator):
                 ):
                     result = func(*args, **kwargs)
 
-                    outputs = result
+                    TRACE_DEFAULT_KEY = "__default__"
 
-                    # EVENTUALLY THIS PATCH SHOULD BE REMOVED
-                    # PATCH : if result is not a dict, make it a dict, in span
-                    DEFAULT_KEY = "default"
+                    outputs = result
 
+                    # PATCH : if result is not a dict, make it a dict
                     if not isinstance(result, dict):
-                        value = result
-
-                        if result.__class__.__module__ != "__builtin__":
-                            value = repr(value)
-
-                        outputs = {DEFAULT_KEY: result}
+                        outputs = {TRACE_DEFAULT_KEY: result}
+                    else:
+                        # PATCH : if result is a legacy dict, clean it up
+                        if (
+                            "message" in result.keys()
+                            and "cost" in result.keys()
+                            and "usage" in result.keys()
+                        ):
+                            outputs = {"message": result["message"]}
+
+                            ag.tracing.store_cost(result["cost"])
+                            ag.tracing.store_usage(result["usage"])
                     # END OF PATH
 
                     ag.tracing.store_outputs(outputs)

agenta/sdk/tracing/callbacks.py

@@ -59,51 +59,30 @@ def litellm_handler():
             )
 
         @debug()
-        def log_stream_event(self, kwargs, response_obj, start_time, end_time):
+        def log_stream_event(self, kwargs, res: ModelResponse, start_time, end_time):
             ag.tracing.set_status(status="OK", span_id=self.span.id)
+            ag.tracing.store_cost(kwargs.get("response_cost"))
+            ag.tracing.store_usage(res.usage.dict() if hasattr(res, "usage") else None)
             ag.tracing.store_outputs(
-                outputs={
-                    "message": kwargs.get(
-                        "complete_streaming_response"
-                    ),  # the complete streamed response (only set if `completion(..stream=True)`)
-                    "usage": (
-                        response_obj.usage.dict()
-                        if hasattr(response_obj, "usage")
-                        else None
-                    ),  # litellm calculates usage
-                    "cost": kwargs.get(
-                        "response_cost"
-                    ),  # litellm calculates response cost
-                },
+                # the complete streamed response (only set if `completion(..stream=True)`
+                outputs={"message": kwargs.get("complete_streaming_response")},
                 span_id=self.span.id,
             )
             ag.tracing.close_span(span_id=self.span.id)
 
         @debug()
-        def log_success_event(
-            self, kwargs, response_obj: ModelResponse, start_time, end_time
-        ):
+        def log_success_event(self, kwargs, res: ModelResponse, start_time, end_time):
             ag.tracing.set_status(status="OK", span_id=self.span.id)
+            ag.tracing.store_cost(kwargs.get("response_cost"))
+            ag.tracing.store_usage(res.usage.dict() if hasattr(res, "usage") else None)
             ag.tracing.store_outputs(
-                outputs={
-                    "message": response_obj.choices[0].message.content,
-                    "usage": (
-                        response_obj.usage.dict()
-                        if hasattr(response_obj, "usage")
-                        else None
-                    ),  # litellm calculates usage
-                    "cost": kwargs.get(
-                        "response_cost"
-                    ),  # litellm calculates response cost
-                },
+                outputs={"message": res.choices[0].message.content},
                 span_id=self.span.id,
             )
             ag.tracing.close_span(span_id=self.span.id)
 
         @debug()
-        def log_failure_event(
-            self, kwargs, response_obj: ModelResponse, start_time, end_time
-        ):
+        def log_failure_event(self, kwargs, res: ModelResponse, start_time, end_time):
             ag.tracing.set_status(status="ERROR", span_id=self.span.id)
             ag.tracing.set_attributes(
                 {
@@ -116,69 +95,45 @@ def litellm_handler():
                 },
                 span_id=self.span.id,
             )
+            ag.tracing.store_cost(kwargs.get("response_cost"))
+            ag.tracing.store_usage(res.usage.dict() if hasattr(res, "usage") else None)
             ag.tracing.store_outputs(
-                outputs={
-                    "message": repr(kwargs["exception"]),  # the Exception raised
-                    "usage": (
-                        response_obj.usage.dict()
-                        if hasattr(response_obj, "usage")
-                        else None
-                    ),  # litellm calculates usage
-                    "cost": kwargs.get(
-                        "response_cost"
-                    ),  # litellm calculates response cost
-                },
+                # the Exception raised
+                outputs={"message": repr(kwargs["exception"])},
                 span_id=self.span.id,
             )
             ag.tracing.close_span(span_id=self.span.id)
 
         @debug()
         async def async_log_stream_event(
-            self, kwargs, response_obj, start_time, end_time
+            self, kwargs, res: ModelResponse, start_time, end_time
         ):
             ag.tracing.set_status(status="OK", span_id=self.span.id)
+            ag.tracing.store_cost(kwargs.get("response_cost"))
+            ag.tracing.store_usage(res.usage.dict() if hasattr(res, "usage") else None)
             ag.tracing.store_outputs(
-                outputs={
-                    "message": kwargs.get(
-                        "complete_streaming_response"
-                    ),  # the complete streamed response (only set if `completion(..stream=True)`)
-                    "usage": (
-                        response_obj.usage.dict()
-                        if hasattr(response_obj, "usage")
-                        else None
-                    ),  # litellm calculates usage
-                    "cost": kwargs.get(
-                        "response_cost"
-                    ),  # litellm calculates response cost
-                },
+                # the complete streamed response (only set if `completion(..stream=True)`)
+                outputs={"message": kwargs.get("complete_streaming_response")},
                 span_id=self.span.id,
             )
             ag.tracing.close_span(span_id=self.span.id)
 
         @debug()
         async def async_log_success_event(
-            self, kwargs, response_obj, start_time, end_time
+            self, kwargs, res: ModelResponse, start_time, end_time
         ):
             ag.tracing.set_status(status="OK", span_id=self.span.id)
+            ag.tracing.store_cost(kwargs.get("response_cost"))
+            ag.tracing.store_usage(res.usage.dict() if hasattr(res, "usage") else None)
             ag.tracing.store_outputs(
-                outputs={
-                    "message": response_obj.choices[0].message.content,
-                    "usage": (
-                        response_obj.usage.dict()
-                        if hasattr(response_obj, "usage")
-                        else None
-                    ),  # litellm calculates usage
-                    "cost": kwargs.get(
-                        "response_cost"
-                    ),  # litellm calculates response cost
-                },
+                outputs={"message": res.choices[0].message.content},
                 span_id=self.span.id,
             )
             ag.tracing.close_span(span_id=self.span.id)
 
         @debug()
         async def async_log_failure_event(
-            self, kwargs, response_obj, start_time, end_time
+            self, kwargs, res: ModelResponse, start_time, end_time
         ):
             ag.tracing.set_status(status="ERROR", span_id=self.span.id)
             ag.tracing.set_attributes(
@@ -192,18 +147,11 @@ def litellm_handler():
                 },
                 span_id=self.span.id,
             )
+            ag.tracing.store_cost(kwargs.get("response_cost"))
+            ag.tracing.store_usage(res.usage.dict() if hasattr(res, "usage") else None)
             ag.tracing.store_outputs(
-                outputs={
-                    "message": repr(kwargs["exception"]),  # the Exception raised
-                    "usage": (
-                        response_obj.usage.dict()
-                        if hasattr(response_obj, "usage")
-                        else None
-                    ),  # litellm calculates usage
-                    "cost": kwargs.get(
-                        "response_cost"
-                    ),  # litellm calculates response cost
-                },
+                # the Exception raised
+                outputs={"message": repr(kwargs["exception"])},
                 span_id=self.span.id,
             )
             ag.tracing.close_span(span_id=self.span.id)

agenta/sdk/tracing/llm_tracing.py

@@ -414,6 +414,30 @@ class Tracing(metaclass=SingletonMeta):
 
         span.outputs = outputs
 
+    @debug()
+    def store_cost(self, cost: float = 0.0, span_id: Optional[str] = None) -> None:
+        """
+        ...
+        """
+        span = self._get_target_span(span_id)
+
+        logging.info(f"Setting span  {span.id} {span.spankind.upper()} cost={cost}")
+
+        self._update_span_cost(span, cost)
+
+    @debug()
+    def store_usage(self, tokens: dict = {}, span_id: Optional[str] = None) -> None:
+        """
+        ...
+        """
+        span = self._get_target_span(span_id)
+
+        logging.info(
+            f"Setting span  {span.id} {span.spankind.upper()} tokens={repr(tokens)}"
+        )
+
+        self._update_span_tokens(span, tokens)
+
     @debug()
     def dump_trace(self):
         """

agenta/sdk/types.py

@@ -1,5 +1,5 @@
 import json
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Optional, Any, Union
 
 from pydantic import ConfigDict, BaseModel, HttpUrl
 
@@ -18,7 +18,7 @@ class LLMTokenUsage(BaseModel):
 
 class BaseResponse(BaseModel):
     version: Optional[str] = "2.0"
-    data: Optional[Dict[str, Any]]
+    data: Optional[Union[str, Dict[str, Any]]]
     trace: Optional[Dict[str, Any]]
 
 

{agenta-0.20.0a3.dist-info → agenta-0.20.0a6.dist-info}/METADATA

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

{agenta-0.20.0a3.dist-info → agenta-0.20.0a6.dist-info}/RECORD

@@ -37,7 +37,7 @@ agenta/client/backend/resources/evaluations/client.py,sha256=T8ETcdUdAMzSA3TGu-C
 agenta/client/backend/resources/evaluators/__init__.py,sha256=9mUnTDeA1TxYvkj1l01A1prqsJV0ERRY2tzkY1fA4MQ,64
 agenta/client/backend/resources/evaluators/client.py,sha256=xaafddTNiiPpcxbiUFqimaN3tE6fiemYNOpt1wRLci0,21753
 agenta/client/backend/resources/observability/__init__.py,sha256=9mUnTDeA1TxYvkj1l01A1prqsJV0ERRY2tzkY1fA4MQ,64
-agenta/client/backend/resources/observability/client.py,sha256=4kTC18reOl0SBdHP7iVLunVPyqOsXq2FFWZYLe5mbU0,43239
+agenta/client/backend/resources/observability/client.py,sha256=sQuDHooWEFbTAnejYKK1tjFwcSMwH9cSrytvecH_9Rw,42986
 agenta/client/backend/resources/testsets/__init__.py,sha256=9mUnTDeA1TxYvkj1l01A1prqsJV0ERRY2tzkY1fA4MQ,64
 agenta/client/backend/resources/testsets/client.py,sha256=jVRwbUAPPgXoApClHjoDQNeVQTxZWq4c7-CT1YZ7DRA,25010
 agenta/client/backend/resources/variants/__init__.py,sha256=BMR4SvsrqXC9FU8nPVzY8M9xGrBEhEGrmbgvy3iM1aE,171
@@ -94,7 +94,7 @@ agenta/client/backend/types/permission.py,sha256=MwGwNvKhH8W4I0uJZG_mUydJgwE5CF1
 agenta/client/backend/types/result.py,sha256=XEUcohx29Rl8P9KfnygbdbeNcgvPgO6WOZv9bebCVsg,1055
 agenta/client/backend/types/score.py,sha256=OAur_nJtRQmpboZfzFi2l1-zmNxFfETcl13C7OAvpMw,111
 agenta/client/backend/types/simple_evaluation_output.py,sha256=gRLOCps1hhXPgioADjD2DfabNJf9WgmmhPI6lJY00q4,1117
-agenta/client/backend/types/span.py,sha256=-TrMb3pnTjcbEeD4NA3STGl6V-VyXQ4de7VOjrjwxf4,1450
+agenta/client/backend/types/span.py,sha256=hHn5kCD-4iNdGhJTa2HoKWcuBFTInHFqshneOg1D9CY,1510
 agenta/client/backend/types/span_detail.py,sha256=6x0qsMdFRDRvBQuLo7kdHyoR_vqFtxiVYWvKo4FZLYQ,1514
 agenta/client/backend/types/span_kind.py,sha256=3i1C1U-NzDgFpgw8QL0c7CwHHhejCUpSmq5FD1YHiJI,1324
 agenta/client/backend/types/span_status_code.py,sha256=uxcUEsPLQa2r2eIgYw8LRmMj5GQaE98UnL1JgUsdyuM,643
@@ -127,21 +127,21 @@ agenta/docker/docker-assets/lambda_function.py,sha256=h4UZSSfqwpfsCgERv6frqwm_4J
 agenta/docker/docker-assets/main.py,sha256=7MI-21n81U7N7A0GxebNi0cmGWtJKcR2sPB6FcH2QfA,251
 agenta/docker/docker_utils.py,sha256=5uHMCzXkCvIsDdEiwbnnn97KkzsFbBvyMwogCsv_Z5U,3509
 agenta/sdk/__init__.py,sha256=ewYNjm6AHlqkIrPfX2D_pXZMwShOdhEUcWXb7xGA2bk,769
-agenta/sdk/agenta_init.py,sha256=WXsT266BLSr7LeNoYPEmDLNj8qoxPsggge-dto7f_9w,9953
+agenta/sdk/agenta_init.py,sha256=8MfDuypxohd0qRTdtGjX7L17KW-1UGmzNVdiqF15_ak,9790
 agenta/sdk/client.py,sha256=trKyBOYFZRk0v5Eptxvh87yPf50Y9CqY6Qgv4Fy-VH4,2142
 agenta/sdk/context.py,sha256=q-PxL05-I84puunUAs9LGsffEXcYhDxhQxjuOz2vK90,901
 agenta/sdk/decorators/base.py,sha256=9aNdX5h8a2mFweuhdO-BQPwXGKY9ONPIdLRhSGAGMfY,217
-agenta/sdk/decorators/llm_entrypoint.py,sha256=-oVl2sBH8tIjFD_6q6l0LmEPrPlfRT9Iy8KqEYxJvwk,28099
-agenta/sdk/decorators/tracing.py,sha256=jjHD6VY5YSSHLfC3C2Xl7-6psBq8ycczMB0kj1rYwl4,3749
+agenta/sdk/decorators/llm_entrypoint.py,sha256=eqULCHRjWGCL3fRHdi57jj6FYRyJbyG-F2Yc89OljRI,28069
+agenta/sdk/decorators/tracing.py,sha256=TwzhG3ZoyvmS1hCy3Z4S_6ZJGu1J_WHHgZm8Lc9Vkes,4371
 agenta/sdk/router.py,sha256=0sbajvn5C7t18anH6yNo7-oYxldHnYfwcbmQnIXBePw,269
 agenta/sdk/tracing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agenta/sdk/tracing/callbacks.py,sha256=xWP3RRtmj3ogXeqYI6zdj6gF5QGu70UlQ17WNwdXIx8,8063
+agenta/sdk/tracing/callbacks.py,sha256=jaxTH7TIAzwechvo1lc4R1daKo938Us5mjW4a1ZIjgQ,6468
 agenta/sdk/tracing/context_manager.py,sha256=HskDaiORoOhjeN375gm05wYnieQzh5UnoIsnSAHkAyc,252
-agenta/sdk/tracing/llm_tracing.py,sha256=A7_-Xx3Rioh_nfT7OjZvDPbKUvxEqruKhYRfdGwyo4w,17312
+agenta/sdk/tracing/llm_tracing.py,sha256=2rDNCfZ4i3Y8Rqrt4-QgnnWvp8CcLPEztVMTXviSgbk,17969
 agenta/sdk/tracing/logger.py,sha256=GfH7V-jBHcn7h5dbdrnkDMe_ml3wkXFBeoQiqR4KVRc,474
 agenta/sdk/tracing/tasks_manager.py,sha256=FBSFOWIKBycyA4ShB2ZVMzrzYQ8pWGWWBClFX8nlZFA,3726
 agenta/sdk/tracing/tracing_context.py,sha256=nt3ewa-TK9BRJviGIZYazsAQUiG4daWxjtsbjeaDprs,789
-agenta/sdk/types.py,sha256=1rVy8ob-rTOrIFcSSseXrt0JQtqqhlJfVgVxCB2ErCk,5754
+agenta/sdk/types.py,sha256=DSsKtoYh1ka_ketfkN10F0v8Oe2O4BB0WfnTkdIEyxE,5773
 agenta/sdk/utils/debug.py,sha256=QyuPsSoN0425UD13x_msPxSF_VT6YwHiQunZUibI-jg,2149
 agenta/sdk/utils/globals.py,sha256=JmhJcCOSbwvjQ6GDyUc2_SYR27DZk7YcrRH80ktHHOM,435
 agenta/sdk/utils/helper/openai_cost.py,sha256=1VkgvucDnNZm1pTfcVLz9icWunntp1d7zwMmnviy3Uw,5877
@@ -161,7 +161,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.20.0a3.dist-info/METADATA,sha256=ejs-P0QRRYTn33Pukab6fxUj8olSqlXVYy0kdsBsTRk,26462
-agenta-0.20.0a3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agenta-0.20.0a3.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.20.0a3.dist-info/RECORD,,
+agenta-0.20.0a6.dist-info/METADATA,sha256=jBR7yXq32FFCBphVVKQeGXHMoxWptrqIRfPq5oiL5Zg,26462
+agenta-0.20.0a6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agenta-0.20.0a6.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.20.0a6.dist-info/RECORD,,