scale-gp-beta 0.1.0a8__py3-none-any.whl → 0.1.0a10__py3-none-any.whl

scale_gp_beta/_base_client.py

@@ -98,7 +98,11 @@ _StreamT = TypeVar("_StreamT", bound=Stream[Any])
 _AsyncStreamT = TypeVar("_AsyncStreamT", bound=AsyncStream[Any])
 
 if TYPE_CHECKING:
-    from httpx._config import DEFAULT_TIMEOUT_CONFIG as HTTPX_DEFAULT_TIMEOUT
+    from httpx._config import (
+        DEFAULT_TIMEOUT_CONFIG,  # pyright: ignore[reportPrivateImportUsage]
+    )
+
+    HTTPX_DEFAULT_TIMEOUT = DEFAULT_TIMEOUT_CONFIG
 else:
     try:
         from httpx._config import DEFAULT_TIMEOUT_CONFIG as HTTPX_DEFAULT_TIMEOUT
@@ -115,6 +119,7 @@ class PageInfo:
 
     url: URL | NotGiven
     params: Query | NotGiven
+    json: Body | NotGiven
 
     @overload
     def __init__(
@@ -130,19 +135,30 @@ class PageInfo:
         params: Query,
     ) -> None: ...
 
+    @overload
+    def __init__(
+        self,
+        *,
+        json: Body,
+    ) -> None: ...
+
     def __init__(
         self,
         *,
         url: URL | NotGiven = NOT_GIVEN,
+        json: Body | NotGiven = NOT_GIVEN,
         params: Query | NotGiven = NOT_GIVEN,
     ) -> None:
         self.url = url
+        self.json = json
         self.params = params
 
     @override
     def __repr__(self) -> str:
         if self.url:
             return f"{self.__class__.__name__}(url={self.url})"
+        if self.json:
+            return f"{self.__class__.__name__}(json={self.json})"
         return f"{self.__class__.__name__}(params={self.params})"
 
 
@@ -191,6 +207,19 @@ class BasePage(GenericModel, Generic[_T]):
             options.url = str(url)
             return options
 
+        if not isinstance(info.json, NotGiven):
+            if not is_mapping(info.json):
+                raise TypeError("Pagination is only supported with mappings")
+
+            if not options.json_data:
+                options.json_data = {**info.json}
+            else:
+                if not is_mapping(options.json_data):
+                    raise TypeError("Pagination is only supported with mappings")
+
+                options.json_data = {**options.json_data, **info.json}
+            return options
+
         raise ValueError("Unexpected PageInfo state")
 
 
@@ -409,7 +438,8 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
 
         idempotency_header = self._idempotency_header
         if idempotency_header and options.method.lower() != "get" and idempotency_header not in headers:
-            headers[idempotency_header] = options.idempotency_key or self._idempotency_key()
+            options.idempotency_key = options.idempotency_key or self._idempotency_key()
+            headers[idempotency_header] = options.idempotency_key
 
         # Don't set these headers if they were already set or removed by the caller. We check
         # `custom_headers`, which can contain `Omit()`, instead of `headers` to account for the removal case.
@@ -943,6 +973,10 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
         request = self._build_request(options, retries_taken=retries_taken)
         self._prepare_request(request)
 
+        if options.idempotency_key:
+            # ensure the idempotency key is reused between requests
+            input_options.idempotency_key = options.idempotency_key
+
         kwargs: HttpxSendArgs = {}
         if self.custom_auth is not None:
             kwargs["auth"] = self.custom_auth
@@ -1475,6 +1509,10 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
         request = self._build_request(options, retries_taken=retries_taken)
         await self._prepare_request(request)
 
+        if options.idempotency_key:
+            # ensure the idempotency key is reused between requests
+            input_options.idempotency_key = options.idempotency_key
+
         kwargs: HttpxSendArgs = {}
         if self.custom_auth is not None:
             kwargs["auth"] = self.custom_auth

scale_gp_beta/_client.py

@@ -24,7 +24,7 @@ from ._utils import (
     get_async_library,
 )
 from ._version import __version__
