agenta 0.27.7a0__py3-none-any.whl → 0.27.7a2__py3-none-any.whl

agenta/client/backend/types/parent_dto.py

@@ -0,0 +1,21 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
+import pydantic
+
+
+class ParentDto(UniversalBaseModel):
+    id: str
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

agenta/client/backend/types/root_dto.py

@@ -0,0 +1,21 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
+import pydantic
+
+
+class RootDto(UniversalBaseModel):
+    id: str
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

agenta/client/backend/types/span_dto.py

@@ -0,0 +1,54 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from __future__ import annotations
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .lifecycle_dto import LifecycleDto
+from .root_dto import RootDto
+from .tree_dto import TreeDto
+from .node_dto import NodeDto
+from .parent_dto import ParentDto
+from .time_dto import TimeDto
+from .status_dto import StatusDto
+from .exception_dto import ExceptionDto
+from .link_dto import LinkDto
+from .o_tel_extra_dto import OTelExtraDto
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+from ..core.pydantic_utilities import update_forward_refs
+
+
+class SpanDto(UniversalBaseModel):
+    lifecycle: typing.Optional[LifecycleDto] = None
+    root: RootDto
+    tree: TreeDto
+    node: NodeDto
+    parent: typing.Optional[ParentDto] = None
+    time: TimeDto
+    status: StatusDto
+    exception: typing.Optional[ExceptionDto] = None
+    data: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    metrics: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    meta: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    refs: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    links: typing.Optional[typing.List[LinkDto]] = None
+    otel: typing.Optional[OTelExtraDto] = None
+    nodes: typing.Optional[
+        typing.Dict[str, typing.Optional["SpanDtoNodesValue"]]
+    ] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow
+
+
+from .span_dto_nodes_value import SpanDtoNodesValue  # noqa: E402
+
+update_forward_refs(SpanDto)

agenta/client/backend/types/span_dto_nodes_value.py

@@ -0,0 +1,9 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from __future__ import annotations
+import typing
+import typing
+
+if typing.TYPE_CHECKING:
+    from .span_dto import SpanDto
+SpanDtoNodesValue = typing.Union["SpanDto", typing.List["SpanDto"]]

agenta/client/backend/types/status_code.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+StatusCode = typing.Union[typing.Literal["UNSET", "OK", "ERROR"], typing.Any]

agenta/client/backend/types/status_dto.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+from .status_code import StatusCode
+import typing
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class StatusDto(UniversalBaseModel):
+    code: StatusCode
+    message: typing.Optional[str] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

agenta/client/backend/types/time_dto.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import datetime as dt
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import typing
+import pydantic
+
+
+class TimeDto(UniversalBaseModel):
+    start: dt.datetime
+    end: dt.datetime
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

agenta/client/backend/types/tree_dto.py

@@ -0,0 +1,23 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from ..core.pydantic_utilities import UniversalBaseModel
+import typing
+from .tree_type import TreeType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+import pydantic
+
+
+class TreeDto(UniversalBaseModel):
+    id: str
+    type: typing.Optional[TreeType] = None
+
+    if IS_PYDANTIC_V2:
+        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+            extra="allow", frozen=True
+        )  # type: ignore # Pydantic v2
+    else:
+
+        class Config:
+            frozen = True
+            smart_union = True
+            extra = pydantic.Extra.allow

agenta/client/backend/types/tree_type.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+TreeType = typing.Literal["invocation"]

agenta/client/backend/variants/client.py

