scale-gp-beta 0.1.0a15__py3-none-any.whl → 0.1.0a17__py3-none-any.whl

scale_gp_beta/resources/spans.py

@@ -4,13 +4,19 @@ from __future__ import annotations
 
 from typing import Dict, Union, Iterable
 from datetime import datetime
-from typing_extensions import Literal, overload
+from typing_extensions import Literal
 
 import httpx
 
-from ..types import span_list_params, span_batch_params, span_create_params, span_update_params
+from ..types import (
+    span_batch_params,
+    span_create_params,
+    span_search_params,
+    span_update_params,
+    span_upsert_batch_params,
+)
 from .._types import NOT_GIVEN, Body, Query, Headers, NotGiven
-from .._utils import required_args, maybe_transform, async_maybe_transform
+from .._utils import maybe_transform, async_maybe_transform
 from .._compat import cached_property
 from .._resource import SyncAPIResource, AsyncAPIResource
 from .._response import (
@@ -19,9 +25,11 @@ from .._response import (
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from ..pagination import SyncCursorPage, AsyncCursorPage, SyncAPIListPage, AsyncAPIListPage
 from ..types.span import Span
-from .._base_client import AsyncPaginator, make_request_options
+from .._base_client import make_request_options
+from ..types.span_batch_response import SpanBatchResponse
+from ..types.span_search_response import SpanSearchResponse
+from ..types.span_upsert_batch_response import SpanUpsertBatchResponse
 
 __all__ = ["SpansResource", "AsyncSpansResource"]
 
@@ -46,7 +54,6 @@ class SpansResource(SyncAPIResource):
         """
         return SpansResourceWithStreamingResponse(self)
 
-    @overload
     def create(
         self,
         *,
@@ -54,7 +61,10 @@ class SpansResource(SyncAPIResource):
         start_timestamp: Union[str, datetime],
         trace_id: str,
         id: str | NotGiven = NOT_GIVEN,
+        application_interaction_id: str | NotGiven = NOT_GIVEN,
+        application_variant_id: str | NotGiven = NOT_GIVEN,
         end_timestamp: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        group_id: str | NotGiven = NOT_GIVEN,
         input: Dict[str, object] | NotGiven = NOT_GIVEN,
         metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
         output: Dict[str, object] | NotGiven = NOT_GIVEN,
@@ -104,77 +114,11 @@ class SpansResource(SyncAPIResource):
 
           id: The id of the span
 
-          parent_id: Reference to a parent span_id
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+          application_interaction_id: The optional application interaction ID this span belongs to
 
-          extra_body: Add additional JSON properties to the request
+          application_variant_id: The optional application variant ID this span belongs to
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    def create(
-        self,
-        *,
-        application_interaction_id: str,
-        application_variant_id: str,
-        name: str,
-        start_timestamp: Union[str, datetime],
-        trace_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        end_timestamp: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        input: Dict[str, object] | NotGiven = NOT_GIVEN,
-        metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
-        output: Dict[str, object] | NotGiven = NOT_GIVEN,
-        parent_id: str | NotGiven = NOT_GIVEN,
-        status: Literal["SUCCESS", "ERROR"] | NotGiven = NOT_GIVEN,
-        type: Literal[
-            "TEXT_INPUT",
-            "TEXT_OUTPUT",
-            "COMPLETION_INPUT",
-            "COMPLETION",
-            "KB_RETRIEVAL",
-            "KB_INPUT",
-            "RERANKING",
-            "EXTERNAL_ENDPOINT",
-            "PROMPT_ENGINEERING",
-            "DOCUMENT_INPUT",
-            "MAP_REDUCE",
-            "DOCUMENT_SEARCH",
-            "DOCUMENT_PROMPT",
-            "CUSTOM",
-            "INPUT_GUARDRAIL",
-            "OUTPUT_GUARDRAIL",
-            "CODE_EXECUTION",
-            "DATA_MANIPULATION",
-            "EVALUATION",
-            "FILE_RETRIEVAL",
-            "KB_ADD_CHUNK",
-            "KB_MANAGEMENT",
-            "TRACER",
-            "AGENT_TRACER",
-            "AGENT_WORKFLOW",
-            "STANDALONE",
-        ]
-        | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Span:
-        """
-        Create Span
-
-        Args:
-          trace_id: id for grouping traces together, uuid is recommended
-
-          id: The id of the span
+          group_id: Reference to a group_id
 
           parent_id: Reference to a parent span_id
 
@@ -186,63 +130,6 @@ class SpansResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(
-        ["name", "start_timestamp", "trace_id"],
-        ["application_interaction_id", "application_variant_id", "name", "start_timestamp", "trace_id"],
-    )
-    def create(
-        self,
-        *,
-        name: str,
-        start_timestamp: Union[str, datetime],
-        trace_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        end_timestamp: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        input: Dict[str, object] | NotGiven = NOT_GIVEN,
-        metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
-        output: Dict[str, object] | NotGiven = NOT_GIVEN,
-        parent_id: str | NotGiven = NOT_GIVEN,
-        status: Literal["SUCCESS", "ERROR"] | NotGiven = NOT_GIVEN,
-        type: Literal[
-            "TEXT_INPUT",
-            "TEXT_OUTPUT",
-            "COMPLETION_INPUT",
-            "COMPLETION",
-            "KB_RETRIEVAL",
-            "KB_INPUT",
-            "RERANKING",
-            "EXTERNAL_ENDPOINT",
-            "PROMPT_ENGINEERING",
-            "DOCUMENT_INPUT",
-            "MAP_REDUCE",
-            "DOCUMENT_SEARCH",
-            "DOCUMENT_PROMPT",
-            "CUSTOM",
-            "INPUT_GUARDRAIL",
-            "OUTPUT_GUARDRAIL",
-            "CODE_EXECUTION",
-            "DATA_MANIPULATION",
-            "EVALUATION",
-            "FILE_RETRIEVAL",
-            "KB_ADD_CHUNK",
-            "KB_MANAGEMENT",
-            "TRACER",
-            "AGENT_TRACER",
-            "AGENT_WORKFLOW",
-            "STANDALONE",
-        ]
-        | NotGiven = NOT_GIVEN,
-        application_interaction_id: str | NotGiven = NOT_GIVEN,
-        application_variant_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Span:
         return self._post(
             "/v5/spans",
             body=maybe_transform(
@@ -251,15 +138,16 @@ class SpansResource(SyncAPIResource):
                     "start_timestamp": start_timestamp,
                     "trace_id": trace_id,
                     "id": id,
+                    "application_interaction_id": application_interaction_id,
+                    "application_variant_id": application_variant_id,
                     "end_timestamp": end_timestamp,
+                    "group_id": group_id,
                     "input": input,
                     "metadata": metadata,
                     "output": output,
                     "parent_id": parent_id,
                     "status": status,
                     "type": type,
-                    "application_interaction_id": application_interaction_id,
-                    "application_variant_id": application_variant_id,
                 },
                 span_create_params.SpanCreateParams,
             ),
@@ -350,31 +238,111 @@ class SpansResource(SyncAPIResource):
             cast_to=Span,
         )
 
-    def list(
+    def batch(
+        self,
+        *,
+        items: Iterable[span_batch_params.Item],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> SpanBatchResponse:
+        """
+        Create Spans in Batch
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return self._post(
+            "/v5/spans/batch",
+            body=maybe_transform({"items": items}, span_batch_params.SpanBatchParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SpanBatchResponse,
+        )
+
+    def search(
         self,
         *,
         ending_before: str | NotGiven = NOT_GIVEN,
-        from_ts: int | NotGiven = NOT_GIVEN,
+        from_ts: Union[str, datetime] | NotGiven = NOT_GIVEN,
         limit: int | NotGiven = NOT_GIVEN,
-        parents_only: bool | NotGiven = NOT_GIVEN,
         sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
         starting_after: str | NotGiven = NOT_GIVEN,
-        to_ts: int | NotGiven = NOT_GIVEN,
+        to_ts: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        extra_metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
+        group_id: str | NotGiven = NOT_GIVEN,
+        name: str | NotGiven = NOT_GIVEN,
+        parents_only: bool | NotGiven = NOT_GIVEN,
+        span_id: str | NotGiven = NOT_GIVEN,
+        status: Literal["SUCCESS", "ERROR"] | NotGiven = NOT_GIVEN,
         trace_id: str | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "TEXT_INPUT",
+            "TEXT_OUTPUT",
+            "COMPLETION_INPUT",
+            "COMPLETION",
+            "KB_RETRIEVAL",
+            "KB_INPUT",
+            "RERANKING",
+            "EXTERNAL_ENDPOINT",
+            "PROMPT_ENGINEERING",
+            "DOCUMENT_INPUT",
+            "MAP_REDUCE",
+            "DOCUMENT_SEARCH",
+            "DOCUMENT_PROMPT",
+            "CUSTOM",
+            "INPUT_GUARDRAIL",
+            "OUTPUT_GUARDRAIL",
+            "CODE_EXECUTION",
+            "DATA_MANIPULATION",
+            "EVALUATION",
+            "FILE_RETRIEVAL",
+            "KB_ADD_CHUNK",
+            "KB_MANAGEMENT",
+            "TRACER",
+            "AGENT_TRACER",
+            "AGENT_WORKFLOW",
+            "STANDALONE",
+        ]
+        | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncCursorPage[Span]:
+    ) -> SpanSearchResponse:
         """
-        List Spans
+        Search and list spans
 
         Args:
-          from_ts: The starting (oldest) timestamp window in seconds.
+          from_ts: The starting (oldest) timestamp in ISO format.
 
-          to_ts: The ending (most recent) timestamp in seconds.
+          to_ts: The ending (most recent) timestamp in ISO format.
+
+          extra_metadata: Filter on custom metadata key-value pairs
+
+          group_id: Filter by group ID
+
+          name: Filter by trace/span name
+
+          parents_only: Only fetch spans that are the top-level (ie. have no parent_id)
+
+          span_id: Filter by span ID
+
+          status: Filter on span status
+
+          trace_id: Which trace_id to filter on
 
           extra_headers: Send extra headers
 
@@ -384,9 +352,21 @@ class SpansResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
-            "/v5/spans",
-            page=SyncCursorPage[Span],
+        return self._post(
+            "/v5/spans/search",
+            body=maybe_transform(
+                {
+                    "extra_metadata": extra_metadata,
+                    "group_id": group_id,
+                    "name": name,
+                    "parents_only": parents_only,
+                    "span_id": span_id,
+                    "status": status,
+                    "trace_id": trace_id,
+                    "type": type,
+                },
+                span_search_params.SpanSearchParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -397,31 +377,29 @@ class SpansResource(SyncAPIResource):
                         "ending_before": ending_before,
                         "from_ts": from_ts,
                         "limit": limit,
-                        "parents_only": parents_only,
                         "sort_order": sort_order,
                         "starting_after": starting_after,
                         "to_ts": to_ts,
-                        "trace_id": trace_id,
                     },
-                    span_list_params.SpanListParams,
+                    span_search_params.SpanSearchParams,
                 ),
             ),
-            model=Span,
+            cast_to=SpanSearchResponse,
         )
 
-    def batch(
+    def upsert_batch(
         self,
         *,
-        items: Iterable[span_batch_params.Item],
+        items: Iterable[span_upsert_batch_params.Item],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> SyncAPIListPage[Span]:
+    ) -> SpanUpsertBatchResponse:
         """
-        Create Spans in Batch
+        Upsert Spans in Batch
 
         Args:
           extra_headers: Send extra headers
@@ -432,15 +410,13 @@ class SpansResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
+        return self._put(
             "/v5/spans/batch",
-            page=SyncAPIListPage[Span],
-            body=maybe_transform({"items": items}, span_batch_params.SpanBatchParams),
+            body=maybe_transform({"items": items}, span_upsert_batch_params.SpanUpsertBatchParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=Span,
-            method="post",
+            cast_to=SpanUpsertBatchResponse,
         )
 
 
@@ -464,7 +440,6 @@ class AsyncSpansResource(AsyncAPIResource):
         """
         return AsyncSpansResourceWithStreamingResponse(self)
 
-    @overload
     async def create(
         self,
         *,
@@ -472,7 +447,10 @@ class AsyncSpansResource(AsyncAPIResource):
         start_timestamp: Union[str, datetime],
         trace_id: str,
         id: str | NotGiven = NOT_GIVEN,
+        application_interaction_id: str | NotGiven = NOT_GIVEN,
+        application_variant_id: str | NotGiven = NOT_GIVEN,
         end_timestamp: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        group_id: str | NotGiven = NOT_GIVEN,
         input: Dict[str, object] | NotGiven = NOT_GIVEN,
         metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
         output: Dict[str, object] | NotGiven = NOT_GIVEN,
@@ -522,77 +500,11 @@ class AsyncSpansResource(AsyncAPIResource):
 
           id: The id of the span
 
-          parent_id: Reference to a parent span_id
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
+          application_interaction_id: The optional application interaction ID this span belongs to
 
-          extra_body: Add additional JSON properties to the request
+          application_variant_id: The optional application variant ID this span belongs to
 
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        ...
-
-    @overload
-    async def create(
-        self,
-        *,
-        application_interaction_id: str,
-        application_variant_id: str,
-        name: str,
-        start_timestamp: Union[str, datetime],
-        trace_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        end_timestamp: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        input: Dict[str, object] | NotGiven = NOT_GIVEN,
-        metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
-        output: Dict[str, object] | NotGiven = NOT_GIVEN,
-        parent_id: str | NotGiven = NOT_GIVEN,
-        status: Literal["SUCCESS", "ERROR"] | NotGiven = NOT_GIVEN,
-        type: Literal[
-            "TEXT_INPUT",
-            "TEXT_OUTPUT",
-            "COMPLETION_INPUT",
-            "COMPLETION",
-            "KB_RETRIEVAL",
-            "KB_INPUT",
-            "RERANKING",
-            "EXTERNAL_ENDPOINT",
-            "PROMPT_ENGINEERING",
-            "DOCUMENT_INPUT",
-            "MAP_REDUCE",
-            "DOCUMENT_SEARCH",
-            "DOCUMENT_PROMPT",
-            "CUSTOM",
-            "INPUT_GUARDRAIL",
-            "OUTPUT_GUARDRAIL",
-            "CODE_EXECUTION",
-            "DATA_MANIPULATION",
-            "EVALUATION",
-            "FILE_RETRIEVAL",
-            "KB_ADD_CHUNK",
-            "KB_MANAGEMENT",
-            "TRACER",
-            "AGENT_TRACER",
-            "AGENT_WORKFLOW",
-            "STANDALONE",
-        ]
-        | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Span:
-        """
-        Create Span
-
-        Args:
-          trace_id: id for grouping traces together, uuid is recommended
-
-          id: The id of the span
+          group_id: Reference to a group_id
 
           parent_id: Reference to a parent span_id
 
@@ -604,63 +516,6 @@ class AsyncSpansResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        ...
-
-    @required_args(
-        ["name", "start_timestamp", "trace_id"],
-        ["application_interaction_id", "application_variant_id", "name", "start_timestamp", "trace_id"],
-    )
-    async def create(
-        self,
-        *,
-        name: str,
-        start_timestamp: Union[str, datetime],
-        trace_id: str,
-        id: str | NotGiven = NOT_GIVEN,
-        end_timestamp: Union[str, datetime] | NotGiven = NOT_GIVEN,
-        input: Dict[str, object] | NotGiven = NOT_GIVEN,
-        metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
-        output: Dict[str, object] | NotGiven = NOT_GIVEN,
-        parent_id: str | NotGiven = NOT_GIVEN,
-        status: Literal["SUCCESS", "ERROR"] | NotGiven = NOT_GIVEN,
-        type: Literal[
-            "TEXT_INPUT",
-            "TEXT_OUTPUT",
-            "COMPLETION_INPUT",
-            "COMPLETION",
-            "KB_RETRIEVAL",
-            "KB_INPUT",
-            "RERANKING",
-            "EXTERNAL_ENDPOINT",
-            "PROMPT_ENGINEERING",
-            "DOCUMENT_INPUT",
-            "MAP_REDUCE",
-            "DOCUMENT_SEARCH",
-            "DOCUMENT_PROMPT",
-            "CUSTOM",
-            "INPUT_GUARDRAIL",
-            "OUTPUT_GUARDRAIL",
-            "CODE_EXECUTION",
-            "DATA_MANIPULATION",
-            "EVALUATION",
-            "FILE_RETRIEVAL",
-            "KB_ADD_CHUNK",
-            "KB_MANAGEMENT",
-            "TRACER",
-            "AGENT_TRACER",
-            "AGENT_WORKFLOW",
-            "STANDALONE",
-        ]
-        | NotGiven = NOT_GIVEN,
-        application_interaction_id: str | NotGiven = NOT_GIVEN,
-        application_variant_id: str | NotGiven = NOT_GIVEN,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> Span:
         return await self._post(
             "/v5/spans",
             body=await async_maybe_transform(
@@ -669,15 +524,16 @@ class AsyncSpansResource(AsyncAPIResource):
                     "start_timestamp": start_timestamp,
                     "trace_id": trace_id,
                     "id": id,
+                    "application_interaction_id": application_interaction_id,
+                    "application_variant_id": application_variant_id,
                     "end_timestamp": end_timestamp,
+                    "group_id": group_id,
                     "input": input,
                     "metadata": metadata,
                     "output": output,
                     "parent_id": parent_id,
                     "status": status,
                     "type": type,
-                    "application_interaction_id": application_interaction_id,
-                    "application_variant_id": application_variant_id,
                 },
                 span_create_params.SpanCreateParams,
             ),
@@ -768,31 +624,111 @@ class AsyncSpansResource(AsyncAPIResource):
             cast_to=Span,
         )
 
-    def list(
+    async def batch(
+        self,
+        *,
+        items: Iterable[span_batch_params.Item],
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> SpanBatchResponse:
+        """
+        Create Spans in Batch
+
+        Args:
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        return await self._post(
+            "/v5/spans/batch",
+            body=await async_maybe_transform({"items": items}, span_batch_params.SpanBatchParams),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=SpanBatchResponse,
+        )
+
+    async def search(
         self,
         *,
         ending_before: str | NotGiven = NOT_GIVEN,
-        from_ts: int | NotGiven = NOT_GIVEN,
+        from_ts: Union[str, datetime] | NotGiven = NOT_GIVEN,
         limit: int | NotGiven = NOT_GIVEN,
-        parents_only: bool | NotGiven = NOT_GIVEN,
         sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
         starting_after: str | NotGiven = NOT_GIVEN,
-        to_ts: int | NotGiven = NOT_GIVEN,
+        to_ts: Union[str, datetime] | NotGiven = NOT_GIVEN,
+        extra_metadata: Dict[str, object] | NotGiven = NOT_GIVEN,
+        group_id: str | NotGiven = NOT_GIVEN,
+        name: str | NotGiven = NOT_GIVEN,
+        parents_only: bool | NotGiven = NOT_GIVEN,
+        span_id: str | NotGiven = NOT_GIVEN,
+        status: Literal["SUCCESS", "ERROR"] | NotGiven = NOT_GIVEN,
         trace_id: str | NotGiven = NOT_GIVEN,
+        type: Literal[
+            "TEXT_INPUT",
+            "TEXT_OUTPUT",
+            "COMPLETION_INPUT",
+            "COMPLETION",
+            "KB_RETRIEVAL",
+            "KB_INPUT",
+            "RERANKING",
+            "EXTERNAL_ENDPOINT",
+            "PROMPT_ENGINEERING",
+            "DOCUMENT_INPUT",
+            "MAP_REDUCE",
+            "DOCUMENT_SEARCH",
+            "DOCUMENT_PROMPT",
+            "CUSTOM",
+            "INPUT_GUARDRAIL",
+            "OUTPUT_GUARDRAIL",
+            "CODE_EXECUTION",
+            "DATA_MANIPULATION",
+            "EVALUATION",
+            "FILE_RETRIEVAL",
+            "KB_ADD_CHUNK",
+            "KB_MANAGEMENT",
+            "TRACER",
+            "AGENT_TRACER",
+            "AGENT_WORKFLOW",
+            "STANDALONE",
+        ]
+        | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Span, AsyncCursorPage[Span]]:
+    ) -> SpanSearchResponse:
         """
-        List Spans
+        Search and list spans
 
         Args:
-          from_ts: The starting (oldest) timestamp window in seconds.
+          from_ts: The starting (oldest) timestamp in ISO format.
+
+          to_ts: The ending (most recent) timestamp in ISO format.
+
+          extra_metadata: Filter on custom metadata key-value pairs
 
-          to_ts: The ending (most recent) timestamp in seconds.
+          group_id: Filter by group ID
+
+          name: Filter by trace/span name
+
+          parents_only: Only fetch spans that are the top-level (ie. have no parent_id)
+
+          span_id: Filter by span ID
+
+          status: Filter on span status
+
+          trace_id: Which trace_id to filter on
 
           extra_headers: Send extra headers
 
@@ -802,44 +738,54 @@ class AsyncSpansResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
-            "/v5/spans",
-            page=AsyncCursorPage[Span],
+        return await self._post(
+            "/v5/spans/search",
+            body=await async_maybe_transform(
+                {
+                    "extra_metadata": extra_metadata,
+                    "group_id": group_id,
+                    "name": name,
+                    "parents_only": parents_only,
+                    "span_id": span_id,
+                    "status": status,
+                    "trace_id": trace_id,
+                    "type": type,
+                },
+                span_search_params.SpanSearchParams,
+            ),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=maybe_transform(
+                query=await async_maybe_transform(
                     {
                         "ending_before": ending_before,
                         "from_ts": from_ts,
                         "limit": limit,
-                        "parents_only": parents_only,
                         "sort_order": sort_order,
                         "starting_after": starting_after,
                         "to_ts": to_ts,
-                        "trace_id": trace_id,
                     },
-                    span_list_params.SpanListParams,
+                    span_search_params.SpanSearchParams,
                 ),
             ),
-            model=Span,
+            cast_to=SpanSearchResponse,
         )
 
-    def batch(
+    async def upsert_batch(
         self,
         *,
-        items: Iterable[span_batch_params.Item],
+        items: Iterable[span_upsert_batch_params.Item],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> AsyncPaginator[Span, AsyncAPIListPage[Span]]:
+    ) -> SpanUpsertBatchResponse:
         """
-        Create Spans in Batch
+        Upsert Spans in Batch
 
         Args:
           extra_headers: Send extra headers
@@ -850,15 +796,13 @@ class AsyncSpansResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get_api_list(
+        return await self._put(
             "/v5/spans/batch",
-            page=AsyncAPIListPage[Span],
-            body=maybe_transform({"items": items}, span_batch_params.SpanBatchParams),
+            body=await async_maybe_transform({"items": items}, span_upsert_batch_params.SpanUpsertBatchParams),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            model=Span,
-            method="post",
+            cast_to=SpanUpsertBatchResponse,
         )
 
 
@@ -875,12 +819,15 @@ class SpansResourceWithRawResponse:
         self.update = to_raw_response_wrapper(
             spans.update,
         )
-        self.list = to_raw_response_wrapper(
-            spans.list,
-        )
         self.batch = to_raw_response_wrapper(
             spans.batch,
         )
+        self.search = to_raw_response_wrapper(
+            spans.search,
+        )
+        self.upsert_batch = to_raw_response_wrapper(
+            spans.upsert_batch,
+        )
 
 
 class AsyncSpansResourceWithRawResponse:
@@ -896,12 +843,15 @@ class AsyncSpansResourceWithRawResponse:
         self.update = async_to_raw_response_wrapper(
             spans.update,
         )
-        self.list = async_to_raw_response_wrapper(
-            spans.list,
-        )
         self.batch = async_to_raw_response_wrapper(
             spans.batch,
         )
+        self.search = async_to_raw_response_wrapper(
+            spans.search,
+        )
+        self.upsert_batch = async_to_raw_response_wrapper(
+            spans.upsert_batch,
+        )
 
 
 class SpansResourceWithStreamingResponse:
@@ -917,12 +867,15 @@ class SpansResourceWithStreamingResponse:
         self.update = to_streamed_response_wrapper(
             spans.update,
         )
-        self.list = to_streamed_response_wrapper(
-            spans.list,
-        )
         self.batch = to_streamed_response_wrapper(
             spans.batch,
         )
+        self.search = to_streamed_response_wrapper(
+            spans.search,
+        )
+        self.upsert_batch = to_streamed_response_wrapper(
+            spans.upsert_batch,
+        )
 
 
 class AsyncSpansResourceWithStreamingResponse:
@@ -938,9 +891,12 @@ class AsyncSpansResourceWithStreamingResponse:
         self.update = async_to_streamed_response_wrapper(
             spans.update,
         )
-        self.list = async_to_streamed_response_wrapper(
-            spans.list,
-        )
         self.batch = async_to_streamed_response_wrapper(
             spans.batch,
         )
+        self.search = async_to_streamed_response_wrapper(
+            spans.search,
+        )
+        self.upsert_batch = async_to_streamed_response_wrapper(
+            spans.upsert_batch,
+        )