scale-gp-beta 0.1.0a24__py3-none-any.whl → 0.1.0a26__py3-none-any.whl

scale_gp_beta/__init__.py

@@ -37,7 +37,7 @@ from ._exceptions import (
     UnprocessableEntityError,
     APIResponseValidationError,
 )
-from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
+from ._base_client import DefaultHttpxClient, DefaultAioHttpClient, DefaultAsyncHttpxClient
 from ._utils._logs import setup_logging as _setup_logging
 
 __all__ = [
@@ -80,6 +80,7 @@ __all__ = [
     "DEFAULT_CONNECTION_LIMITS",
     "DefaultHttpxClient",
     "DefaultAsyncHttpxClient",
+    "DefaultAioHttpClient",
 ]
 
 if not _t.TYPE_CHECKING:

scale_gp_beta/_base_client.py

@@ -1289,6 +1289,24 @@ class _DefaultAsyncHttpxClient(httpx.AsyncClient):
         super().__init__(**kwargs)
 
 
+try:
+    import httpx_aiohttp
+except ImportError:
+
+    class _DefaultAioHttpClient(httpx.AsyncClient):
+        def __init__(self, **_kwargs: Any) -> None:
+            raise RuntimeError("To use the aiohttp client you must have installed the package with the `aiohttp` extra")
+else:
+
+    class _DefaultAioHttpClient(httpx_aiohttp.HttpxAiohttpClient):  # type: ignore
+        def __init__(self, **kwargs: Any) -> None:
+            kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
+            kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
+            kwargs.setdefault("follow_redirects", True)
+
+            super().__init__(**kwargs)
+
+
 if TYPE_CHECKING:
     DefaultAsyncHttpxClient = httpx.AsyncClient
     """An alias to `httpx.AsyncClient` that provides the same defaults that this SDK
@@ -1297,8 +1315,12 @@ if TYPE_CHECKING:
     This is useful because overriding the `http_client` with your own instance of
     `httpx.AsyncClient` will result in httpx's defaults being used, not ours.
     """
+
+    DefaultAioHttpClient = httpx.AsyncClient
+    """An alias to `httpx.AsyncClient` that changes the default HTTP transport to `aiohttp`."""
 else:
     DefaultAsyncHttpxClient = _DefaultAsyncHttpxClient
+    DefaultAioHttpClient = _DefaultAioHttpClient
 
 
 class AsyncHttpxClientWrapper(DefaultAsyncHttpxClient):

scale_gp_beta/_client.py

@@ -21,7 +21,17 @@ from ._types import (
 )
 from ._utils import is_given, get_async_library
 from ._version import __version__
-from .resources import spans, models, datasets, inference, completions, evaluations, dataset_items, evaluation_items
+from .resources import (
+    spans,
+    models,
+    datasets,
+    inference,
+    questions,
+    completions,
+    evaluations,
+    dataset_items,
+    evaluation_items,
+)
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
 from ._exceptions import APIStatusError, SGPClientError
 from ._base_client import (
@@ -54,6 +64,7 @@ class SGPClient(SyncAPIClient):
     completions: completions.CompletionsResource
     chat: chat.ChatResource
     inference: inference.InferenceResource
+    questions: questions.QuestionsResource
     files: files.FilesResource
     models: models.ModelsResource
     datasets: datasets.DatasetsResource
@@ -157,6 +168,7 @@ class SGPClient(SyncAPIClient):
         self.completions = completions.CompletionsResource(self)
         self.chat = chat.ChatResource(self)
         self.inference = inference.InferenceResource(self)
+        self.questions = questions.QuestionsResource(self)
         self.files = files.FilesResource(self)
         self.models = models.ModelsResource(self)
         self.datasets = datasets.DatasetsResource(self)
@@ -281,6 +293,7 @@ class AsyncSGPClient(AsyncAPIClient):
     completions: completions.AsyncCompletionsResource
     chat: chat.AsyncChatResource
     inference: inference.AsyncInferenceResource
+    questions: questions.AsyncQuestionsResource
     files: files.AsyncFilesResource
     models: models.AsyncModelsResource
     datasets: datasets.AsyncDatasetsResource
@@ -384,6 +397,7 @@ class AsyncSGPClient(AsyncAPIClient):
         self.completions = completions.AsyncCompletionsResource(self)
         self.chat = chat.AsyncChatResource(self)
         self.inference = inference.AsyncInferenceResource(self)
+        self.questions = questions.AsyncQuestionsResource(self)
         self.files = files.AsyncFilesResource(self)
         self.models = models.AsyncModelsResource(self)
         self.datasets = datasets.AsyncDatasetsResource(self)
@@ -509,6 +523,7 @@ class SGPClientWithRawResponse:
         self.completions = completions.CompletionsResourceWithRawResponse(client.completions)
         self.chat = chat.ChatResourceWithRawResponse(client.chat)
         self.inference = inference.InferenceResourceWithRawResponse(client.inference)
+        self.questions = questions.QuestionsResourceWithRawResponse(client.questions)
         self.files = files.FilesResourceWithRawResponse(client.files)
         self.models = models.ModelsResourceWithRawResponse(client.models)
         self.datasets = datasets.DatasetsResourceWithRawResponse(client.datasets)
@@ -523,6 +538,7 @@ class AsyncSGPClientWithRawResponse:
         self.completions = completions.AsyncCompletionsResourceWithRawResponse(client.completions)
         self.chat = chat.AsyncChatResourceWithRawResponse(client.chat)
         self.inference = inference.AsyncInferenceResourceWithRawResponse(client.inference)
+        self.questions = questions.AsyncQuestionsResourceWithRawResponse(client.questions)
         self.files = files.AsyncFilesResourceWithRawResponse(client.files)
         self.models = models.AsyncModelsResourceWithRawResponse(client.models)
         self.datasets = datasets.AsyncDatasetsResourceWithRawResponse(client.datasets)
@@ -537,6 +553,7 @@ class SGPClientWithStreamedResponse:
         self.completions = completions.CompletionsResourceWithStreamingResponse(client.completions)
         self.chat = chat.ChatResourceWithStreamingResponse(client.chat)
         self.inference = inference.InferenceResourceWithStreamingResponse(client.inference)
+        self.questions = questions.QuestionsResourceWithStreamingResponse(client.questions)
         self.files = files.FilesResourceWithStreamingResponse(client.files)
         self.models = models.ModelsResourceWithStreamingResponse(client.models)
         self.datasets = datasets.DatasetsResourceWithStreamingResponse(client.datasets)
@@ -551,6 +568,7 @@ class AsyncSGPClientWithStreamedResponse:
         self.completions = completions.AsyncCompletionsResourceWithStreamingResponse(client.completions)
         self.chat = chat.AsyncChatResourceWithStreamingResponse(client.chat)
         self.inference = inference.AsyncInferenceResourceWithStreamingResponse(client.inference)
+        self.questions = questions.AsyncQuestionsResourceWithStreamingResponse(client.questions)
         self.files = files.AsyncFilesResourceWithStreamingResponse(client.files)
         self.models = models.AsyncModelsResourceWithStreamingResponse(client.models)
         self.datasets = datasets.AsyncDatasetsResourceWithStreamingResponse(client.datasets)

scale_gp_beta/_models.py

@@ -2,9 +2,10 @@ from __future__ import annotations
 
 import os
 import inspect
-from typing import TYPE_CHECKING, Any, Type, Union, Generic, TypeVar, Callable, cast
+from typing import TYPE_CHECKING, Any, Type, Union, Generic, TypeVar, Callable, Optional, cast
 from datetime import date, datetime
 from typing_extensions import (
+    List,
     Unpack,
     Literal,
     ClassVar,
@@ -366,7 +367,7 @@ def _construct_field(value: object, field: FieldInfo, key: str) -> object:
     if type_ is None:
         raise RuntimeError(f"Unexpected field type is None for {key}")
 
-    return construct_type(value=value, type_=type_)
+    return construct_type(value=value, type_=type_, metadata=getattr(field, "metadata", None))
 
 
 def is_basemodel(type_: type) -> bool:
@@ -420,7 +421,7 @@ def construct_type_unchecked(*, value: object, type_: type[_T]) -> _T:
     return cast(_T, construct_type(value=value, type_=type_))
 
 
-def construct_type(*, value: object, type_: object) -> object:
+def construct_type(*, value: object, type_: object, metadata: Optional[List[Any]] = None) -> object:
     """Loose coercion to the expected type with construction of nested values.
 
     If the given value does not match the expected type then it is returned as-is.
@@ -438,8 +439,10 @@ def construct_type(*, value: object, type_: object) -> object:
         type_ = type_.__value__  # type: ignore[unreachable]
 
     # unwrap `Annotated[T, ...]` -> `T`
-    if is_annotated_type(type_):
-        meta: tuple[Any, ...] = get_args(type_)[1:]
+    if metadata is not None:
+        meta: tuple[Any, ...] = tuple(metadata)
+    elif is_annotated_type(type_):
+        meta = get_args(type_)[1:]
         type_ = extract_type_arg(type_, 0)
     else:
         meta = tuple()

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.24"  # x-release-please-version
+__version__ = "0.1.0-alpha.26"  # x-release-please-version

scale_gp_beta/lib/tracing/types.py

@@ -13,7 +13,7 @@ SpanInputParam = Dict[str, Any]
 SpanOutputParam = Dict[str, Any]
 SpanMetadataParam = Dict[str, Any]
 
-SpanStatusLiterals = Literal["SUCCESS", "ERROR"]
+SpanStatusLiterals = Literal["SUCCESS", "ERROR", "CANCELED"]
 
 SpanTypeLiterals = Literal[
         "TEXT_INPUT",
@@ -30,8 +30,6 @@ SpanTypeLiterals = Literal[
         "DOCUMENT_SEARCH",
         "DOCUMENT_PROMPT",
         "CUSTOM",
-        "INPUT_GUARDRAIL",
-        "OUTPUT_GUARDRAIL",
         "CODE_EXECUTION",
         "DATA_MANIPULATION",
         "EVALUATION",

scale_gp_beta/resources/__init__.py

@@ -48,6 +48,14 @@ from .inference import (
     InferenceResourceWithStreamingResponse,
     AsyncInferenceResourceWithStreamingResponse,
 )
+from .questions import (
+    QuestionsResource,
+    AsyncQuestionsResource,
+    QuestionsResourceWithRawResponse,
+    AsyncQuestionsResourceWithRawResponse,
+    QuestionsResourceWithStreamingResponse,
+    AsyncQuestionsResourceWithStreamingResponse,
+)
 from .completions import (
     CompletionsResource,
     AsyncCompletionsResource,
@@ -100,6 +108,12 @@ __all__ = [
     "AsyncInferenceResourceWithRawResponse",
     "InferenceResourceWithStreamingResponse",
     "AsyncInferenceResourceWithStreamingResponse",
+    "QuestionsResource",
+    "AsyncQuestionsResource",
+    "QuestionsResourceWithRawResponse",
+    "AsyncQuestionsResourceWithRawResponse",
+    "QuestionsResourceWithStreamingResponse",
+    "AsyncQuestionsResourceWithStreamingResponse",
     "FilesResource",
     "AsyncFilesResource",
     "FilesResourceWithRawResponse",

scale_gp_beta/resources/chat/completions.py

@@ -536,6 +536,7 @@ class CompletionsResource(SyncAPIResource):
             "model_zoo",
             "bedrock",
             "xai",
+            "fireworks_ai",
         ]
         | NotGiven = NOT_GIVEN,
         sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
@@ -548,7 +549,7 @@ class CompletionsResource(SyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> CompletionModelsResponse:
         """
-        Chat Completions
+        List Chat Completion Models
 
         Args:
           extra_headers: Send extra headers
@@ -1090,6 +1091,7 @@ class AsyncCompletionsResource(AsyncAPIResource):
             "model_zoo",
             "bedrock",
             "xai",
+            "fireworks_ai",
         ]
         | NotGiven = NOT_GIVEN,
         sort_order: Literal["asc", "desc"] | NotGiven = NOT_GIVEN,
@@ -1102,7 +1104,7 @@ class AsyncCompletionsResource(AsyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
     ) -> CompletionModelsResponse:
         """
-        Chat Completions
+        List Chat Completion Models
 
         Args:
           extra_headers: Send extra headers

scale_gp_beta/resources/models.py

@@ -317,6 +317,7 @@ class ModelsResource(SyncAPIResource):
             "model_zoo",
             "bedrock",
             "xai",
+            "fireworks_ai",
         ]
         | NotGiven = NOT_GIVEN,
         name: str | NotGiven = NOT_GIVEN,
@@ -689,6 +690,7 @@ class AsyncModelsResource(AsyncAPIResource):
             "model_zoo",
             "bedrock",
             "xai",
+            "fireworks_ai",
         ]
         | NotGiven = NOT_GIVEN,
         name: str | NotGiven = NOT_GIVEN,