@@ -1104,14 +1104,14 @@ class VariantsClient:
     def configs_delete(
         self,
         *,
-        variant_ref: typing.Optional[ReferenceRequestModel] = OMIT,
+        variant_ref: ReferenceRequestModel,
         application_ref: typing.Optional[ReferenceRequestModel] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> int:
         """
         Parameters
         ----------
-        variant_ref : typing.Optional[ReferenceRequestModel]
+        variant_ref : ReferenceRequestModel
 
         application_ref : typing.Optional[ReferenceRequestModel]
 
@@ -1125,13 +1125,15 @@ class VariantsClient:
 
         Examples
         --------
-        from agenta import AgentaApi
+        from agenta import AgentaApi, ReferenceRequestModel
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
             base_url="https://yourhost.com/path/to/api",
         )
-        client.variants.configs_delete()
+        client.variants.configs_delete(
+            variant_ref=ReferenceRequestModel(),
+        )
         """
         _response = self._client_wrapper.httpx_client.request(
             "variants/configs/delete",
@@ -1244,14 +1246,14 @@ class VariantsClient:
     def configs_history(
         self,
         *,
-        variant_ref: typing.Optional[ReferenceRequestModel] = OMIT,
+        variant_ref: ReferenceRequestModel,
         application_ref: typing.Optional[ReferenceRequestModel] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[ConfigResponseModel]:
         """
         Parameters
         ----------
-        variant_ref : typing.Optional[ReferenceRequestModel]
+        variant_ref : ReferenceRequestModel
 
         application_ref : typing.Optional[ReferenceRequestModel]
 
@@ -1265,13 +1267,15 @@ class VariantsClient:
 
         Examples
         --------
-        from agenta import AgentaApi
+        from agenta import AgentaApi, ReferenceRequestModel
 
         client = AgentaApi(
             api_key="YOUR_API_KEY",
             base_url="https://yourhost.com/path/to/api",
         )
-        client.variants.configs_history()
+        client.variants.configs_history(
+            variant_ref=ReferenceRequestModel(),
+        )
         """
         _response = self._client_wrapper.httpx_client.request(
             "variants/configs/history",
@@ -2504,14 +2508,14 @@ class AsyncVariantsClient:
     async def configs_delete(
         self,
         *,
-        variant_ref: typing.Optional[ReferenceRequestModel] = OMIT,
+        variant_ref: ReferenceRequestModel,
         application_ref: typing.Optional[ReferenceRequestModel] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> int:
         """
         Parameters
         ----------
-        variant_ref : typing.Optional[ReferenceRequestModel]
+        variant_ref : ReferenceRequestModel
 
         application_ref : typing.Optional[ReferenceRequestModel]
 
@@ -2527,7 +2531,7 @@ class AsyncVariantsClient:
         --------
         import asyncio
 
-        from agenta import AsyncAgentaApi
+        from agenta import AsyncAgentaApi, ReferenceRequestModel
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
@@ -2536,7 +2540,9 @@ class AsyncVariantsClient:
 
 
         async def main() -> None:
-            await client.variants.configs_delete()
+            await client.variants.configs_delete(
+                variant_ref=ReferenceRequestModel(),
+            )
 
 
         asyncio.run(main())
@@ -2660,14 +2666,14 @@ class AsyncVariantsClient:
     async def configs_history(
         self,
         *,
-        variant_ref: typing.Optional[ReferenceRequestModel] = OMIT,
+        variant_ref: ReferenceRequestModel,
         application_ref: typing.Optional[ReferenceRequestModel] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.List[ConfigResponseModel]:
         """
         Parameters
         ----------
-        variant_ref : typing.Optional[ReferenceRequestModel]
+        variant_ref : ReferenceRequestModel
 
         application_ref : typing.Optional[ReferenceRequestModel]
 
@@ -2683,7 +2689,7 @@ class AsyncVariantsClient:
         --------
         import asyncio
 
-        from agenta import AsyncAgentaApi
+        from agenta import AsyncAgentaApi, ReferenceRequestModel
 
         client = AsyncAgentaApi(
             api_key="YOUR_API_KEY",
@@ -2692,7 +2698,9 @@ class AsyncVariantsClient:
 
 
         async def main() -> None:
-            await client.variants.configs_history()
+            await client.variants.configs_history(
+                variant_ref=ReferenceRequestModel(),
+            )
 
 
         asyncio.run(main())

agenta/sdk/__init__.py

@@ -17,6 +17,8 @@ from .types import (
     FileInputURL,
     BinaryParam,
     Prompt,
+    AgentaNodeDto,
+    AgentaNodesResponse,
 )
 
 from .tracing import Tracing, get_tracer

agenta/sdk/decorators/routing.py

@@ -389,7 +389,7 @@ class entrypoint:
         log.info(f"Agenta SDK - exiting with success: 200")
         log.info(f"----------------------------------")
 
-        return BaseResponse(data=data, trace=trace)
+        return BaseResponse(data=data, tree=trace)
 
     def handle_failure(self, error: Exception):
         log.error("--------------------------------------------------")

agenta/sdk/tracing/inline.py

@@ -903,9 +903,9 @@ def parse_to_agenta_span_dto(
     if span_dto.data:
         span_dto.data = _unmarshal_attributes(span_dto.data)
 
-        # if "outputs" in span_dto.data:
-        #     if "__default__" in span_dto.data["outputs"]:
-        #         span_dto.data["outputs"] = span_dto.data["outputs"]["__default__"]
+        if "outputs" in span_dto.data:
+            if "__default__" in span_dto.data["outputs"]:
+                span_dto.data["outputs"] = span_dto.data["outputs"]["__default__"]
 
     # METRICS
     if span_dto.metrics:
@@ -934,6 +934,17 @@ def parse_to_agenta_span_dto(
             else:
                 parse_to_agenta_span_dto(v)
 
+    # MASK LINKS FOR NOW
+    span_dto.links = None
+    # ------------------
+
+    # MASK LIFECYCLE FOR NOW
+    # span_dto.lifecycle = None
+    if span_dto.lifecycle:
+        span_dto.lifecycle.updated_at = None
+        span_dto.lifecycle.updated_by_id = None
+    # ----------------------
+
     return span_dto
 
 
@@ -945,6 +956,8 @@ def parse_to_agenta_span_dto(
 from litellm import cost_calculator
 from opentelemetry.sdk.trace import ReadableSpan
 
+from agenta.sdk.types import AgentaNodeDto, AgentaNodesResponse
+
 
 def parse_inline_trace(
     spans: Dict[str, ReadableSpan],
@@ -992,51 +1005,19 @@ def parse_inline_trace(
     ### services.observability.service.query() ###
     ##############################################
 
-    LEGACY = True
-    inline_trace = None
-
-    if LEGACY:
-        legacy_spans = [
-            _parse_to_legacy_span(span_dto) for span_dto in span_idx.values()
-        ]
-
-        root_span = agenta_span_dtos[0]
-
-        trace_id = root_span.root.id.hex
-        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),
-        }
-
-        spans = [
-            loads(span.model_dump_json(exclude_none=True)) for span in legacy_spans
-        ]
-
-        inline_trace = {
-            "trace_id": trace_id,
-            "latency": latency,
-            "cost": cost,
-            "usage": tokens,
-            "spans": spans,
-        }
-
-    else:
-        spans = [
-            loads(span_dto.model_dump_json(exclude_none=True))
-            for span_dto in agenta_span_dtos
-        ]
-
-        inline_trace = spans  # turn into Agenta Model ?
-
+    spans = [
+        loads(
+            span_dto.model_dump_json(
+                exclude_none=True,
+                exclude_defaults=True,
+            )
+        )
+        for span_dto in agenta_span_dtos
+    ]
+    inline_trace = AgentaNodesResponse(
+        version="1.0.0",
+        nodes=[AgentaNodeDto(**span) for span in spans],
+    ).model_dump(exclude_none=True, exclude_unset=True)
     return inline_trace
 
 
@@ -1120,98 +1101,6 @@ class LlmTokens(BaseModel):
     total_tokens: Optional[int] = 0
 
 
-class CreateSpan(BaseModel):
-    id: str
-    app_id: str
-    variant_id: Optional[str] = None
-    variant_name: Optional[str] = None
-    inputs: Optional[Dict[str, Optional[Any]]] = None
-    internals: Optional[Dict[str, Optional[Any]]] = None
-    outputs: Optional[Union[str, Dict[str, Optional[Any]], List[Any]]] = None
-    config: Optional[Dict[str, Optional[Any]]] = None
-    environment: Optional[str] = None
-    tags: Optional[List[str]] = None
-    token_consumption: Optional[int] = None
-    name: str
-    parent_span_id: Optional[str] = None
-    attributes: Optional[Dict[str, Optional[Any]]] = None
-    spankind: str
-    status: str
-    user: Optional[str] = None
-    start_time: datetime
-    end_time: datetime
-    tokens: Optional[LlmTokens] = None
-    cost: Optional[float] = None
-
-
-def _parse_to_legacy_span(span: SpanDTO) -> CreateSpan:
-    attributes = None
-    if span.otel:
-        attributes = span.otel.attributes or {}
-
-        if span.otel.events:
-            for event in span.otel.events:
-                if event.name == "exception":
-                    attributes.update(**event.attributes)
-
-    legacy_span = CreateSpan(
-        id=span.node.id.hex[:24],
-        spankind=span.node.type,
-        name=span.node.name,
-        #
-        status=span.status.code.name,
-        #
-        start_time=span.time.start,
-        end_time=span.time.end,
-        #
-        parent_span_id=span.parent.id.hex[:24] if span.parent else None,
-        #
-        inputs=span.data.get("inputs") if span.data else {},
-        internals=span.data.get("internals") if span.data else {},
-        outputs=span.data.get("outputs") if span.data else {},
-        #
-        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
-        ),
-        #
-        app_id=(
-            span.refs.get("application", {}).get("id", "missing-app-id")
-            if span.refs
-            else "missing-app-id"
-        ),
-        #
-        attributes=attributes,
-        #
-        variant_id=None,
-        variant_name=None,
-        tags=None,
-        token_consumption=None,
-        user=None,
-    )
-
-    return legacy_span
-
-
 TYPES_WITH_COSTS = [
     "embedding",
     "query",

agenta/sdk/types.py

@@ -4,6 +4,9 @@ from typing import Dict, List, Optional, Any, Union
 
 from pydantic import ConfigDict, BaseModel, HttpUrl
 
+from agenta.client.backend.types.agenta_node_dto import AgentaNodeDto
+from agenta.client.backend.types.agenta_nodes_response import AgentaNodesResponse
+
 
 @dataclass
 class MultipleChoice:
@@ -23,9 +26,9 @@ class LLMTokenUsage(BaseModel):
 
 
 class BaseResponse(BaseModel):
-    version: Optional[str] = "2.0"
+    version: Optional[str] = "3.0"
     data: Optional[Union[str, Dict[str, Any]]] = None
-    trace: Optional[Dict[str, Any]] = None
+    tree: Optional[AgentaNodesResponse] = None
 
 
 class DictInput(dict):

{agenta-0.27.7a0.dist-info → agenta-0.27.7a2.dist-info}/METADATA

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