-from .resources import models, datasets, inference, completions, evaluations, dataset_items, evaluation_items
+from .resources import spans, models, datasets, inference, completions, evaluations, dataset_items, evaluation_items
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
 from ._exceptions import APIStatusError, SGPClientError
 from ._base_client import (
@@ -63,6 +63,7 @@ class SGPClient(SyncAPIClient):
     evaluations: evaluations.EvaluationsResource
     dataset_items: dataset_items.DatasetItemsResource
     evaluation_items: evaluation_items.EvaluationItemsResource
+    spans: spans.SpansResource
     with_raw_response: SGPClientWithRawResponse
     with_streaming_response: SGPClientWithStreamedResponse
 
@@ -165,6 +166,7 @@ class SGPClient(SyncAPIClient):
         self.evaluations = evaluations.EvaluationsResource(self)
         self.dataset_items = dataset_items.DatasetItemsResource(self)
         self.evaluation_items = evaluation_items.EvaluationItemsResource(self)
+        self.spans = spans.SpansResource(self)
         self.with_raw_response = SGPClientWithRawResponse(self)
         self.with_streaming_response = SGPClientWithStreamedResponse(self)
 
@@ -288,6 +290,7 @@ class AsyncSGPClient(AsyncAPIClient):
     evaluations: evaluations.AsyncEvaluationsResource
     dataset_items: dataset_items.AsyncDatasetItemsResource
     evaluation_items: evaluation_items.AsyncEvaluationItemsResource
+    spans: spans.AsyncSpansResource
     with_raw_response: AsyncSGPClientWithRawResponse
     with_streaming_response: AsyncSGPClientWithStreamedResponse
 
@@ -390,6 +393,7 @@ class AsyncSGPClient(AsyncAPIClient):
         self.evaluations = evaluations.AsyncEvaluationsResource(self)
         self.dataset_items = dataset_items.AsyncDatasetItemsResource(self)
         self.evaluation_items = evaluation_items.AsyncEvaluationItemsResource(self)
+        self.spans = spans.AsyncSpansResource(self)
         self.with_raw_response = AsyncSGPClientWithRawResponse(self)
         self.with_streaming_response = AsyncSGPClientWithStreamedResponse(self)
 
@@ -514,6 +518,7 @@ class SGPClientWithRawResponse:
         self.evaluations = evaluations.EvaluationsResourceWithRawResponse(client.evaluations)
         self.dataset_items = dataset_items.DatasetItemsResourceWithRawResponse(client.dataset_items)
         self.evaluation_items = evaluation_items.EvaluationItemsResourceWithRawResponse(client.evaluation_items)
+        self.spans = spans.SpansResourceWithRawResponse(client.spans)
 
 
 class AsyncSGPClientWithRawResponse:
@@ -527,6 +532,7 @@ class AsyncSGPClientWithRawResponse:
         self.evaluations = evaluations.AsyncEvaluationsResourceWithRawResponse(client.evaluations)
         self.dataset_items = dataset_items.AsyncDatasetItemsResourceWithRawResponse(client.dataset_items)
         self.evaluation_items = evaluation_items.AsyncEvaluationItemsResourceWithRawResponse(client.evaluation_items)
+        self.spans = spans.AsyncSpansResourceWithRawResponse(client.spans)
 
 
 class SGPClientWithStreamedResponse:
@@ -540,6 +546,7 @@ class SGPClientWithStreamedResponse:
         self.evaluations = evaluations.EvaluationsResourceWithStreamingResponse(client.evaluations)
         self.dataset_items = dataset_items.DatasetItemsResourceWithStreamingResponse(client.dataset_items)
         self.evaluation_items = evaluation_items.EvaluationItemsResourceWithStreamingResponse(client.evaluation_items)
+        self.spans = spans.SpansResourceWithStreamingResponse(client.spans)
 
 
 class AsyncSGPClientWithStreamedResponse:
@@ -555,6 +562,7 @@ class AsyncSGPClientWithStreamedResponse:
         self.evaluation_items = evaluation_items.AsyncEvaluationItemsResourceWithStreamingResponse(
             client.evaluation_items
         )
+        self.spans = spans.AsyncSpansResourceWithStreamingResponse(client.spans)
 
 
 Client = SGPClient

scale_gp_beta/_models.py

@@ -19,7 +19,6 @@ from typing_extensions import (
 )
 
 import pydantic
-import pydantic.generics
 from pydantic.fields import FieldInfo
 
 from ._types import (

scale_gp_beta/_utils/_transform.py

@@ -5,13 +5,15 @@ import base64
 import pathlib
 from typing import Any, Mapping, TypeVar, cast
 from datetime import date, datetime
-from typing_extensions import Literal, get_args, override, get_type_hints
+from typing_extensions import Literal, get_args, override, get_type_hints as _get_type_hints
 
 import anyio
 import pydantic
 
 from ._utils import (
     is_list,
+    is_given,
+    lru_cache,
     is_mapping,
     is_iterable,
 )
@@ -108,6 +110,7 @@ def transform(
     return cast(_T, transformed)
 
 
+@lru_cache(maxsize=8096)
 def _get_annotated_type(type_: type) -> type | None:
     """If the given type is an `Annotated` type then it is returned, if not `None` is returned.
 
@@ -142,6 +145,10 @@ def _maybe_transform_key(key: str, type_: type) -> str:
     return key
 
 
+def _no_transform_needed(annotation: type) -> bool:
+    return annotation == float or annotation == int
+
+
 def _transform_recursive(
     data: object,
     *,
@@ -184,6 +191,15 @@ def _transform_recursive(
             return cast(object, data)
 
         inner_type = extract_type_arg(stripped_type, 0)
+        if _no_transform_needed(inner_type):
+            # for some types there is no need to transform anything, so we can get a small
+            # perf boost from skipping that work.
+            #
+            # but we still need to convert to a list to ensure the data is json-serializable
+            if is_list(data):
+                return data
+            return list(data)
+
         return [_transform_recursive(d, annotation=annotation, inner_type=inner_type) for d in data]
 
     if is_union_type(stripped_type):
@@ -245,6 +261,11 @@ def _transform_typeddict(
     result: dict[str, object] = {}
     annotations = get_type_hints(expected_type, include_extras=True)
     for key, value in data.items():
+        if not is_given(value):
+            # we don't need to include `NotGiven` values here as they'll
+            # be stripped out before the request is sent anyway
+            continue
+
         type_ = annotations.get(key)
         if type_ is None:
             # we do not have a type annotation for this field, leave it as is
@@ -332,6 +353,15 @@ async def _async_transform_recursive(
             return cast(object, data)
 
         inner_type = extract_type_arg(stripped_type, 0)
+        if _no_transform_needed(inner_type):
+            # for some types there is no need to transform anything, so we can get a small
+            # perf boost from skipping that work.
+            #
+            # but we still need to convert to a list to ensure the data is json-serializable
+            if is_list(data):
+                return data
+            return list(data)
+
         return [await _async_transform_recursive(d, annotation=annotation, inner_type=inner_type) for d in data]
 
     if is_union_type(stripped_type):
@@ -393,6 +423,11 @@ async def _async_transform_typeddict(
     result: dict[str, object] = {}
     annotations = get_type_hints(expected_type, include_extras=True)
     for key, value in data.items():
+        if not is_given(value):
+            # we don't need to include `NotGiven` values here as they'll
+            # be stripped out before the request is sent anyway
+            continue
+
         type_ = annotations.get(key)
         if type_ is None:
             # we do not have a type annotation for this field, leave it as is
@@ -400,3 +435,13 @@ async def _async_transform_typeddict(
         else:
             result[_maybe_transform_key(key, type_)] = await _async_transform_recursive(value, annotation=type_)
     return result
+
+
+@lru_cache(maxsize=8096)
+def get_type_hints(
+    obj: Any,
+    globalns: dict[str, Any] | None = None,
+    localns: Mapping[str, Any] | None = None,
+    include_extras: bool = False,
+) -> dict[str, Any]:
+    return _get_type_hints(obj, globalns=globalns, localns=localns, include_extras=include_extras)

scale_gp_beta/_utils/_typing.py

@@ -13,6 +13,7 @@ from typing_extensions import (
     get_origin,
 )
 
+from ._utils import lru_cache
 from .._types import InheritsGeneric
 from .._compat import is_union as _is_union
 
@@ -66,6 +67,7 @@ def is_type_alias_type(tp: Any, /) -> TypeIs[typing_extensions.TypeAliasType]:
 
 
 # Extracts T from Annotated[T, ...] or from Required[Annotated[T, ...]]
+@lru_cache(maxsize=8096)
 def strip_annotated_type(typ: type) -> type:
     if is_required_type(typ) or is_annotated_type(typ):
         return strip_annotated_type(cast(type, get_args(typ)[0]))
@@ -108,7 +110,7 @@ def extract_type_var_from_base(
     ```
     """
     cls = cast(object, get_origin(typ) or typ)
-    if cls in generic_bases:
+    if cls in generic_bases:  # pyright: ignore[reportUnnecessaryContains]
         # we're given the class directly
         return extract_type_arg(typ, index)
 

scale_gp_beta/_version.py

@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "scale_gp_beta"
-__version__ = "0.1.0-alpha.8"  # x-release-please-version
+__version__ = "0.1.0-alpha.10"  # x-release-please-version

scale_gp_beta/resources/__init__.py

@@ -16,6 +16,14 @@ from .files import (
     FilesResourceWithStreamingResponse,
     AsyncFilesResourceWithStreamingResponse,
 )
+from .spans import (
+    SpansResource,
+    AsyncSpansResource,
+    SpansResourceWithRawResponse,
+    AsyncSpansResourceWithRawResponse,
+    SpansResourceWithStreamingResponse,
+    AsyncSpansResourceWithStreamingResponse,
+)
 from .models import (
     ModelsResource,
     AsyncModelsResource,
@@ -128,4 +136,10 @@ __all__ = [
     "AsyncEvaluationItemsResourceWithRawResponse",
     "EvaluationItemsResourceWithStreamingResponse",
     "AsyncEvaluationItemsResourceWithStreamingResponse",
+    "SpansResource",
+    "AsyncSpansResource",
+    "SpansResourceWithRawResponse",
+    "AsyncSpansResourceWithRawResponse",
+    "SpansResourceWithStreamingResponse",
+    "AsyncSpansResourceWithStreamingResponse",
 ]

scale_gp_beta/resources/chat/completions.py

@@ -508,7 +508,9 @@ class CompletionsResource(SyncAPIResource):
                     "top_logprobs": top_logprobs,
                     "top_p": top_p,
                 },
-                completion_create_params.CompletionCreateParams,
+                completion_create_params.CompletionCreateParamsStreaming
+                if stream
+                else completion_create_params.CompletionCreateParamsNonStreaming,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -999,7 +1001,9 @@ class AsyncCompletionsResource(AsyncAPIResource):
                     "top_logprobs": top_logprobs,
                     "top_p": top_p,
                 },
-                completion_create_params.CompletionCreateParams,
+                completion_create_params.CompletionCreateParamsStreaming
+                if stream
+                else completion_create_params.CompletionCreateParamsNonStreaming,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout

scale_gp_beta/resources/completions.py

@@ -368,7 +368,9 @@ class CompletionsResource(SyncAPIResource):
                     "top_p": top_p,
                     "user": user,
                 },
-                completion_create_params.CompletionCreateParams,
+                completion_create_params.CompletionCreateParamsStreaming
+                if stream
+                else completion_create_params.CompletionCreateParamsNonStreaming,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -718,7 +720,9 @@ class AsyncCompletionsResource(AsyncAPIResource):
                     "top_p": top_p,
                     "user": user,
                 },
