agenta 0.20.0a1__py3-none-any.whl → 0.20.0a4__py3-none-any.whl

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

@@ -17,6 +17,9 @@ from ...types.span_detail import SpanDetail
 from ...types.trace_detail import TraceDetail
 from ...types.with_pagination import WithPagination
 
+from agenta.sdk.tracing.logger import llm_logger as logging
+
+
 try:
     import pydantic.v1 as pydantic  # type: ignore
 except ImportError:

agenta/client/backend/types/span.py

@@ -23,7 +23,7 @@ class Span(pydantic.BaseModel):
     created_at: dt.datetime
     variant: SpanVariant
     environment: typing.Optional[str]
-    spankind: SpanKind
+    spankind: str
     status: SpanStatusCode
     metadata: typing.Dict[str, typing.Any]
     user_id: typing.Optional[str]

agenta/client/backend/types/span_detail.py

@@ -22,7 +22,7 @@ class SpanDetail(pydantic.BaseModel):
     created_at: dt.datetime
     variant: SpanVariant
     environment: typing.Optional[str]
-    spankind: SpanKind
+    spankind: str
     status: SpanStatusCode
     metadata: typing.Dict[str, typing.Any]
     user_id: typing.Optional[str]

agenta/client/backend/types/trace_detail.py

@@ -22,7 +22,7 @@ class TraceDetail(pydantic.BaseModel):
     created_at: dt.datetime
     variant: SpanVariant
     environment: typing.Optional[str]
-    spankind: SpanKind
+    spankind: str
     status: SpanStatusCode
     metadata: typing.Dict[str, typing.Any]
     user_id: typing.Optional[str]

agenta/sdk/decorators/llm_entrypoint.py

@@ -141,7 +141,11 @@ class entrypoint(BaseDecorator):
             )
 
             entrypoint_result = await self.execute_function(
-                func, *args, params=func_params, config_params=config_params
+                func,
+                True,  # inline trace: True
+                *args,
+                params=func_params,
+                config_params=config_params,
             )
 
             return entrypoint_result
@@ -157,7 +161,7 @@ class entrypoint(BaseDecorator):
             entrypoint.routes.append(
                 {
                     "func": func.__name__,
-                    "endpoint": DEFAULT_PATH,
+                    "endpoint": route,
                     "params": {**config_params, **func_signature.parameters},
                 }
             )
@@ -167,7 +171,7 @@ class entrypoint(BaseDecorator):
         entrypoint.routes.append(
             {
                 "func": func.__name__,
-                "endpoint": route[1:].replace("/", "_"),
+                "endpoint": route,
                 "params": {**config_params, **func_signature.parameters},
             }
         )
@@ -194,7 +198,11 @@ class entrypoint(BaseDecorator):
             )
 
             entrypoint_result = await self.execute_function(
-                func, *args, params=func_params, config_params=config_params
+                func,
+                False,  # inline trace: False
+                *args,
+                params=func_params,
+                config_params=config_params,
             )
 
             return entrypoint_result
@@ -205,7 +213,7 @@ class entrypoint(BaseDecorator):
             ingestible_files,
         )
 
-        if route_path == "/":
+        if route_path == "":
             route_deployed = f"/{DEFAULT_PATH}_deployed"
             app.post(route_deployed, response_model=BaseResponse)(wrapper_deployed)
 
@@ -226,6 +234,8 @@ class entrypoint(BaseDecorator):
             )
         ### ---------------------- #
 
