opik 1.6.4__py3-none-any.whl → 1.9.71__py3-none-any.whl

opik/rest_api/spans/client.py

@@ -1,39 +1,31 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-from ..core.client_wrapper import SyncClientWrapper
 import datetime as dt
+import typing
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..core.jsonable_encoder import jsonable_encoder
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..types.comment import Comment
+from ..types.error_info import ErrorInfo
+from ..types.error_info_write import ErrorInfoWrite
+from ..types.feedback_score_batch_item import FeedbackScoreBatchItem
 from ..types.feedback_score_source import FeedbackScoreSource
-from .types.get_spans_by_project_request_type import GetSpansByProjectRequestType
+from ..types.json_list_string import JsonListString
+from ..types.json_list_string_write import JsonListStringWrite
+from ..types.project_stats_public import ProjectStatsPublic
+from ..types.span_filter_public import SpanFilterPublic
 from ..types.span_page_public import SpanPagePublic
-from ..core.pydantic_utilities import parse_obj_as
-from ..types.span_write_type import SpanWriteType
-from ..types.json_node_write import JsonNodeWrite
-from ..types.error_info_write import ErrorInfoWrite
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..types.span_write import SpanWrite
 from ..types.span_public import SpanPublic
-from ..errors.not_found_error import NotFoundError
-from ..errors.not_implemented_error import NotImplementedError
-from ..types.json_node import JsonNode
-from ..types.error_info import ErrorInfo
-from .types.find_feedback_score_names_1_request_type import (
-    FindFeedbackScoreNames1RequestType,
-)
-from ..types.comment import Comment
+from ..types.span_update import SpanUpdate
+from ..types.span_update_type import SpanUpdateType
+from ..types.span_write import SpanWrite
+from ..types.span_write_type import SpanWriteType
+from ..types.value_entry import ValueEntry
+from .raw_client import AsyncRawSpansClient, RawSpansClient
+from .types.find_feedback_score_names_1_request_type import FindFeedbackScoreNames1RequestType
 from .types.get_span_stats_request_type import GetSpanStatsRequestType
-from ..types.project_stats_public import ProjectStatsPublic
-from ..types.feedback_score_batch_item import FeedbackScoreBatchItem
-from .types.span_search_stream_request_public_type import (
-    SpanSearchStreamRequestPublicType,
-)
-from ..types.span_filter_public import SpanFilterPublic
-from ..errors.bad_request_error import BadRequestError
-from ..core.client_wrapper import AsyncClientWrapper
+from .types.get_spans_by_project_request_type import GetSpansByProjectRequestType
+from .types.span_search_stream_request_public_type import SpanSearchStreamRequestPublicType
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -41,7 +33,18 @@ OMIT = typing.cast(typing.Any, ...)
 
 class SpansClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = RawSpansClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> RawSpansClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        RawSpansClient