-                completion_create_params.CompletionCreateParams,
+                completion_create_params.CompletionCreateParamsStreaming
+                if stream
+                else completion_create_params.CompletionCreateParamsNonStreaming,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout

scale_gp_beta/resources/datasets.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, Iterable, Optional
+from typing import Dict, List, Iterable, Optional
 
 import httpx
 
@@ -59,6 +59,7 @@ class DatasetsResource(SyncAPIResource):
         data: Iterable[Dict[str, object]],
         name: str,
         description: str | NotGiven = NOT_GIVEN,
+        tags: List[str] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -72,6 +73,8 @@ class DatasetsResource(SyncAPIResource):
         Args:
           data: Items to be included in the dataset
 
+          tags: The tags associated with the entity
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -87,6 +90,7 @@ class DatasetsResource(SyncAPIResource):
                     "data": data,
                     "name": name,
                     "description": description,
+                    "tags": tags,
                 },
                 dataset_create_params.DatasetCreateParams,
             ),
@@ -142,6 +146,7 @@ class DatasetsResource(SyncAPIResource):
         *,
         description: str | NotGiven = NOT_GIVEN,
         name: str | NotGiven = NOT_GIVEN,
+        tags: List[str] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -153,6 +158,8 @@ class DatasetsResource(SyncAPIResource):
         Update Dataset
 
         Args:
+          tags: The tags associated with the entity
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -169,6 +176,7 @@ class DatasetsResource(SyncAPIResource):
                 {
                     "description": description,
                     "name": name,
+                    "tags": tags,
                 },
                 dataset_update_params.DatasetUpdateParams,
             ),
@@ -285,6 +293,7 @@ class AsyncDatasetsResource(AsyncAPIResource):
         data: Iterable[Dict[str, object]],
         name: str,
         description: str | NotGiven = NOT_GIVEN,
+        tags: List[str] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -298,6 +307,8 @@ class AsyncDatasetsResource(AsyncAPIResource):
         Args:
           data: Items to be included in the dataset
 
+          tags: The tags associated with the entity
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -313,6 +324,7 @@ class AsyncDatasetsResource(AsyncAPIResource):
                     "data": data,
                     "name": name,
                     "description": description,
+                    "tags": tags,
                 },
                 dataset_create_params.DatasetCreateParams,
             ),
@@ -368,6 +380,7 @@ class AsyncDatasetsResource(AsyncAPIResource):
         *,
         description: str | NotGiven = NOT_GIVEN,
         name: str | NotGiven = NOT_GIVEN,
+        tags: List[str] | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -379,6 +392,8 @@ class AsyncDatasetsResource(AsyncAPIResource):
         Update Dataset
 
         Args:
+          tags: The tags associated with the entity
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -395,6 +410,7 @@ class AsyncDatasetsResource(AsyncAPIResource):
                 {
                     "description": description,
                     "name": name,
+                    "tags": tags,
                 },
                 dataset_update_params.DatasetUpdateParams,
             ),