+        print(entrypoint.routes)
+
         if self.is_main_script(func) and route_path == "":
             self.handle_terminal_run(
                 func,
@@ -272,7 +282,9 @@ class entrypoint(BaseDecorator):
             if name in func_params and func_params[name] is not None:
                 func_params[name] = self.ingest_file(func_params[name])
 
-    async def execute_function(self, func: Callable[..., Any], *args, **func_params):
+    async def execute_function(
+        self, func: Callable[..., Any], inline_trace, *args, **func_params
+    ):
         """Execute the function and handle any exceptions."""
 
         try:
@@ -309,18 +321,33 @@ class entrypoint(BaseDecorator):
                         remaining_steps -= 1
 
                 trace = ag.tracing.dump_trace()
+
+                if not inline_trace:
+                    trace = {"trace_id": trace["trace_id"]}
+
                 ag.tracing.flush_spans()
                 tracing_context.reset(token)
 
             if isinstance(result, Context):
                 save_context(result)
 
+            DEFAULT_KEY = "message"
+
             if 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 = {"message": result}
+                data = {DEFAULT_KEY: result}
             elif isinstance(result, int) or isinstance(result, float):
-                data = {"message": str(result)}
+                data = {DEFAULT_KEY: str(result)}
 
             if data is None:
                 warning = (
@@ -528,6 +555,7 @@ class entrypoint(BaseDecorator):
         result = loop.run_until_complete(
             self.execute_function(
                 func,
+                True,  # inline trace: True
                 **{"params": args_func_params, "config_params": args_config_params},
             )
         )
@@ -608,9 +636,13 @@ 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"]
+
         for param_name, param_val in params.items():
             if isinstance(param_val, GroupedMultipleChoiceParam):
                 subschema = find_in_schema(

agenta/sdk/decorators/tracing.py

@@ -65,7 +65,22 @@ class instrument(BaseDecorator):
                 ):
                     result = await func(*args, **kwargs)
 
-                    ag.tracing.store_outputs(result)
+                    outputs = result
+
+                    # EVENTUALLY THIS PATCH SHOULD BE REMOVED
+                    # PATCH : if result is not a dict, make it a dict, in span
+                    DEFAULT_KEY = "message"
+
+                    if not isinstance(result, dict):
+                        value = result
+
+                        if result.__class__.__module__ != "__builtin__":
+                            value = repr(value)
+
+                        outputs = {DEFAULT_KEY: result}
+                    # END OF PATH
+
+                    ag.tracing.store_outputs(outputs)
 
                     return result
 
@@ -82,7 +97,22 @@ class instrument(BaseDecorator):
                 ):
                     result = func(*args, **kwargs)
 
-                    ag.tracing.store_outputs(result)
+                    outputs = result
+
+                    # EVENTUALLY THIS PATCH SHOULD BE REMOVED
+                    # PATCH : if result is not a dict, make it a dict, in span
+                    DEFAULT_KEY = "message"
+
+                    if not isinstance(result, dict):
+                        value = result
+
+                        if result.__class__.__module__ != "__builtin__":
+                            value = repr(value)
+
+                        outputs = {DEFAULT_KEY: result}
+                    # END OF PATH
+
+                    ag.tracing.store_outputs(outputs)
 
                     return result
 

{agenta-0.20.0a1.dist-info → agenta-0.20.0a4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agenta
-Version: 0.20.0a1
+Version: 0.20.0a4
 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.0a1.dist-info → agenta-0.20.0a4.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=KK1eQLnk0nVmg4uihkEdowkzWIzIwWmvedkq4IsOIMY,42924
+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,8 +94,8 @@ 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=qcxUudmxyTRcsr6S-5nd9NUehJQHrqKFw6MrMnXHVl0,1455
-agenta/client/backend/types/span_detail.py,sha256=_DkGyFpLWjG-sTnBNy0wpp--GxDKaUwIzSJdSEnYNZo,1519
+agenta/client/backend/types/span.py,sha256=-TrMb3pnTjcbEeD4NA3STGl6V-VyXQ4de7VOjrjwxf4,1450
+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
 agenta/client/backend/types/span_variant.py,sha256=BQIrSv4zCNeUSLK5ad3l3BHoc856jXc-v9yd2oTwOkk,1008
@@ -103,7 +103,7 @@ agenta/client/backend/types/template.py,sha256=mInivp-YnXqt28mWM9y4zqNezOfvUEPcm
 agenta/client/backend/types/template_image_info.py,sha256=BycGLw_7XHl9GWOBpu1eu3I_fSQ3n5UVFQdzC0cQ_v8,1189
 agenta/client/backend/types/test_set_output_response.py,sha256=T1HtKP3y2z5UOvqR4_rpUadr7zfGQUxzXAhXBrsBWCg,1088
 agenta/client/backend/types/test_set_simple_response.py,sha256=YI4tRQodB7-5PsIt4RVb8JwJ16vvsFXo7ed_0iHCoOM,1004
-agenta/client/backend/types/trace_detail.py,sha256=LWFTt32J33y1oVJnGyJnzG2DwhFF7ssnPXOm87qK-QY,1503
+agenta/client/backend/types/trace_detail.py,sha256=BCx_GZqus6n5Zl2ZsHMFllXpogh2UUH47NpM23SeFxc,1498
 agenta/client/backend/types/uri.py,sha256=dfnTFYdnqiqBzwKItet51L-UMuyd8hkdTw9g4aGrOjM,953
 agenta/client/backend/types/validation_error.py,sha256=KiHcCQ9smOvyaCnwh9EqD-EfiR24wrczv6p-VDS9p5I,1086
 agenta/client/backend/types/validation_error_loc_item.py,sha256=LAtjCHIllWRBFXvAZ5QZpp7CPXjdtN9EB7HrLVo6EP0,128
@@ -131,8 +131,8 @@ agenta/sdk/agenta_init.py,sha256=8MfDuypxohd0qRTdtGjX7L17KW-1UGmzNVdiqF15_ak,979
 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=ukdw3jyKarkXHKNaQyQmzVnJsYCntzmgoAFccvCZQnA,27343
-agenta/sdk/decorators/tracing.py,sha256=BzXa_2b2VvbO5ZNTh126OkL3LFq8dMK-QFug8BHUBKA,2687
+agenta/sdk/decorators/llm_entrypoint.py,sha256=oZ_CWrysQ9KzT1oSh7ENpZ0TC_jRZWQ7Of3shqb_R6Q,28167
+agenta/sdk/decorators/tracing.py,sha256=cMclr5uVN7isTW7MpF9E572B27mo6JUpUbVv-QO0nas,3749
 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
@@ -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.0a1.dist-info/METADATA,sha256=s33kh03kzj-9YuQZipN4uhW57Tyhoj9O5g-g70w_aCY,26462
-agenta-0.20.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-agenta-0.20.0a1.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
-agenta-0.20.0a1.dist-info/RECORD,,
+agenta-0.20.0a4.dist-info/METADATA,sha256=ZPKFul4FOqz3eLRdLr1H8UtQoKnlj6QOngWuxcYmGC0,26462
+agenta-0.20.0a4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+agenta-0.20.0a4.dist-info/entry_points.txt,sha256=PDiu8_8AsL7ibU9v4iNoOKR1S7F2rdxjlEprjM9QOgo,46
+agenta-0.20.0a4.dist-info/RECORD,,