+        """
+        return self._raw_client
 
     def add_span_comment(
         self,
@@ -84,37 +87,20 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.add_span_comment(
-            id_="id",
-            text="text",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id_)}/comments",
-            method="POST",
-            json={
-                "id": id,
-                "text": text,
-                "created_at": created_at,
-                "last_updated_at": last_updated_at,
-                "created_by": created_by,
-                "last_updated_by": last_updated_by,
-            },
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.add_span_comment(id_='id', text='text', )
+        """
+        _response = self._raw_client.add_span_comment(
+            id_,
+            text=text,
+            id=id,
+            created_at=created_at,
+            last_updated_at=last_updated_at,
+            created_by=created_by,
+            last_updated_by=last_updated_by,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def add_span_feedback_score(
         self,
@@ -129,6 +115,7 @@ class SpansClient:
         last_updated_at: typing.Optional[dt.datetime] = OMIT,
         created_by: typing.Optional[str] = OMIT,
         last_updated_by: typing.Optional[str] = OMIT,
+        value_by_author: typing.Optional[typing.Dict[str, ValueEntry]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> None:
         """
@@ -156,6 +143,8 @@ class SpansClient:
 
         last_updated_by : typing.Optional[str]
 
+        value_by_author : typing.Optional[typing.Dict[str, ValueEntry]]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -166,42 +155,92 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.add_span_feedback_score(
-            id="id",
-            name="name",
-            value=1.1,
-            source="ui",
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.add_span_feedback_score(id='id', name='name', value=1.1, source="ui", )
+        """
+        _response = self._raw_client.add_span_feedback_score(
+            id,
+            name=name,
+            value=value,
+            source=source,
+            category_name=category_name,
+            reason=reason,
+            created_at=created_at,
+            last_updated_at=last_updated_at,
+            created_by=created_by,
+            last_updated_by=last_updated_by,
+            value_by_author=value_by_author,
+            request_options=request_options,
         )
+        return _response.data
+
+    def create_spans(
+        self, *, spans: typing.Sequence[SpanWrite], request_options: typing.Optional[RequestOptions] = None
+    ) -> None:
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}/feedback-scores",
-            method="PUT",
-            json={
-                "name": name,
-                "category_name": category_name,
-                "value": value,
-                "reason": reason,
-                "source": source,
-                "created_at": created_at,
-                "last_updated_at": last_updated_at,
-                "created_by": created_by,
-                "last_updated_by": last_updated_by,
-            },
-            request_options=request_options,
-            omit=OMIT,
+        Create spans
+
+        Parameters
+        ----------
+        spans : typing.Sequence[SpanWrite]
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        None
+
+        Examples
+        --------
+        from Opik import OpikApi
+        from Opik import SpanWrite
+        import datetime
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.create_spans(spans=[SpanWrite(start_time=datetime.datetime.fromisoformat("2024-01-15 09:30:00+00:00", ), )], )
+        """
+        _response = self._raw_client.create_spans(spans=spans, request_options=request_options)
+        return _response.data
+
+    def batch_update_spans(
+        self,
+        *,
+        ids: typing.Sequence[str],
+        update: SpanUpdate,
+        merge_tags: typing.Optional[bool] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> None:
+        """
+        Update multiple spans
+
+        Parameters
+        ----------
+        ids : typing.Sequence[str]
+            List of span IDs to update (max 1000)
+
+        update : SpanUpdate
+
+        merge_tags : typing.Optional[bool]
+            If true, merge tags with existing tags instead of replacing them. Default: false
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        None
+
+        Examples
+        --------
+        from Opik import OpikApi
+        from Opik import SpanUpdate
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.batch_update_spans(ids=['ids'], update=SpanUpdate(trace_id='trace_id', ), )
+        """
+        _response = self._raw_client.batch_update_spans(
+            ids=ids, update=update, merge_tags=merge_tags, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def get_spans_by_project(
         self,
@@ -214,6 +253,11 @@ class SpansClient:
         type: typing.Optional[GetSpansByProjectRequestType] = None,
         filters: typing.Optional[str] = None,
         truncate: typing.Optional[bool] = None,
+        strip_attachments: typing.Optional[bool] = None,
+        sorting: typing.Optional[str] = None,
+        exclude: typing.Optional[str] = None,
+        from_time: typing.Optional[dt.datetime] = None,
+        to_time: typing.Optional[dt.datetime] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> SpanPagePublic:
         """
@@ -237,6 +281,16 @@ class SpansClient:
 
         truncate : typing.Optional[bool]
 
+        strip_attachments : typing.Optional[bool]
+
+        sorting : typing.Optional[str]
+
+        exclude : typing.Optional[str]
+
+        from_time : typing.Optional[dt.datetime]
+
+        to_time : typing.Optional[dt.datetime]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -248,61 +302,47 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         client.spans.get_spans_by_project()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans",
-            method="GET",
-            params={
-                "page": page,
-                "size": size,
-                "project_name": project_name,
-                "project_id": project_id,
-                "trace_id": trace_id,
-                "type": type,
-                "filters": filters,
-                "truncate": truncate,
-            },
+        _response = self._raw_client.get_spans_by_project(
+            page=page,
+            size=size,
+            project_name=project_name,
+            project_id=project_id,
+            trace_id=trace_id,
+            type=type,
+            filters=filters,
+            truncate=truncate,
+            strip_attachments=strip_attachments,
+            sorting=sorting,
+            exclude=exclude,
+            from_time=from_time,
+            to_time=to_time,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    SpanPagePublic,
-                    parse_obj_as(
-                        type_=SpanPagePublic,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def create_span(
         self,
         *,
-        trace_id: str,
-        name: str,
-        type: SpanWriteType,
         start_time: dt.datetime,
         id: typing.Optional[str] = OMIT,
         project_name: typing.Optional[str] = OMIT,
+        trace_id: typing.Optional[str] = OMIT,
         parent_span_id: typing.Optional[str] = OMIT,
+        name: typing.Optional[str] = OMIT,
+        type: typing.Optional[SpanWriteType] = OMIT,
         end_time: typing.Optional[dt.datetime] = OMIT,
-        input: typing.Optional[JsonNodeWrite] = OMIT,
-        output: typing.Optional[JsonNodeWrite] = OMIT,
-        metadata: typing.Optional[JsonNodeWrite] = OMIT,
+        input: typing.Optional[JsonListStringWrite] = OMIT,
+        output: typing.Optional[JsonListStringWrite] = OMIT,
+        metadata: typing.Optional[JsonListStringWrite] = OMIT,
         model: typing.Optional[str] = OMIT,
         provider: typing.Optional[str] = OMIT,
         tags: typing.Optional[typing.Sequence[str]] = OMIT,
         usage: typing.Optional[typing.Dict[str, int]] = OMIT,
         error_info: typing.Optional[ErrorInfoWrite] = OMIT,
+        last_updated_at: typing.Optional[dt.datetime] = OMIT,
         total_estimated_cost: typing.Optional[float] = OMIT,
         total_estimated_cost_version: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -312,12 +352,6 @@ class SpansClient:
 
         Parameters
         ----------
-        trace_id : str
-
-        name : str
-
-        type : SpanWriteType
-
         start_time : dt.datetime
 
         id : typing.Optional[str]
@@ -325,15 +359,21 @@ class SpansClient:
         project_name : typing.Optional[str]
             If null, the default project is used
 
+        trace_id : typing.Optional[str]
+
         parent_span_id : typing.Optional[str]
 
+        name : typing.Optional[str]
+
+        type : typing.Optional[SpanWriteType]
+
         end_time : typing.Optional[dt.datetime]
 
-        input : typing.Optional[JsonNodeWrite]
+        input : typing.Optional[JsonListStringWrite]
 
-        output : typing.Optional[JsonNodeWrite]
+        output : typing.Optional[JsonListStringWrite]
 
-        metadata : typing.Optional[JsonNodeWrite]
+        metadata : typing.Optional[JsonListStringWrite]
 
         model : typing.Optional[str]
 
@@ -345,6 +385,8 @@ class SpansClient:
 
         error_info : typing.Optional[ErrorInfoWrite]
 
+        last_updated_at : typing.Optional[dt.datetime]
+
         total_estimated_cost : typing.Optional[float]
 
         total_estimated_cost_version : typing.Optional[str]
@@ -358,128 +400,41 @@ class SpansClient:
 
         Examples
         --------
-        import datetime
-
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.create_span(
-            trace_id="trace_id",
-            name="name",
-            type="general",
-            start_time=datetime.datetime.fromisoformat(
-                "2024-01-15 09:30:00+00:00",
-            ),
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans",
-            method="POST",
-            json={
-                "id": id,
-                "project_name": project_name,
-                "trace_id": trace_id,
-                "parent_span_id": parent_span_id,
-                "name": name,
-                "type": type,
-                "start_time": start_time,
-                "end_time": end_time,
-                "input": input,
-                "output": output,
-                "metadata": metadata,
-                "model": model,
-                "provider": provider,
-                "tags": tags,
-                "usage": usage,
-                "error_info": convert_and_respect_annotation_metadata(
-                    object_=error_info, annotation=ErrorInfoWrite, direction="write"
-                ),
-                "total_estimated_cost": total_estimated_cost,
-                "total_estimated_cost_version": total_estimated_cost_version,
-            },
+        import datetime
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.create_span(start_time=datetime.datetime.fromisoformat("2024-01-15 09:30:00+00:00", ), )
+        """
+        _response = self._raw_client.create_span(
+            start_time=start_time,
+            id=id,
+            project_name=project_name,
+            trace_id=trace_id,
+            parent_span_id=parent_span_id,
+            name=name,
+            type=type,
+            end_time=end_time,
+            input=input,
+            output=output,
+            metadata=metadata,
+            model=model,
+            provider=provider,
+            tags=tags,
+            usage=usage,
+            error_info=error_info,
+            last_updated_at=last_updated_at,
+            total_estimated_cost=total_estimated_cost,
+            total_estimated_cost_version=total_estimated_cost_version,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
-    def create_spans(
+    def get_span_by_id(
         self,
+        id: str,
         *,
-        spans: typing.Sequence[SpanWrite],
+        strip_attachments: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> None:
-        """
-        Create spans
-
-        Parameters
-        ----------
-        spans : typing.Sequence[SpanWrite]
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        None
-
-        Examples
-        --------
-        import datetime
-
-        from Opik import OpikApi, SpanWrite
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.create_spans(
-            spans=[
-                SpanWrite(
-                    trace_id="trace_id",
-                    name="name",
-                    type="general",
-                    start_time=datetime.datetime.fromisoformat(
-                        "2024-01-15 09:30:00+00:00",
-                    ),
-                )
-            ],
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans/batch",
-            method="POST",
-            json={
-                "spans": convert_and_respect_annotation_metadata(
-                    object_=spans,
-                    annotation=typing.Sequence[SpanWrite],
-                    direction="write",
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    def get_span_by_id(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> SpanPublic:
         """
         Get span by id
@@ -488,6 +443,8 @@ class SpansClient:
         ----------
         id : str
 
+        strip_attachments : typing.Optional[bool]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -499,47 +456,15 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.get_span_by_id(
-            id="id",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.get_span_by_id(id='id', )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}",
-            method="GET",
-            request_options=request_options,
+        _response = self._raw_client.get_span_by_id(
+            id, strip_attachments=strip_attachments, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    SpanPublic,
-                    parse_obj_as(
-                        type_=SpanPublic,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    def delete_span_by_id(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> None:
+        return _response.data
+
+    def delete_span_by_id(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> None:
         """
         Delete span by id
 
@@ -557,37 +482,11 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.delete_span_by_id(
-            id="id",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.delete_span_by_id(id='id', )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            if _response.status_code == 501:
-                raise NotImplementedError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.delete_span_by_id(id, request_options=request_options)
+        return _response.data
 
     def update_span(
         self,
@@ -597,10 +496,12 @@ class SpansClient:
         project_name: typing.Optional[str] = OMIT,
         project_id: typing.Optional[str] = OMIT,
         parent_span_id: typing.Optional[str] = OMIT,
+        name: typing.Optional[str] = OMIT,
+        type: typing.Optional[SpanUpdateType] = OMIT,
         end_time: typing.Optional[dt.datetime] = OMIT,
-        input: typing.Optional[JsonNode] = OMIT,
-        output: typing.Optional[JsonNode] = OMIT,
-        metadata: typing.Optional[JsonNode] = OMIT,
+        input: typing.Optional[JsonListString] = OMIT,
+        output: typing.Optional[JsonListString] = OMIT,
+        metadata: typing.Optional[JsonListString] = OMIT,
         model: typing.Optional[str] = OMIT,
         provider: typing.Optional[str] = OMIT,
         tags: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -626,13 +527,17 @@ class SpansClient:
 
         parent_span_id : typing.Optional[str]
 
+        name : typing.Optional[str]
+
+        type : typing.Optional[SpanUpdateType]
+
         end_time : typing.Optional[dt.datetime]
 
-        input : typing.Optional[JsonNode]
+        input : typing.Optional[JsonListString]
 
-        output : typing.Optional[JsonNode]
+        output : typing.Optional[JsonListString]
 
-        metadata : typing.Optional[JsonNode]
+        metadata : typing.Optional[JsonListString]
 
         model : typing.Optional[str]
 
@@ -656,66 +561,33 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.update_span(
-            id="id",
-            trace_id="trace_id",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}",
-            method="PATCH",
-            json={
-                "project_name": project_name,
-                "project_id": project_id,
-                "trace_id": trace_id,
-                "parent_span_id": parent_span_id,
-                "end_time": end_time,
-                "input": input,
-                "output": output,
-                "metadata": metadata,
-                "model": model,
-                "provider": provider,
-                "tags": tags,
-                "usage": usage,
-                "total_estimated_cost": total_estimated_cost,
-                "error_info": convert_and_respect_annotation_metadata(
-                    object_=error_info, annotation=ErrorInfo, direction="write"
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.update_span(id='id', trace_id='trace_id', )
+        """
+        _response = self._raw_client.update_span(
+            id,
+            trace_id=trace_id,
+            project_name=project_name,
+            project_id=project_id,
+            parent_span_id=parent_span_id,
+            name=name,
+            type=type,
+            end_time=end_time,
+            input=input,
+            output=output,
+            metadata=metadata,
+            model=model,
+            provider=provider,
+            tags=tags,
+            usage=usage,
+            total_estimated_cost=total_estimated_cost,
+            error_info=error_info,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def delete_span_comments(
-        self,
-        *,
-        ids: typing.Sequence[str],
-        request_options: typing.Optional[RequestOptions] = None,
+        self, *, ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
     ) -> None:
         """
         Delete span comments
@@ -734,37 +606,18 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.delete_span_comments(
-            ids=["ids"],
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.delete_span_comments(ids=['ids'], )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans/comments/delete",
-            method="POST",
-            json={
-                "ids": ids,
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.delete_span_comments(ids=ids, request_options=request_options)
+        return _response.data
 
     def delete_span_feedback_score(
         self,
         id: str,
         *,
         name: str,
+        author: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> None:
         """
@@ -776,6 +629,8 @@ class SpansClient:
 
         name : str
 
+        author : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -786,32 +641,13 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.delete_span_feedback_score(
-            id="id",
-            name="name",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.delete_span_feedback_score(id='id', name='name', )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}/feedback-scores/delete",
-            method="POST",
-            json={
-                "name": name,
-            },
-            request_options=request_options,
-            omit=OMIT,
+        _response = self._raw_client.delete_span_feedback_score(
+            id, name=name, author=author, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def find_feedback_score_names_1(
         self,
@@ -840,42 +676,16 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         client.spans.find_feedback_score_names_1()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans/feedback-scores/names",
-            method="GET",
-            params={
-                "project_id": project_id,
-                "type": type,
-            },
-            request_options=request_options,
+        _response = self._raw_client.find_feedback_score_names_1(
+            project_id=project_id, type=type, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[str],
-                    parse_obj_as(
-                        type_=typing.List[str],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def get_span_comment(
-        self,
-        comment_id: str,
-        span_id: str,
-        *,
-        request_options: typing.Optional[RequestOptions] = None,
+        self, comment_id: str, span_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> Comment:
         """
         Get span comment
@@ -897,44 +707,11 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.get_span_comment(
-            comment_id="commentId",
-            span_id="spanId",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.get_span_comment(comment_id='commentId', span_id='spanId', )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(span_id)}/comments/{jsonable_encoder(comment_id)}",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Comment,
-                    parse_obj_as(
-                        type_=Comment,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.get_span_comment(comment_id, span_id, request_options=request_options)
+        return _response.data
 
     def get_span_stats(
         self,
@@ -944,6 +721,8 @@ class SpansClient:
         trace_id: typing.Optional[str] = None,
         type: typing.Optional[GetSpanStatsRequestType] = None,
         filters: typing.Optional[str] = None,
+        from_time: typing.Optional[dt.datetime] = None,
+        to_time: typing.Optional[dt.datetime] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> ProjectStatsPublic:
         """
@@ -961,6 +740,10 @@ class SpansClient:
 
         filters : typing.Optional[str]
 
+        from_time : typing.Optional[dt.datetime]
+
+        to_time : typing.Optional[dt.datetime]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -972,38 +755,20 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         client.spans.get_span_stats()
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans/stats",
-            method="GET",
-            params={
-                "project_id": project_id,
-                "project_name": project_name,
-                "trace_id": trace_id,
-                "type": type,
-                "filters": filters,
-            },
+        _response = self._raw_client.get_span_stats(
+            project_id=project_id,
+            project_name=project_name,
+            trace_id=trace_id,
+            type=type,
+            filters=filters,
+            from_time=from_time,
+            to_time=to_time,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    ProjectStatsPublic,
-                    parse_obj_as(
-                        type_=ProjectStatsPublic,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     def score_batch_of_spans(
         self,
@@ -1027,43 +792,13 @@ class SpansClient:
 
         Examples
         --------
-        from Opik import FeedbackScoreBatchItem, OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.score_batch_of_spans(
-            scores=[
-                FeedbackScoreBatchItem(
-                    id="id",
-                    name="name",
-                    value=1.1,
-                    source="ui",
-                )
-            ],
-        )
+        from Opik import OpikApi
+        from Opik import FeedbackScoreBatchItem
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.score_batch_of_spans(scores=[FeedbackScoreBatchItem(name='name', value=1.1, source="ui", id='id', )], )
         """
-        _response = self._client_wrapper.httpx_client.request(
-            "v1/private/spans/feedback-scores",
-            method="PUT",
-            json={
-                "scores": convert_and_respect_annotation_metadata(
-                    object_=scores,
-                    annotation=typing.Sequence[FeedbackScoreBatchItem],
-                    direction="write",
-                ),
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = self._raw_client.score_batch_of_spans(scores=scores, request_options=request_options)
+        return _response.data
 
     def search_spans(
         self,
@@ -1076,6 +811,8 @@ class SpansClient:
         limit: typing.Optional[int] = OMIT,
         last_retrieved_id: typing.Optional[str] = OMIT,
         truncate: typing.Optional[bool] = OMIT,
+        from_time: typing.Optional[dt.datetime] = OMIT,
+        to_time: typing.Optional[dt.datetime] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.Iterator[bytes]:
         """
@@ -1094,68 +831,41 @@ class SpansClient:
         filters : typing.Optional[typing.Sequence[SpanFilterPublic]]
 
         limit : typing.Optional[int]
+            Max number of spans to be streamed
 
         last_retrieved_id : typing.Optional[str]
 
         truncate : typing.Optional[bool]
             Truncate image included in either input, output or metadata
 
+        from_time : typing.Optional[dt.datetime]
+            Filter spans created from this time (ISO-8601 format).
+
+        to_time : typing.Optional[dt.datetime]
+            Filter spans created up to this time (ISO-8601 format). If not provided, defaults to current time. Must be after 'from_time'.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration. You can pass in configuration such as `chunk_size`, and more to customize the request and response.
 
-        Yields
-        ------
+        Returns
+        -------
         typing.Iterator[bytes]
             Spans stream or error during process
         """
-        with self._client_wrapper.httpx_client.stream(
-            "v1/private/spans/search",
-            method="POST",
-            json={
-                "trace_id": trace_id,
-                "project_name": project_name,
-                "project_id": project_id,
-                "type": type,
-                "filters": convert_and_respect_annotation_metadata(
-                    object_=filters,
-                    annotation=typing.Sequence[SpanFilterPublic],
-                    direction="write",
-                ),
-                "limit": limit,
-                "last_retrieved_id": last_retrieved_id,
-                "truncate": truncate,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        with self._raw_client.search_spans(
+            trace_id=trace_id,
+            project_name=project_name,
+            project_id=project_id,
+            type=type,
+            filters=filters,
+            limit=limit,
+            last_retrieved_id=last_retrieved_id,
+            truncate=truncate,
+            from_time=from_time,
+            to_time=to_time,
             request_options=request_options,
-            omit=OMIT,
-        ) as _response:
-            try:
-                if 200 <= _response.status_code < 300:
-                    _chunk_size = (
-                        request_options.get("chunk_size", None)
-                        if request_options is not None
-                        else None
-                    )
-                    for _chunk in _response.iter_bytes(chunk_size=_chunk_size):
-                        yield _chunk
-                    return
-                _response.read()
-                if _response.status_code == 400:
-                    raise BadRequestError(
-                        typing.cast(
-                            typing.Optional[typing.Any],
-                            parse_obj_as(
-                                type_=typing.Optional[typing.Any],  # type: ignore
-                                object_=_response.json(),
-                            ),
-                        )
-                    )
-                _response_json = _response.json()
-            except JSONDecodeError:
-                raise ApiError(status_code=_response.status_code, body=_response.text)
-            raise ApiError(status_code=_response.status_code, body=_response_json)
+        ) as r:
+            yield from r.data
 
     def update_span_comment(
         self,
@@ -1198,52 +908,36 @@ class SpansClient:
         Examples
         --------
         from Opik import OpikApi
-
-        client = OpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-        client.spans.update_span_comment(
-            comment_id="commentId",
-            text="text",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/comments/{jsonable_encoder(comment_id)}",
-            method="PATCH",
-            json={
-                "id": id,
-                "text": text,
-                "created_at": created_at,
-                "last_updated_at": last_updated_at,
-                "created_by": created_by,
-                "last_updated_by": last_updated_by,
-            },
+        client = OpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        client.spans.update_span_comment(comment_id='commentId', text='text', )
+        """
+        _response = self._raw_client.update_span_comment(
+            comment_id,
+            text=text,
+            id=id,
+            created_at=created_at,
+            last_updated_at=last_updated_at,
+            created_by=created_by,
+            last_updated_by=last_updated_by,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
 
 class AsyncSpansClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
+        self._raw_client = AsyncRawSpansClient(client_wrapper=client_wrapper)
+
+    @property
+    def with_raw_response(self) -> AsyncRawSpansClient:
+        """
+        Retrieves a raw implementation of this client that returns raw responses.
+
+        Returns
+        -------
+        AsyncRawSpansClient
+        """
+        return self._raw_client
 
     async def add_span_comment(
         self,
@@ -1285,46 +979,24 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.add_span_comment(
-                id_="id",
-                text="text",
-            )
-
-
+            await client.spans.add_span_comment(id_='id', text='text', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id_)}/comments",
-            method="POST",
-            json={
-                "id": id,
-                "text": text,
-                "created_at": created_at,
-                "last_updated_at": last_updated_at,
-                "created_by": created_by,
-                "last_updated_by": last_updated_by,
-            },
+        _response = await self._raw_client.add_span_comment(
+            id_,
+            text=text,
+            id=id,
+            created_at=created_at,
+            last_updated_at=last_updated_at,
+            created_by=created_by,
+            last_updated_by=last_updated_by,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def add_span_feedback_score(
         self,
@@ -1339,6 +1011,7 @@ class AsyncSpansClient:
         last_updated_at: typing.Optional[dt.datetime] = OMIT,
         created_by: typing.Optional[str] = OMIT,
         last_updated_by: typing.Optional[str] = OMIT,
+        value_by_author: typing.Optional[typing.Dict[str, ValueEntry]] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> None:
         """
@@ -1366,6 +1039,8 @@ class AsyncSpansClient:
 
         last_updated_by : typing.Optional[str]
 
+        value_by_author : typing.Optional[typing.Dict[str, ValueEntry]]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1375,51 +1050,102 @@ class AsyncSpansClient:
 
         Examples
         --------
+        from Opik import AsyncOpikApi
         import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        async def main() -> None:
+            await client.spans.add_span_feedback_score(id='id', name='name', value=1.1, source="ui", )
+        asyncio.run(main())
+        """
+        _response = await self._raw_client.add_span_feedback_score(
+            id,
+            name=name,
+            value=value,
+            source=source,
+            category_name=category_name,
+            reason=reason,
+            created_at=created_at,
+            last_updated_at=last_updated_at,
+            created_by=created_by,
+            last_updated_by=last_updated_by,
+            value_by_author=value_by_author,
+            request_options=request_options,
+        )
+        return _response.data
 
-        from Opik import AsyncOpikApi
+    async def create_spans(
+        self, *, spans: typing.Sequence[SpanWrite], request_options: typing.Optional[RequestOptions] = None
+    ) -> None:
+        """
+        Create spans
 
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
+        Parameters
+        ----------
+        spans : typing.Sequence[SpanWrite]
 
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        None
 
+        Examples
+        --------
+        from Opik import AsyncOpikApi
+        from Opik import SpanWrite
+        import datetime
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.add_span_feedback_score(
-                id="id",
-                name="name",
-                value=1.1,
-                source="ui",
-            )
+            await client.spans.create_spans(spans=[SpanWrite(start_time=datetime.datetime.fromisoformat("2024-01-15 09:30:00+00:00", ), )], )
+        asyncio.run(main())
+        """
+        _response = await self._raw_client.create_spans(spans=spans, request_options=request_options)
+        return _response.data
+
+    async def batch_update_spans(
+        self,
+        *,
+        ids: typing.Sequence[str],
+        update: SpanUpdate,
+        merge_tags: typing.Optional[bool] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> None:
+        """
+        Update multiple spans
 
+        Parameters
+        ----------
+        ids : typing.Sequence[str]
+            List of span IDs to update (max 1000)
 
+        update : SpanUpdate
+
+        merge_tags : typing.Optional[bool]
+            If true, merge tags with existing tags instead of replacing them. Default: false
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        None
+
+        Examples
+        --------
+        from Opik import AsyncOpikApi
+        from Opik import SpanUpdate
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
+        async def main() -> None:
+            await client.spans.batch_update_spans(ids=['ids'], update=SpanUpdate(trace_id='trace_id', ), )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}/feedback-scores",
-            method="PUT",
-            json={
-                "name": name,
-                "category_name": category_name,
-                "value": value,
-                "reason": reason,
-                "source": source,
-                "created_at": created_at,
-                "last_updated_at": last_updated_at,
-                "created_by": created_by,
-                "last_updated_by": last_updated_by,
-            },
-            request_options=request_options,
-            omit=OMIT,
+        _response = await self._raw_client.batch_update_spans(
+            ids=ids, update=update, merge_tags=merge_tags, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def get_spans_by_project(
         self,
@@ -1432,6 +1158,11 @@ class AsyncSpansClient:
         type: typing.Optional[GetSpansByProjectRequestType] = None,
         filters: typing.Optional[str] = None,
         truncate: typing.Optional[bool] = None,
+        strip_attachments: typing.Optional[bool] = None,
+        sorting: typing.Optional[str] = None,
+        exclude: typing.Optional[str] = None,
+        from_time: typing.Optional[dt.datetime] = None,
+        to_time: typing.Optional[dt.datetime] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> SpanPagePublic:
         """
@@ -1455,6 +1186,16 @@ class AsyncSpansClient:
 
         truncate : typing.Optional[bool]
 
+        strip_attachments : typing.Optional[bool]
+
+        sorting : typing.Optional[str]
+
+        exclude : typing.Optional[str]
+
+        from_time : typing.Optional[dt.datetime]
+
+        to_time : typing.Optional[dt.datetime]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1465,70 +1206,51 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
             await client.spans.get_spans_by_project()
-
-
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans",
-            method="GET",
-            params={
-                "page": page,
-                "size": size,
-                "project_name": project_name,
-                "project_id": project_id,
-                "trace_id": trace_id,
-                "type": type,
-                "filters": filters,
-                "truncate": truncate,
-            },
+        _response = await self._raw_client.get_spans_by_project(
+            page=page,
+            size=size,
+            project_name=project_name,
+            project_id=project_id,
+            trace_id=trace_id,
+            type=type,
+            filters=filters,
+            truncate=truncate,
+            strip_attachments=strip_attachments,
+            sorting=sorting,
+            exclude=exclude,
+            from_time=from_time,
+            to_time=to_time,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    SpanPagePublic,
-                    parse_obj_as(
-                        type_=SpanPagePublic,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def create_span(
         self,
         *,
-        trace_id: str,
-        name: str,
-        type: SpanWriteType,
         start_time: dt.datetime,
         id: typing.Optional[str] = OMIT,
         project_name: typing.Optional[str] = OMIT,
+        trace_id: typing.Optional[str] = OMIT,
         parent_span_id: typing.Optional[str] = OMIT,
+        name: typing.Optional[str] = OMIT,
+        type: typing.Optional[SpanWriteType] = OMIT,
         end_time: typing.Optional[dt.datetime] = OMIT,
-        input: typing.Optional[JsonNodeWrite] = OMIT,
-        output: typing.Optional[JsonNodeWrite] = OMIT,
-        metadata: typing.Optional[JsonNodeWrite] = OMIT,
+        input: typing.Optional[JsonListStringWrite] = OMIT,
+        output: typing.Optional[JsonListStringWrite] = OMIT,
+        metadata: typing.Optional[JsonListStringWrite] = OMIT,
         model: typing.Optional[str] = OMIT,
         provider: typing.Optional[str] = OMIT,
         tags: typing.Optional[typing.Sequence[str]] = OMIT,
         usage: typing.Optional[typing.Dict[str, int]] = OMIT,
         error_info: typing.Optional[ErrorInfoWrite] = OMIT,
+        last_updated_at: typing.Optional[dt.datetime] = OMIT,
         total_estimated_cost: typing.Optional[float] = OMIT,
         total_estimated_cost_version: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -1538,12 +1260,6 @@ class AsyncSpansClient:
 
         Parameters
         ----------
-        trace_id : str
-
-        name : str
-
-        type : SpanWriteType
-
         start_time : dt.datetime
 
         id : typing.Optional[str]
@@ -1551,15 +1267,21 @@ class AsyncSpansClient:
         project_name : typing.Optional[str]
             If null, the default project is used
 
+        trace_id : typing.Optional[str]
+
         parent_span_id : typing.Optional[str]
 
+        name : typing.Optional[str]
+
+        type : typing.Optional[SpanWriteType]
+
         end_time : typing.Optional[dt.datetime]
 
-        input : typing.Optional[JsonNodeWrite]
+        input : typing.Optional[JsonListStringWrite]
 
-        output : typing.Optional[JsonNodeWrite]
+        output : typing.Optional[JsonListStringWrite]
 
-        metadata : typing.Optional[JsonNodeWrite]
+        metadata : typing.Optional[JsonListStringWrite]
 
         model : typing.Optional[str]
 
@@ -1571,6 +1293,8 @@ class AsyncSpansClient:
 
         error_info : typing.Optional[ErrorInfoWrite]
 
+        last_updated_at : typing.Optional[dt.datetime]
+
         total_estimated_cost : typing.Optional[float]
 
         total_estimated_cost_version : typing.Optional[str]
@@ -1584,142 +1308,44 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-        import datetime
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import datetime
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.create_span(
-                trace_id="trace_id",
-                name="name",
-                type="general",
-                start_time=datetime.datetime.fromisoformat(
-                    "2024-01-15 09:30:00+00:00",
-                ),
-            )
-
-
+            await client.spans.create_span(start_time=datetime.datetime.fromisoformat("2024-01-15 09:30:00+00:00", ), )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans",
-            method="POST",
-            json={
-                "id": id,
-                "project_name": project_name,
-                "trace_id": trace_id,
-                "parent_span_id": parent_span_id,
-                "name": name,
-                "type": type,
-                "start_time": start_time,
-                "end_time": end_time,
-                "input": input,
-                "output": output,
-                "metadata": metadata,
-                "model": model,
-                "provider": provider,
-                "tags": tags,
-                "usage": usage,
-                "error_info": convert_and_respect_annotation_metadata(
-                    object_=error_info, annotation=ErrorInfoWrite, direction="write"
-                ),
-                "total_estimated_cost": total_estimated_cost,
-                "total_estimated_cost_version": total_estimated_cost_version,
-            },
+        _response = await self._raw_client.create_span(
+            start_time=start_time,
+            id=id,
+            project_name=project_name,
+            trace_id=trace_id,
+            parent_span_id=parent_span_id,
+            name=name,
+            type=type,
+            end_time=end_time,
+            input=input,
+            output=output,
+            metadata=metadata,
+            model=model,
+            provider=provider,
+            tags=tags,
+            usage=usage,
+            error_info=error_info,
+            last_updated_at=last_updated_at,
+            total_estimated_cost=total_estimated_cost,
+            total_estimated_cost_version=total_estimated_cost_version,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
-    async def create_spans(
+    async def get_span_by_id(
         self,
+        id: str,
         *,
-        spans: typing.Sequence[SpanWrite],
+        strip_attachments: typing.Optional[bool] = None,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> None:
-        """
-        Create spans
-
-        Parameters
-        ----------
-        spans : typing.Sequence[SpanWrite]
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        None
-
-        Examples
-        --------
-        import asyncio
-        import datetime
-
-        from Opik import AsyncOpikApi, SpanWrite
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
-        async def main() -> None:
-            await client.spans.create_spans(
-                spans=[
-                    SpanWrite(
-                        trace_id="trace_id",
-                        name="name",
-                        type="general",
-                        start_time=datetime.datetime.fromisoformat(
-                            "2024-01-15 09:30:00+00:00",
-                        ),
-                    )
-                ],
-            )
-
-
-        asyncio.run(main())
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans/batch",
-            method="POST",
-            json={
-                "spans": convert_and_respect_annotation_metadata(
-                    object_=spans,
-                    annotation=typing.Sequence[SpanWrite],
-                    direction="write",
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def get_span_by_id(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> SpanPublic:
         """
         Get span by id
@@ -1728,6 +1354,8 @@ class AsyncSpansClient:
         ----------
         id : str
 
+        strip_attachments : typing.Optional[bool]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -1738,56 +1366,19 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.get_span_by_id(
-                id="id",
-            )
-
-
+            await client.spans.get_span_by_id(id='id', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}",
-            method="GET",
-            request_options=request_options,
+        _response = await self._raw_client.get_span_by_id(
+            id, strip_attachments=strip_attachments, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    SpanPublic,
-                    parse_obj_as(
-                        type_=SpanPublic,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def delete_span_by_id(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> None:
+        return _response.data
+
+    async def delete_span_by_id(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> None:
         """
         Delete span by id
 
@@ -1804,46 +1395,15 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.delete_span_by_id(
-                id="id",
-            )
-
-
+            await client.spans.delete_span_by_id(id='id', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}",
-            method="DELETE",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            if _response.status_code == 501:
-                raise NotImplementedError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = await self._raw_client.delete_span_by_id(id, request_options=request_options)
+        return _response.data
 
     async def update_span(
         self,
@@ -1853,10 +1413,12 @@ class AsyncSpansClient:
         project_name: typing.Optional[str] = OMIT,
         project_id: typing.Optional[str] = OMIT,
         parent_span_id: typing.Optional[str] = OMIT,
+        name: typing.Optional[str] = OMIT,
+        type: typing.Optional[SpanUpdateType] = OMIT,
         end_time: typing.Optional[dt.datetime] = OMIT,
-        input: typing.Optional[JsonNode] = OMIT,
-        output: typing.Optional[JsonNode] = OMIT,
-        metadata: typing.Optional[JsonNode] = OMIT,
+        input: typing.Optional[JsonListString] = OMIT,
+        output: typing.Optional[JsonListString] = OMIT,
+        metadata: typing.Optional[JsonListString] = OMIT,
         model: typing.Optional[str] = OMIT,
         provider: typing.Optional[str] = OMIT,
         tags: typing.Optional[typing.Sequence[str]] = OMIT,
@@ -1882,13 +1444,17 @@ class AsyncSpansClient:
 
         parent_span_id : typing.Optional[str]
 
+        name : typing.Optional[str]
+
+        type : typing.Optional[SpanUpdateType]
+
         end_time : typing.Optional[dt.datetime]
 
-        input : typing.Optional[JsonNode]
+        input : typing.Optional[JsonListString]
 
-        output : typing.Optional[JsonNode]
+        output : typing.Optional[JsonListString]
 
-        metadata : typing.Optional[JsonNode]
+        metadata : typing.Optional[JsonListString]
 
         model : typing.Optional[str]
 
@@ -1911,75 +1477,37 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.update_span(
-                id="id",
-                trace_id="trace_id",
-            )
-
-
+            await client.spans.update_span(id='id', trace_id='trace_id', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}",
-            method="PATCH",
-            json={
-                "project_name": project_name,
-                "project_id": project_id,
-                "trace_id": trace_id,
-                "parent_span_id": parent_span_id,
-                "end_time": end_time,
-                "input": input,
-                "output": output,
-                "metadata": metadata,
-                "model": model,
-                "provider": provider,
-                "tags": tags,
-                "usage": usage,
-                "total_estimated_cost": total_estimated_cost,
-                "error_info": convert_and_respect_annotation_metadata(
-                    object_=error_info, annotation=ErrorInfo, direction="write"
-                ),
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        _response = await self._raw_client.update_span(
+            id,
+            trace_id=trace_id,
+            project_name=project_name,
+            project_id=project_id,
+            parent_span_id=parent_span_id,
+            name=name,
+            type=type,
+            end_time=end_time,
+            input=input,
+            output=output,
+            metadata=metadata,
+            model=model,
+            provider=provider,
+            tags=tags,
+            usage=usage,
+            total_estimated_cost=total_estimated_cost,
+            error_info=error_info,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def delete_span_comments(
-        self,
-        *,
-        ids: typing.Sequence[str],
-        request_options: typing.Optional[RequestOptions] = None,
+        self, *, ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
     ) -> None:
         """
         Delete span comments
@@ -1997,46 +1525,22 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.delete_span_comments(
-                ids=["ids"],
-            )
-
-
+            await client.spans.delete_span_comments(ids=['ids'], )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans/comments/delete",
-            method="POST",
-            json={
-                "ids": ids,
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = await self._raw_client.delete_span_comments(ids=ids, request_options=request_options)
+        return _response.data
 
     async def delete_span_feedback_score(
         self,
         id: str,
         *,
         name: str,
+        author: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> None:
         """
@@ -2048,6 +1552,8 @@ class AsyncSpansClient:
 
         name : str
 
+        author : typing.Optional[str]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -2057,41 +1563,17 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.delete_span_feedback_score(
-                id="id",
-                name="name",
-            )
-
-
+            await client.spans.delete_span_feedback_score(id='id', name='name', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(id)}/feedback-scores/delete",
-            method="POST",
-            json={
-                "name": name,
-            },
-            request_options=request_options,
-            omit=OMIT,
+        _response = await self._raw_client.delete_span_feedback_score(
+            id, name=name, author=author, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def find_feedback_score_names_1(
         self,
@@ -2119,51 +1601,20 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
             await client.spans.find_feedback_score_names_1()
-
-
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans/feedback-scores/names",
-            method="GET",
-            params={
-                "project_id": project_id,
-                "type": type,
-            },
-            request_options=request_options,
+        _response = await self._raw_client.find_feedback_score_names_1(
+            project_id=project_id, type=type, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    typing.List[str],
-                    parse_obj_as(
-                        type_=typing.List[str],  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def get_span_comment(
-        self,
-        comment_id: str,
-        span_id: str,
-        *,
-        request_options: typing.Optional[RequestOptions] = None,
+        self, comment_id: str, span_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> Comment:
         """
         Get span comment
@@ -2184,53 +1635,15 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.get_span_comment(
-                comment_id="commentId",
-                span_id="spanId",
-            )
-
-
+            await client.spans.get_span_comment(comment_id='commentId', span_id='spanId', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/{jsonable_encoder(span_id)}/comments/{jsonable_encoder(comment_id)}",
-            method="GET",
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    Comment,
-                    parse_obj_as(
-                        type_=Comment,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = await self._raw_client.get_span_comment(comment_id, span_id, request_options=request_options)
+        return _response.data
 
     async def get_span_stats(
         self,
@@ -2240,6 +1653,8 @@ class AsyncSpansClient:
         trace_id: typing.Optional[str] = None,
         type: typing.Optional[GetSpanStatsRequestType] = None,
         filters: typing.Optional[str] = None,
+        from_time: typing.Optional[dt.datetime] = None,
+        to_time: typing.Optional[dt.datetime] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> ProjectStatsPublic:
         """
@@ -2257,6 +1672,10 @@ class AsyncSpansClient:
 
         filters : typing.Optional[str]
 
+        from_time : typing.Optional[dt.datetime]
+
+        to_time : typing.Optional[dt.datetime]
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -2267,47 +1686,24 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
             await client.spans.get_span_stats()
-
-
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans/stats",
-            method="GET",
-            params={
-                "project_id": project_id,
-                "project_name": project_name,
-                "trace_id": trace_id,
-                "type": type,
-                "filters": filters,
-            },
+        _response = await self._raw_client.get_span_stats(
+            project_id=project_id,
+            project_name=project_name,
+            trace_id=trace_id,
+            type=type,
+            filters=filters,
+            from_time=from_time,
+            to_time=to_time,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    ProjectStatsPublic,
-                    parse_obj_as(
-                        type_=ProjectStatsPublic,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data
 
     async def score_batch_of_spans(
         self,
@@ -2331,51 +1727,16 @@ class AsyncSpansClient:
 
         Examples
         --------
+        from Opik import AsyncOpikApi
+        from Opik import FeedbackScoreBatchItem
         import asyncio
-
-        from Opik import AsyncOpikApi, FeedbackScoreBatchItem
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.score_batch_of_spans(
-                scores=[
-                    FeedbackScoreBatchItem(
-                        id="id",
-                        name="name",
-                        value=1.1,
-                        source="ui",
-                    )
-                ],
-            )
-
-
+            await client.spans.score_batch_of_spans(scores=[FeedbackScoreBatchItem(name='name', value=1.1, source="ui", id='id', )], )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "v1/private/spans/feedback-scores",
-            method="PUT",
-            json={
-                "scores": convert_and_respect_annotation_metadata(
-                    object_=scores,
-                    annotation=typing.Sequence[FeedbackScoreBatchItem],
-                    direction="write",
-                ),
-            },
-            request_options=request_options,
-            omit=OMIT,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        _response = await self._raw_client.score_batch_of_spans(scores=scores, request_options=request_options)
+        return _response.data
 
     async def search_spans(
         self,
@@ -2388,6 +1749,8 @@ class AsyncSpansClient:
         limit: typing.Optional[int] = OMIT,
         last_retrieved_id: typing.Optional[str] = OMIT,
         truncate: typing.Optional[bool] = OMIT,
+        from_time: typing.Optional[dt.datetime] = OMIT,
+        to_time: typing.Optional[dt.datetime] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> typing.AsyncIterator[bytes]:
         """
@@ -2406,68 +1769,42 @@ class AsyncSpansClient:
         filters : typing.Optional[typing.Sequence[SpanFilterPublic]]
 
         limit : typing.Optional[int]
+            Max number of spans to be streamed
 
         last_retrieved_id : typing.Optional[str]
 
         truncate : typing.Optional[bool]
             Truncate image included in either input, output or metadata
 
+        from_time : typing.Optional[dt.datetime]
+            Filter spans created from this time (ISO-8601 format).
+
+        to_time : typing.Optional[dt.datetime]
+            Filter spans created up to this time (ISO-8601 format). If not provided, defaults to current time. Must be after 'from_time'.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration. You can pass in configuration such as `chunk_size`, and more to customize the request and response.
 
-        Yields
-        ------
+        Returns
+        -------
         typing.AsyncIterator[bytes]
             Spans stream or error during process
         """
-        async with self._client_wrapper.httpx_client.stream(
-            "v1/private/spans/search",
-            method="POST",
-            json={
-                "trace_id": trace_id,
-                "project_name": project_name,
-                "project_id": project_id,
-                "type": type,
-                "filters": convert_and_respect_annotation_metadata(
-                    object_=filters,
-                    annotation=typing.Sequence[SpanFilterPublic],
-                    direction="write",
-                ),
-                "limit": limit,
-                "last_retrieved_id": last_retrieved_id,
-                "truncate": truncate,
-            },
-            headers={
-                "content-type": "application/json",
-            },
+        async with self._raw_client.search_spans(
+            trace_id=trace_id,
+            project_name=project_name,
+            project_id=project_id,
+            type=type,
+            filters=filters,
+            limit=limit,
+            last_retrieved_id=last_retrieved_id,
+            truncate=truncate,
+            from_time=from_time,
+            to_time=to_time,
             request_options=request_options,
-            omit=OMIT,
-        ) as _response:
-            try:
-                if 200 <= _response.status_code < 300:
-                    _chunk_size = (
-                        request_options.get("chunk_size", None)
-                        if request_options is not None
-                        else None
-                    )
-                    async for _chunk in _response.aiter_bytes(chunk_size=_chunk_size):
-                        yield _chunk
-                    return
-                await _response.aread()
-                if _response.status_code == 400:
-                    raise BadRequestError(
-                        typing.cast(
-                            typing.Optional[typing.Any],
-                            parse_obj_as(
-                                type_=typing.Optional[typing.Any],  # type: ignore
-                                object_=_response.json(),
-                            ),
-                        )
-                    )
-                _response_json = _response.json()
-            except JSONDecodeError:
-                raise ApiError(status_code=_response.status_code, body=_response.text)
-            raise ApiError(status_code=_response.status_code, body=_response_json)
+        ) as r:
+            async for data in r.data:
+                yield data
 
     async def update_span_comment(
         self,
@@ -2509,53 +1846,21 @@ class AsyncSpansClient:
 
         Examples
         --------
-        import asyncio
-
         from Opik import AsyncOpikApi
-
-        client = AsyncOpikApi(
-            api_key="YOUR_API_KEY",
-            workspace_name="YOUR_WORKSPACE_NAME",
-        )
-
-
+        import asyncio
+        client = AsyncOpikApi(api_key="YOUR_API_KEY", workspace_name="YOUR_WORKSPACE_NAME", )
         async def main() -> None:
-            await client.spans.update_span_comment(
-                comment_id="commentId",
-                text="text",
-            )
-
-
+            await client.spans.update_span_comment(comment_id='commentId', text='text', )
         asyncio.run(main())
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v1/private/spans/comments/{jsonable_encoder(comment_id)}",
-            method="PATCH",
-            json={
-                "id": id,
-                "text": text,
-                "created_at": created_at,
-                "last_updated_at": last_updated_at,
-                "created_by": created_by,
-                "last_updated_by": last_updated_by,
-            },
+        _response = await self._raw_client.update_span_comment(
+            comment_id,
+            text=text,
+            id=id,
+            created_at=created_at,
+            last_updated_at=last_updated_at,
+            created_by=created_by,
+            last_updated_by=last_updated_by,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                return
-            if _response.status_code == 404:
-                raise NotFoundError(
-                    typing.cast(
-                        typing.Optional[typing.Any],
-                        parse_obj_as(
-                            type_=typing.Optional[typing.Any],  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return _response.data