relaxai 0.1.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

relaxai/resources/models.py

@@ -15,7 +15,7 @@ from .._response import (
 )
 from ..types.model import Model
 from .._base_client import make_request_options
-from ..types.model_list_response import ModelListResponse
+from ..types.model_list import ModelList
 
 __all__ = ["ModelsResource", "AsyncModelsResource"]
 
@@ -40,7 +40,26 @@ class ModelsResource(SyncAPIResource):
         """
         return ModelsResourceWithStreamingResponse(self)
 
-    def retrieve(
+    def list_models(
+        self,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> ModelList:
+        """List all the available models"""
+        return self._get(
+            "/v1/models",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ModelList,
+        )
+
+    def retrieve_model(
         self,
         model: str,
         *,
@@ -73,25 +92,6 @@ class ModelsResource(SyncAPIResource):
             cast_to=Model,
         )
 
-    def list(
-        self,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ModelListResponse:
-        """List all the available models"""
-        return self._get(
-            "/v1/models",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ModelListResponse,
-        )
-
 
 class AsyncModelsResource(AsyncAPIResource):
     @cached_property
@@ -113,7 +113,26 @@ class AsyncModelsResource(AsyncAPIResource):
         """
         return AsyncModelsResourceWithStreamingResponse(self)
 
-    async def retrieve(
+    async def list_models(
+        self,
+        *,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    ) -> ModelList:
+        """List all the available models"""
+        return await self._get(
+            "/v1/models",
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=ModelList,
+        )
+
+    async def retrieve_model(
         self,
         model: str,
         *,
@@ -146,35 +165,16 @@ class AsyncModelsResource(AsyncAPIResource):
             cast_to=Model,
         )
 
-    async def list(
-        self,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
-    ) -> ModelListResponse:
-        """List all the available models"""
-        return await self._get(
-            "/v1/models",
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=ModelListResponse,
-        )
-
 
 class ModelsResourceWithRawResponse:
     def __init__(self, models: ModelsResource) -> None:
         self._models = models
 
-        self.retrieve = to_raw_response_wrapper(
-            models.retrieve,
+        self.list_models = to_raw_response_wrapper(
+            models.list_models,
         )
-        self.list = to_raw_response_wrapper(
-            models.list,
+        self.retrieve_model = to_raw_response_wrapper(
+            models.retrieve_model,
         )
 
 
@@ -182,11 +182,11 @@ class AsyncModelsResourceWithRawResponse:
     def __init__(self, models: AsyncModelsResource) -> None:
         self._models = models
 
-        self.retrieve = async_to_raw_response_wrapper(
-            models.retrieve,
+        self.list_models = async_to_raw_response_wrapper(
+            models.list_models,
         )
-        self.list = async_to_raw_response_wrapper(
-            models.list,
+        self.retrieve_model = async_to_raw_response_wrapper(
+            models.retrieve_model,
         )
 
 
@@ -194,11 +194,11 @@ class ModelsResourceWithStreamingResponse:
     def __init__(self, models: ModelsResource) -> None:
         self._models = models
 
-        self.retrieve = to_streamed_response_wrapper(
-            models.retrieve,
+        self.list_models = to_streamed_response_wrapper(
+            models.list_models,
         )
-        self.list = to_streamed_response_wrapper(
-            models.list,
+        self.retrieve_model = to_streamed_response_wrapper(
+            models.retrieve_model,
         )
 
 
@@ -206,9 +206,9 @@ class AsyncModelsResourceWithStreamingResponse:
     def __init__(self, models: AsyncModelsResource) -> None:
         self._models = models
 
-        self.retrieve = async_to_streamed_response_wrapper(
-            models.retrieve,
+        self.list_models = async_to_streamed_response_wrapper(
+            models.list_models,
         )
-        self.list = async_to_streamed_response_wrapper(
-            models.list,
+        self.retrieve_model = async_to_streamed_response_wrapper(
+            models.retrieve_model,
         )

relaxai/types/__init__.py

@@ -3,16 +3,21 @@
 from __future__ import annotations
 
 from .model import Model as Model
-from .usage import Usage as Usage
+from .shared import (
+    OpenAIUsage as OpenAIUsage,
+    OpenAIPromptTokensDetails as OpenAIPromptTokensDetails,
+    OpenAICompletionTokensDetails as OpenAICompletionTokensDetails,
+)
+from .model_list import ModelList as ModelList
 from .function_call import FunctionCall as FunctionCall
+from .health_response import HealthResponse as HealthResponse
+from .embedding_response import EmbeddingResponse as EmbeddingResponse
 from .function_call_param import FunctionCallParam as FunctionCallParam
-from .model_list_response import ModelListResponse as ModelListResponse
-from .health_check_response import HealthCheckResponse as HealthCheckResponse
+from .stream_options_param import StreamOptionsParam as StreamOptionsParam
 from .content_filter_results import ContentFilterResults as ContentFilterResults
 from .chat_completion_message import ChatCompletionMessage as ChatCompletionMessage
-from .embedding_create_params import EmbeddingCreateParams as EmbeddingCreateParams
-from .embedding_create_response import EmbeddingCreateResponse as EmbeddingCreateResponse
+from .chat_completion_response import ChatCompletionResponse as ChatCompletionResponse
 from .function_definition_param import FunctionDefinitionParam as FunctionDefinitionParam
 from .chat_completion_message_param import ChatCompletionMessageParam as ChatCompletionMessageParam
 from .chat_create_completion_params import ChatCreateCompletionParams as ChatCreateCompletionParams
-from .chat_create_completion_response import ChatCreateCompletionResponse as ChatCreateCompletionResponse
+from .embedding_create_embedding_params import EmbeddingCreateEmbeddingParams as EmbeddingCreateEmbeddingParams

relaxai/types/chat_completion_message.py

@@ -1,13 +1,37 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 from typing import List, Optional
+from typing_extensions import Literal
 
 from pydantic import Field as FieldInfo
 
 from .._models import BaseModel
 from .function_call import FunctionCall
 
-__all__ = ["ChatCompletionMessage", "MultiContent", "MultiContentImageURL", "ToolCall"]
+__all__ = [
+    "ChatCompletionMessage",
+    "Annotation",
+    "AnnotationURLCitation",
+    "MultiContent",
+    "MultiContentImageURL",
+    "ToolCall",
+]
+
+
+class AnnotationURLCitation(BaseModel):
+    end_index: int
+
+    start_index: int
+
+    title: str
+
+    url: str
+
+
+class Annotation(BaseModel):
+    type: Optional[Literal["url_citation"]] = None
+
+    url_citation: Optional[AnnotationURLCitation] = None
 
 
 class MultiContentImageURL(BaseModel):
@@ -35,14 +59,16 @@ class ToolCall(BaseModel):
 
 
 class ChatCompletionMessage(BaseModel):
-    multi_content: List[MultiContent] = FieldInfo(alias="MultiContent")
+    content: str
 
     role: str
 
-    content: Optional[str] = None
+    annotations: Optional[List[Annotation]] = None
 
     function_call: Optional[FunctionCall] = None
 
+    multi_content: Optional[List[MultiContent]] = FieldInfo(alias="MultiContent", default=None)
+
     name: Optional[str] = None
 
     reasoning_content: Optional[str] = None

relaxai/types/chat_completion_message_param.py

@@ -3,12 +3,35 @@
 from __future__ import annotations
 
 from typing import Iterable
-from typing_extensions import Required, Annotated, TypedDict
+from typing_extensions import Literal, Required, Annotated, TypedDict
 
 from .._utils import PropertyInfo
 from .function_call_param import FunctionCallParam
 
-__all__ = ["ChatCompletionMessageParam", "MultiContent", "MultiContentImageURL", "ToolCall"]
+__all__ = [
+    "ChatCompletionMessageParam",
+    "Annotation",
+    "AnnotationURLCitation",
+    "MultiContent",
+    "MultiContentImageURL",
+    "ToolCall",
+]
+
+
+class AnnotationURLCitation(TypedDict, total=False):
+    end_index: Required[int]
+
+    start_index: Required[int]
+
+    title: Required[str]
+
+    url: Required[str]
+
+
+class Annotation(TypedDict, total=False):
+    type: Literal["url_citation"]
+
+    url_citation: AnnotationURLCitation
 
 
 class MultiContentImageURL(TypedDict, total=False):
@@ -36,14 +59,16 @@ class ToolCall(TypedDict, total=False):
 
 
 class ChatCompletionMessageParam(TypedDict, total=False):
-    multi_content: Required[Annotated[Iterable[MultiContent], PropertyInfo(alias="MultiContent")]]
+    content: Required[str]
 
     role: Required[str]
 
-    content: str
+    annotations: Iterable[Annotation]
 
     function_call: FunctionCallParam
 
+    multi_content: Annotated[Iterable[MultiContent], PropertyInfo(alias="MultiContent")]
+
     name: str
 
     reasoning_content: str

relaxai/types/{chat_create_completion_response.py → chat_completion_response.py}

@@ -4,13 +4,13 @@ from typing import Dict, List, Optional
 
 from pydantic import Field as FieldInfo
 
-from .usage import Usage
 from .._models import BaseModel
+from .shared.openai_usage import OpenAIUsage
 from .content_filter_results import ContentFilterResults
 from .chat_completion_message import ChatCompletionMessage
 
 __all__ = [
-    "ChatCreateCompletionResponse",
+    "ChatCompletionResponse",
     "Choice",
     "ChoiceLogprobs",
     "ChoiceLogprobsContent",
@@ -59,7 +59,7 @@ class PromptFilterResult(BaseModel):
     content_filter_results: Optional[ContentFilterResults] = None
 
 
-class ChatCreateCompletionResponse(BaseModel):
+class ChatCompletionResponse(BaseModel):
     id: str
 
     choices: List[Choice]
@@ -74,6 +74,6 @@ class ChatCreateCompletionResponse(BaseModel):
 
     system_fingerprint: str
 
-    usage: Usage
+    usage: OpenAIUsage
 
     prompt_filter_results: Optional[List[PromptFilterResult]] = None

relaxai/types/chat_create_completion_params.py

@@ -3,18 +3,26 @@
 from __future__ import annotations
 
 from typing import Dict, List, Iterable
-from typing_extensions import Required, TypedDict
+from typing_extensions import Required, Annotated, TypedDict
 
+from .._utils import PropertyInfo
+from .stream_options_param import StreamOptionsParam
 from .function_definition_param import FunctionDefinitionParam
 from .chat_completion_message_param import ChatCompletionMessageParam
 
 __all__ = [
     "ChatCreateCompletionParams",
+    "ChatTemplateKwargs",
+    "FunctionCall",
+    "ParallelToolCalls",
     "Prediction",
     "ResponseFormat",
     "ResponseFormatJsonSchema",
-    "StreamOptions",
+    "ToolChoice",
     "Tool",
+    "WebSearchOptions",
+    "WebSearchOptionsUserLocation",
+    "WebSearchOptionsUserLocationApproximate",
 ]
 
 
@@ -23,11 +31,17 @@ class ChatCreateCompletionParams(TypedDict, total=False):
 
     model: Required[str]
 
-    chat_template_kwargs: object
+    query_stream: Annotated[bool, PropertyInfo(alias="stream")]
+    """If true, server responds as an SSE stream.
+
+    Generators may produce an ergonomic streaming method when this is set.
+    """
+
+    chat_template_kwargs: ChatTemplateKwargs
 
     frequency_penalty: float
 
-    function_call: object
+    function_call: FunctionCall
 
     functions: Iterable[FunctionDefinitionParam]
 
@@ -43,7 +57,7 @@ class ChatCreateCompletionParams(TypedDict, total=False):
 
     n: int
 
-    parallel_tool_calls: object
+    parallel_tool_calls: ParallelToolCalls
 
     prediction: Prediction
 
@@ -59,13 +73,13 @@ class ChatCreateCompletionParams(TypedDict, total=False):
 
     store: bool
 
-    stream: bool
+    body_stream: Annotated[bool, PropertyInfo(alias="stream")]
 
-    stream_options: StreamOptions
+    stream_options: StreamOptionsParam
 
     temperature: float
 
-    tool_choice: object
+    tool_choice: ToolChoice
 
     tools: Iterable[Tool]
 
@@ -75,6 +89,20 @@ class ChatCreateCompletionParams(TypedDict, total=False):
 
     user: str
 
+    web_search_options: WebSearchOptions
+
+
+class ChatTemplateKwargs(TypedDict, total=False):
+    pass
+
+
+class FunctionCall(TypedDict, total=False):
+    pass
+
+
+class ParallelToolCalls(TypedDict, total=False):
+    pass
+
 
 class Prediction(TypedDict, total=False):
     content: Required[str]
@@ -96,11 +124,35 @@ class ResponseFormat(TypedDict, total=False):
     type: str
 
 
-class StreamOptions(TypedDict, total=False):
-    include_usage: bool
+class ToolChoice(TypedDict, total=False):
+    pass
 
 
 class Tool(TypedDict, total=False):
     type: Required[str]
 
     function: FunctionDefinitionParam
+
+
+class WebSearchOptionsUserLocationApproximate(TypedDict, total=False):
+    city: str
+
+    country: str
+
+    latitude: float
+
+    longitude: float
+
+    state: str
+
+
+class WebSearchOptionsUserLocation(TypedDict, total=False):
+    approximate: WebSearchOptionsUserLocationApproximate
+
+    type: str
+
+
+class WebSearchOptions(TypedDict, total=False):
+    search_context_size: int
+
+    user_location: WebSearchOptionsUserLocation

relaxai/types/{embedding_create_params.py → embedding_create_embedding_params.py}

@@ -4,10 +4,10 @@ from __future__ import annotations
 
 from typing_extensions import Required, TypedDict
 
-__all__ = ["EmbeddingCreateParams"]
+__all__ = ["EmbeddingCreateEmbeddingParams"]
 
 
-class EmbeddingCreateParams(TypedDict, total=False):
+class EmbeddingCreateEmbeddingParams(TypedDict, total=False):
     input: Required[object]
 
     model: Required[str]

relaxai/types/{embedding_create_response.py → embedding_response.py}

@@ -4,10 +4,10 @@ from typing import Dict, List
 
 from pydantic import Field as FieldInfo
 
-from .usage import Usage
 from .._models import BaseModel
+from .shared.openai_usage import OpenAIUsage
 
-__all__ = ["EmbeddingCreateResponse", "Data"]
+__all__ = ["EmbeddingResponse", "Data"]
 
 
 class Data(BaseModel):
@@ -18,7 +18,7 @@ class Data(BaseModel):
     object: str
 
 
-class EmbeddingCreateResponse(BaseModel):
+class EmbeddingResponse(BaseModel):
     data: List[Data]
 
     http_header: Dict[str, List[str]] = FieldInfo(alias="httpHeader")
@@ -27,4 +27,4 @@ class EmbeddingCreateResponse(BaseModel):
 
     object: str
 
-    usage: Usage
+    usage: OpenAIUsage

relaxai/types/function_definition_param.py

@@ -4,13 +4,17 @@ from __future__ import annotations
 
 from typing_extensions import Required, TypedDict
 
-__all__ = ["FunctionDefinitionParam"]
+__all__ = ["FunctionDefinitionParam", "Parameters"]
+
+
+class Parameters(TypedDict, total=False):
+    pass
 
 
 class FunctionDefinitionParam(TypedDict, total=False):
     name: Required[str]
 
-    parameters: Required[object]
+    parameters: Required[Parameters]
 
     description: str
 

relaxai/types/{health_check_response.py → health_response.py}

@@ -2,6 +2,6 @@
 
 from typing_extensions import TypeAlias
 
-__all__ = ["HealthCheckResponse"]
+__all__ = ["HealthResponse"]
 
-HealthCheckResponse: TypeAlias = str
+HealthResponse: TypeAlias = str

relaxai/types/{model_list_response.py → model_list.py}

@@ -7,10 +7,10 @@ from pydantic import Field as FieldInfo
 from .model import Model
 from .._models import BaseModel
 
-__all__ = ["ModelListResponse"]
+__all__ = ["ModelList"]
 
 
-class ModelListResponse(BaseModel):
+class ModelList(BaseModel):
     data: List[Model]
 
     http_header: Dict[str, List[str]] = FieldInfo(alias="httpHeader")

relaxai/types/shared/__init__.py

@@ -0,0 +1,5 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from .openai_usage import OpenAIUsage as OpenAIUsage
+from .openai_prompt_tokens_details import OpenAIPromptTokensDetails as OpenAIPromptTokensDetails
+from .openai_completion_tokens_details import OpenAICompletionTokensDetails as OpenAICompletionTokensDetails

relaxai/types/shared/openai_completion_tokens_details.py

@@ -0,0 +1,15 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["OpenAICompletionTokensDetails"]
+
+
+class OpenAICompletionTokensDetails(BaseModel):
+    accepted_prediction_tokens: int
+
+    audio_tokens: int
+
+    reasoning_tokens: int
+
+    rejected_prediction_tokens: int

relaxai/types/shared/openai_prompt_tokens_details.py

@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+
+__all__ = ["OpenAIPromptTokensDetails"]
+
+
+class OpenAIPromptTokensDetails(BaseModel):
+    audio_tokens: int
+
+    cached_tokens: int

relaxai/types/shared/openai_usage.py

@@ -0,0 +1,19 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from ..._models import BaseModel
+from .openai_prompt_tokens_details import OpenAIPromptTokensDetails
+from .openai_completion_tokens_details import OpenAICompletionTokensDetails
+
+__all__ = ["OpenAIUsage"]
+
+
+class OpenAIUsage(BaseModel):
+    completion_tokens: int
+
+    completion_tokens_details: OpenAICompletionTokensDetails
+
+    prompt_tokens: int
+
+    prompt_tokens_details: OpenAIPromptTokensDetails
+
+    total_tokens: int

relaxai/types/stream_options_param.py

@@ -0,0 +1,11 @@
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing_extensions import TypedDict
+
+__all__ = ["StreamOptionsParam"]
+
+
+class StreamOptionsParam(TypedDict, total=False):
+    include_usage: bool