mistralai 1.5.1__py3-none-any.whl → 1.5.2rc1__py3-none-any.whl

mistralai_azure/models/responseformat.py

@@ -1,8 +1,16 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
+from .jsonschema import JSONSchema, JSONSchemaTypedDict
 from .responseformats import ResponseFormats
-from mistralai_azure.types import BaseModel
+from mistralai_azure.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
+from pydantic import model_serializer
 from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
@@ -10,8 +18,41 @@ from typing_extensions import NotRequired, TypedDict
 class ResponseFormatTypedDict(TypedDict):
     type: NotRequired[ResponseFormats]
     r"""An object specifying the format that the model must output. Setting to `{ \"type\": \"json_object\" }` enables JSON mode, which guarantees the message the model generates is in JSON. When using JSON mode you MUST also instruct the model to produce JSON yourself with a system or a user message."""
+    json_schema: NotRequired[Nullable[JSONSchemaTypedDict]]
 
 
 class ResponseFormat(BaseModel):
     type: Optional[ResponseFormats] = None
     r"""An object specifying the format that the model must output. Setting to `{ \"type\": \"json_object\" }` enables JSON mode, which guarantees the message the model generates is in JSON. When using JSON mode you MUST also instruct the model to produce JSON yourself with a system or a user message."""
+
+    json_schema: OptionalNullable[JSONSchema] = UNSET
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["type", "json_schema"]
+        nullable_fields = ["json_schema"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in self.model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m

mistralai_azure/models/responseformats.py

@@ -4,5 +4,5 @@ from __future__ import annotations
 from typing import Literal
 
 
-ResponseFormats = Literal["text", "json_object"]
+ResponseFormats = Literal["text", "json_object", "json_schema"]
 r"""An object specifying the format that the model must output. Setting to `{ \"type\": \"json_object\" }` enables JSON mode, which guarantees the message the model generates is in JSON. When using JSON mode you MUST also instruct the model to produce JSON yourself with a system or a user message."""

mistralai_azure/models/toolcall.py

@@ -14,6 +14,7 @@ class ToolCallTypedDict(TypedDict):
     function: FunctionCallTypedDict
     id: NotRequired[str]
     type: NotRequired[ToolTypes]
+    index: NotRequired[int]
 
 
 class ToolCall(BaseModel):
@@ -24,3 +25,5 @@ class ToolCall(BaseModel):
     type: Annotated[Optional[ToolTypes], PlainValidator(validate_open_enum(False))] = (
         None
     )
+
+    index: Optional[int] = 0

mistralai_azure/sdk.py

@@ -1,17 +1,19 @@
-"""Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from typing import Any, Callable, Dict, Optional, Union
+import weakref
+from typing import Any, Callable, Dict, Optional, Union, cast
 
 import httpx
+
 from mistralai_azure import models, utils
 from mistralai_azure._hooks import SDKHooks
 from mistralai_azure.chat import Chat
-from mistralai_azure.types import Nullable
+from mistralai_azure.types import UNSET, OptionalNullable
 
 from .basesdk import BaseSDK
-from .httpclient import AsyncHttpClient, HttpClient
+from .httpclient import AsyncHttpClient, ClientOwner, HttpClient, close_clients
 from .sdkconfiguration import SDKConfiguration
-from .utils.logger import Logger, NoOpLogger
+from .utils.logger import Logger, get_default_logger
 from .utils.retries import RetryConfig
 
 
@@ -19,7 +21,7 @@ class MistralAzure(BaseSDK):
     r"""Mistral AI API: Our Chat Completion and Embeddings APIs specification. Create your account on [La Plateforme](https://console.mistral.ai) to get access and read the [docs](https://docs.mistral.ai) to learn how to use it."""
 
     chat: Chat
-    r"""Chat Completion API"""
+    r"""Chat Completion API."""
 
     def __init__(
         self,
@@ -28,7 +30,8 @@ class MistralAzure(BaseSDK):
         url_params: Optional[Dict[str, str]] = None,
         client: Optional[HttpClient] = None,
         async_client: Optional[AsyncHttpClient] = None,
-        retry_config: Optional[Nullable[RetryConfig]] = None,
+        retry_config: OptionalNullable[RetryConfig] = UNSET,
+        timeout_ms: Optional[int] = None,
         debug_logger: Optional[Logger] = None,
     ) -> None:
         r"""Instantiates the SDK configuring it with the provided parameters.
@@ -39,7 +42,9 @@ class MistralAzure(BaseSDK):
         :param client: The HTTP client to use for all synchronous methods
         :param async_client: The Async HTTP client to use for all asynchronous methods
         :param retry_config: The retry configuration to use for all supported methods
+        :param timeout_ms: Optional request timeout applied to each operation in milliseconds
         """
+
         # if azure_endpoint doesn't end with `/v1` add it
         if not azure_endpoint.endswith("/"):
             azure_endpoint += "/"
@@ -47,28 +52,30 @@ class MistralAzure(BaseSDK):
             azure_endpoint += "v1/"
         server_url = azure_endpoint
 
+        client_supplied = True
         if client is None:
             client = httpx.Client()
+            client_supplied = False
 
         assert issubclass(
             type(client), HttpClient
         ), "The provided client must implement the HttpClient protocol."
 
+        async_client_supplied = True
         if async_client is None:
             async_client = httpx.AsyncClient()
+            async_client_supplied = False
+
+        if debug_logger is None:
+            debug_logger = get_default_logger()
 
         assert issubclass(
             type(async_client), AsyncHttpClient
         ), "The provided async_client must implement the AsyncHttpClient protocol."
 
-        if debug_logger is None:
-            debug_logger = NoOpLogger()
-
         security: Any = None
         if callable(azure_api_key):
-            security = lambda: models.Security(  # pylint: disable=unnecessary-lambda-assignment
-                api_key=azure_api_key()
-            )
+            security = lambda: models.Security(api_key=azure_api_key())  # pylint: disable=unnecessary-lambda-assignment
         else:
             security = models.Security(api_key=azure_api_key)
 
@@ -80,11 +87,14 @@ class MistralAzure(BaseSDK):
             self,
             SDKConfiguration(
                 client=client,
+                client_supplied=client_supplied,
                 async_client=async_client,
+                async_client_supplied=async_client_supplied,
                 security=security,
                 server_url=server_url,
                 server=None,
                 retry_config=retry_config,
+                timeout_ms=timeout_ms,
                 debug_logger=debug_logger,
             ),
         )
@@ -93,7 +103,7 @@ class MistralAzure(BaseSDK):
 
         current_server_url, *_ = self.sdk_configuration.get_server_details()
         server_url, self.sdk_configuration.client = hooks.sdk_init(
-            current_server_url, self.sdk_configuration.client
+            current_server_url, client
         )
         if current_server_url != server_url:
             self.sdk_configuration.server_url = server_url
@@ -101,7 +111,39 @@ class MistralAzure(BaseSDK):
         # pylint: disable=protected-access
         self.sdk_configuration.__dict__["_hooks"] = hooks
 
+        weakref.finalize(
+            self,
+            close_clients,
+            cast(ClientOwner, self.sdk_configuration),
+            self.sdk_configuration.client,
+            self.sdk_configuration.client_supplied,
+            self.sdk_configuration.async_client,
+            self.sdk_configuration.async_client_supplied,
+        )
+
         self._init_sdks()
 
     def _init_sdks(self):
         self.chat = Chat(self.sdk_configuration)
+
+    def __enter__(self):
+        return self
+
+    async def __aenter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if (
+            self.sdk_configuration.client is not None
+            and not self.sdk_configuration.client_supplied
+        ):
+            self.sdk_configuration.client.close()
+        self.sdk_configuration.client = None
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        if (
+            self.sdk_configuration.async_client is not None
+            and not self.sdk_configuration.async_client_supplied
+        ):
+            await self.sdk_configuration.async_client.aclose()
+        self.sdk_configuration.async_client = None

mistralai_azure/sdkconfiguration.py

@@ -1,6 +1,12 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from ._hooks import SDKHooks
+from ._version import (
+    __gen_version__,
+    __openapi_doc_version__,
+    __user_agent__,
+    __version__,
+)
 from .httpclient import AsyncHttpClient, HttpClient
 from .utils import Logger, RetryConfig, remove_suffix
 from dataclasses import dataclass
@@ -20,17 +26,19 @@ SERVERS = {
 
 @dataclass
 class SDKConfiguration:
-    client: HttpClient
-    async_client: AsyncHttpClient
+    client: Union[HttpClient, None]
+    client_supplied: bool
+    async_client: Union[AsyncHttpClient, None]
+    async_client_supplied: bool
     debug_logger: Logger
     security: Optional[Union[models.Security, Callable[[], models.Security]]] = None
     server_url: Optional[str] = ""
     server: Optional[str] = ""
     language: str = "python"
-    openapi_doc_version: str = "0.0.2"
-    sdk_version: str = "1.2.6"
-    gen_version: str = "2.486.1"
-    user_agent: str = "speakeasy-sdk/python 1.2.6 2.486.1 0.0.2 mistralai_azure"
+    openapi_doc_version: str = __openapi_doc_version__
+    sdk_version: str = __version__
+    gen_version: str = __gen_version__
+    user_agent: str = __user_agent__
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 

mistralai_azure/utils/__init__.py

@@ -42,6 +42,7 @@ from .values import (
     match_content_type,
     match_status_codes,
     match_response,
+    cast_partial,
 )
 from .logger import Logger, get_body_content, get_default_logger
 
@@ -94,4 +95,5 @@ __all__ = [
     "validate_float",
     "validate_int",
     "validate_open_enum",
+    "cast_partial",
 ]

mistralai_azure/utils/serializers.py

@@ -7,14 +7,15 @@ import httpx
 from typing_extensions import get_origin
 from pydantic import ConfigDict, create_model
 from pydantic_core import from_json
-from typing_inspect import is_optional_type
+from typing_inspection.typing_objects import is_union
 
 from ..types.basemodel import BaseModel, Nullable, OptionalNullable, Unset
 
 
 def serialize_decimal(as_str: bool):
     def serialize(d):
-        if is_optional_type(type(d)) and d is None:
+        # Optional[T] is a Union[T, None]
+        if is_union(type(d)) and type(None) in get_args(type(d)) and d is None:
             return None
         if isinstance(d, Unset):
             return d
@@ -42,7 +43,8 @@ def validate_decimal(d):
 
 def serialize_float(as_str: bool):
     def serialize(f):
-        if is_optional_type(type(f)) and f is None:
+        # Optional[T] is a Union[T, None]
+        if is_union(type(f)) and type(None) in get_args(type(f)) and f is None:
             return None
         if isinstance(f, Unset):
             return f
@@ -70,7 +72,8 @@ def validate_float(f):
 
 def serialize_int(as_str: bool):
     def serialize(i):
-        if is_optional_type(type(i)) and i is None:
+        # Optional[T] is a Union[T, None]
+        if is_union(type(i)) and type(None) in get_args(type(i)) and i is None:
             return None
         if isinstance(i, Unset):
             return i
@@ -118,7 +121,8 @@ def validate_open_enum(is_int: bool):
 
 def validate_const(v):
     def validate(c):
-        if is_optional_type(type(c)) and c is None:
+        # Optional[T] is a Union[T, None]
+        if is_union(type(c)) and type(None) in get_args(type(c)) and c is None:
             return None
 
         if v != c:
@@ -163,7 +167,7 @@ def marshal_json(val, typ):
     if len(d) == 0:
         return ""
 
-    return json.dumps(d[next(iter(d))], separators=(",", ":"), sort_keys=True)
+    return json.dumps(d[next(iter(d))], separators=(",", ":"))
 
 
 def is_nullable(field):

mistralai_azure/utils/values.py

@@ -3,8 +3,9 @@
 from datetime import datetime
 from enum import Enum
 from email.message import Message
+from functools import partial
 import os
-from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar, Union, cast
 
 from httpx import Response
 from pydantic import BaseModel
@@ -51,6 +52,8 @@ def match_status_codes(status_codes: List[str], status_code: int) -> bool:
 
 T = TypeVar("T")
 
+def cast_partial(typ):
+    return partial(cast, typ)
 
 def get_global_from_env(
     value: Optional[T], env_key: str, type_cast: Callable[[str], T]

mistralai_gcp/__init__.py

@@ -1,9 +1,18 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from ._version import __title__, __version__
+from ._version import (
+    __title__,
+    __version__,
+    __openapi_doc_version__,
+    __gen_version__,
+    __user_agent__,
+)
 from .sdk import *
 from .sdkconfiguration import *
 from .models import *
 
 
 VERSION: str = __version__
+OPENAPI_DOC_VERSION = __openapi_doc_version__
+SPEAKEASY_GENERATOR_VERSION = __gen_version__
+USER_AGENT = __user_agent__

mistralai_gcp/_hooks/types.py

@@ -7,16 +7,19 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 
 
 class HookContext:
+    base_url: str
     operation_id: str
     oauth2_scopes: Optional[List[str]] = None
     security_source: Optional[Union[Any, Callable[[], Any]]] = None
 
     def __init__(
         self,
+        base_url: str,
         operation_id: str,
         oauth2_scopes: Optional[List[str]],
         security_source: Optional[Union[Any, Callable[[], Any]]],
     ):
+        self.base_url = base_url
         self.operation_id = operation_id
         self.oauth2_scopes = oauth2_scopes
         self.security_source = security_source
@@ -25,21 +28,30 @@ class HookContext:
 class BeforeRequestContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
-            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+            hook_ctx.base_url,
+            hook_ctx.operation_id,
+            hook_ctx.oauth2_scopes,
+            hook_ctx.security_source,
         )
 
 
 class AfterSuccessContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
-            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+            hook_ctx.base_url,
+            hook_ctx.operation_id,
+            hook_ctx.oauth2_scopes,
+            hook_ctx.security_source,
         )
 
 
 class AfterErrorContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
-            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+            hook_ctx.base_url,
+            hook_ctx.operation_id,
+            hook_ctx.oauth2_scopes,
+            hook_ctx.security_source,
         )
 
 

mistralai_gcp/_version.py

@@ -4,6 +4,9 @@ import importlib.metadata
 
 __title__: str = "mistralai-gcp"
 __version__: str = "1.2.6"
+__openapi_doc_version__: str = "0.0.2"
+__gen_version__: str = "2.548.6"
+__user_agent__: str = "speakeasy-sdk/python 1.2.6 2.548.6 0.0.2 mistralai-gcp"
 
 try:
     if __package__ is not None:

mistralai_gcp/basesdk.py

@@ -231,6 +231,10 @@ class BaseSDK:
                     req.headers,
                     get_body_content(req),
                 )
+
+                if client is None:
+                    raise ValueError("client is required")
+
                 http_res = client.send(req, stream=stream)
             except Exception as e:
                 _, e = self.sdk_configuration.get_hooks().after_error(
@@ -303,6 +307,10 @@ class BaseSDK:
                     req.headers,
                     get_body_content(req),
                 )
+
+                if client is None:
+                    raise ValueError("client is required")
+
                 http_res = await client.send(req, stream=stream)
             except Exception as e:
                 _, e = self.sdk_configuration.get_hooks().after_error(