mistralai 1.0.3__py3-none-any.whl → 1.2.0__py3-none-any.whl

mistralai_azure/models/toolcall.py

@@ -2,23 +2,25 @@
 
 from __future__ import annotations
 from .functioncall import FunctionCall, FunctionCallTypedDict
-from mistralai_azure.types import BaseModel, UnrecognizedStr
+from .tooltypes import ToolTypes
+from mistralai_azure.types import BaseModel
 from mistralai_azure.utils import validate_open_enum
 from pydantic.functional_validators import PlainValidator
-from typing import Literal, Optional, TypedDict, Union
-from typing_extensions import Annotated, NotRequired
+from typing import Optional
+from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-ToolTypes = Union[Literal["function"], UnrecognizedStr]
-
 class ToolCallTypedDict(TypedDict):
     function: FunctionCallTypedDict
     id: NotRequired[str]
     type: NotRequired[ToolTypes]
-    
+
 
 class ToolCall(BaseModel):
     function: FunctionCall
+
     id: Optional[str] = "null"
-    type: Annotated[Optional[ToolTypes], PlainValidator(validate_open_enum(False))] = "function"
-    
+
+    type: Annotated[Optional[ToolTypes], PlainValidator(validate_open_enum(False))] = (
+        None
+    )

mistralai_azure/models/toolchoice.py

@@ -0,0 +1,29 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from .functionname import FunctionName, FunctionNameTypedDict
+from .tooltypes import ToolTypes
+from mistralai_azure.types import BaseModel
+from mistralai_azure.utils import validate_open_enum
+from pydantic.functional_validators import PlainValidator
+from typing import Optional
+from typing_extensions import Annotated, NotRequired, TypedDict
+
+
+class ToolChoiceTypedDict(TypedDict):
+    r"""ToolChoice is either a ToolChoiceEnum or a ToolChoice"""
+
+    function: FunctionNameTypedDict
+    r"""this restriction of `Function` is used to select a specific function to call"""
+    type: NotRequired[ToolTypes]
+
+
+class ToolChoice(BaseModel):
+    r"""ToolChoice is either a ToolChoiceEnum or a ToolChoice"""
+
+    function: FunctionName
+    r"""this restriction of `Function` is used to select a specific function to call"""
+
+    type: Annotated[Optional[ToolTypes], PlainValidator(validate_open_enum(False))] = (
+        None
+    )

mistralai_azure/models/toolchoiceenum.py

@@ -0,0 +1,7 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from typing import Literal
+
+
+ToolChoiceEnum = Literal["auto", "none", "any", "required"]

mistralai_azure/models/toolmessage.py

@@ -1,27 +1,37 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from mistralai_azure.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
+from mistralai_azure.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
 from pydantic import model_serializer
-from typing import Literal, Optional, TypedDict
-from typing_extensions import NotRequired
+from typing import Literal, Optional
+from typing_extensions import NotRequired, TypedDict
 
 
 ToolMessageRole = Literal["tool"]
 
+
 class ToolMessageTypedDict(TypedDict):
     content: str
     tool_call_id: NotRequired[Nullable[str]]
     name: NotRequired[Nullable[str]]
     role: NotRequired[ToolMessageRole]
-    
+
 
 class ToolMessage(BaseModel):
     content: str
+
     tool_call_id: OptionalNullable[str] = UNSET
+
     name: OptionalNullable[str] = UNSET
+
     role: Optional[ToolMessageRole] = "tool"
-    
+
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
         optional_fields = ["tool_call_id", "name", "role"]
@@ -35,9 +45,13 @@ class ToolMessage(BaseModel):
         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
+            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
@@ -47,4 +61,3 @@ class ToolMessage(BaseModel):
                 m[k] = val
 
         return m
-        

mistralai_azure/models/tooltypes.py

@@ -0,0 +1,8 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from mistralai_azure.types import UnrecognizedStr
+from typing import Literal, Union
+
+
+ToolTypes = Union[Literal["function"], UnrecognizedStr]

mistralai_azure/models/usageinfo.py

@@ -2,17 +2,18 @@
 
 from __future__ import annotations
 from mistralai_azure.types import BaseModel
-from typing import TypedDict
+from typing_extensions import TypedDict
 
 
 class UsageInfoTypedDict(TypedDict):
     prompt_tokens: int
     completion_tokens: int
     total_tokens: int
-    
+
 
 class UsageInfo(BaseModel):
     prompt_tokens: int
+
     completion_tokens: int
+
     total_tokens: int
-    

mistralai_azure/models/usermessage.py

@@ -1,26 +1,58 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .textchunk import TextChunk, TextChunkTypedDict
-from mistralai_azure.types import BaseModel
-from typing import List, Literal, Optional, TypedDict, Union
-from typing_extensions import NotRequired
+from .contentchunk import ContentChunk, ContentChunkTypedDict
+from mistralai_azure.types import BaseModel, Nullable, UNSET_SENTINEL
+from pydantic import model_serializer
+from typing import List, Literal, Optional, Union
+from typing_extensions import NotRequired, TypedDict
 
 
-UserMessageContentTypedDict = Union[str, List[TextChunkTypedDict]]
+UserMessageContentTypedDict = Union[str, List[ContentChunkTypedDict]]
 
 
-UserMessageContent = Union[str, List[TextChunk]]
+UserMessageContent = Union[str, List[ContentChunk]]
 
 
 UserMessageRole = Literal["user"]
 
+
 class UserMessageTypedDict(TypedDict):
-    content: UserMessageContentTypedDict
+    content: Nullable[UserMessageContentTypedDict]
     role: NotRequired[UserMessageRole]
-    
+
 
 class UserMessage(BaseModel):
-    content: UserMessageContent
+    content: Nullable[UserMessageContent]
+
     role: Optional[UserMessageRole] = "user"
-    
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["role"]
+        nullable_fields = ["content"]
+        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/validationerror.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 from mistralai_azure.types import BaseModel
-from typing import List, TypedDict, Union
+from typing import List, Union
+from typing_extensions import TypedDict
 
 
 LocTypedDict = Union[str, int]
@@ -15,10 +16,11 @@ class ValidationErrorTypedDict(TypedDict):
     loc: List[LocTypedDict]
     msg: str
     type: str
-    
+
 
 class ValidationError(BaseModel):
     loc: List[Loc]
+
     msg: str
+
     type: str
-    

mistralai_azure/sdkconfiguration.py

@@ -1,6 +1,5 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-
 from ._hooks import SDKHooks
 from .httpclient import AsyncHttpClient, HttpClient
 from .utils import Logger, RetryConfig, remove_suffix
@@ -11,10 +10,10 @@ from pydantic import Field
 from typing import Callable, Dict, Optional, Tuple, Union
 
 
-SERVER_PROD = "prod"
-r"""Production server"""
+SERVER_EU = "eu"
+r"""EU Production server"""
 SERVERS = {
-	SERVER_PROD: "https://api.mistral.ai",
+    SERVER_EU: "https://api.mistral.ai",
 }
 """Contains the list of servers available to the SDK"""
 
@@ -24,14 +23,14 @@ class SDKConfiguration:
     client: HttpClient
     async_client: AsyncHttpClient
     debug_logger: Logger
-    security: Optional[Union[models.Security,Callable[[], models.Security]]] = None
+    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.0.1"
-    gen_version: str = "2.399.0"
-    user_agent: str = "speakeasy-sdk/python 1.0.1 2.399.0 0.0.2 mistralai_azure"
+    sdk_version: str = "1.2.0"
+    gen_version: str = "2.452.0"
+    user_agent: str = "speakeasy-sdk/python 1.2.0 2.452.0 0.0.2 mistralai_azure"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 
@@ -42,13 +41,12 @@ class SDKConfiguration:
         if self.server_url is not None and self.server_url:
             return remove_suffix(self.server_url, "/"), {}
         if not self.server:
-            self.server = SERVER_PROD
+            self.server = SERVER_EU
 
         if self.server not in SERVERS:
-            raise ValueError(f"Invalid server \"{self.server}\"")
+            raise ValueError(f'Invalid server "{self.server}"')
 
         return SERVERS[self.server], {}
 
-
     def get_hooks(self) -> SDKHooks:
         return self._hooks

mistralai_azure/utils/__init__.py

@@ -27,14 +27,23 @@ from .serializers import (
     serialize_float,
     serialize_int,
     stream_to_text,
+    stream_to_text_async,
+    stream_to_bytes,
+    stream_to_bytes_async,
+    validate_const,
     validate_decimal,
     validate_float,
     validate_int,
     validate_open_enum,
 )
 from .url import generate_url, template_url, remove_suffix
-from .values import get_global_from_env, match_content_type, match_status_codes, match_response
-from .logger import Logger, get_body_content, NoOpLogger
+from .values import (
+    get_global_from_env,
+    match_content_type,
+    match_status_codes,
+    match_response,
+)
+from .logger import Logger, get_body_content, get_default_logger
 
 __all__ = [
     "BackoffStrategy",
@@ -43,6 +52,7 @@ __all__ = [
     "FormMetadata",
     "generate_url",
     "get_body_content",
+    "get_default_logger",
     "get_discriminator",
     "get_global_from_env",
     "get_headers",
@@ -57,7 +67,6 @@ __all__ = [
     "match_status_codes",
     "match_response",
     "MultipartFormMetadata",
-    "NoOpLogger",
     "OpenEnumMeta",
     "PathParamMetadata",
     "QueryParamMetadata",
@@ -74,10 +83,14 @@ __all__ = [
     "serialize_request_body",
     "SerializedRequestBody",
     "stream_to_text",
+    "stream_to_text_async",
+    "stream_to_bytes",
+    "stream_to_bytes_async",
     "template_url",
     "unmarshal",
     "unmarshal_json",
     "validate_decimal",
+    "validate_const",
     "validate_float",
     "validate_int",
     "validate_open_enum",

mistralai_azure/utils/annotations.py

@@ -1,5 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
+from enum import Enum
 from typing import Any
 
 def get_discriminator(model: Any, fieldname: str, key: str) -> str:
@@ -10,10 +11,20 @@ def get_discriminator(model: Any, fieldname: str, key: str) -> str:
             raise ValueError(f'Could not find discriminator key {key} in {model}') from e
 
     if hasattr(model, fieldname):
-        return f'{getattr(model, fieldname)}'
+        attr = getattr(model, fieldname)
+
+        if isinstance(attr, Enum):
+            return f'{attr.value}'
+
+        return f'{attr}'
 
     fieldname = fieldname.upper()
     if hasattr(model, fieldname):
-        return f'{getattr(model, fieldname)}'
+        attr = getattr(model, fieldname)
+
+        if isinstance(attr, Enum):
+            return f'{attr.value}'
+
+        return f'{attr}'
 
     raise ValueError(f'Could not find discriminator field {fieldname} in {model}')

mistralai_azure/utils/forms.py

@@ -17,7 +17,7 @@ from .metadata import (
     MultipartFormMetadata,
     find_field_metadata,
 )
-from .values import _val_to_string
+from .values import _is_set, _val_to_string
 
 
 def _populate_form(
@@ -27,7 +27,7 @@ def _populate_form(
     delimiter: str,
     form: Dict[str, List[str]],
 ):
-    if obj is None:
+    if not _is_set(obj):
         return form
 
     if isinstance(obj, BaseModel):
@@ -41,7 +41,7 @@ def _populate_form(
                 continue
 
             val = getattr(obj, name)
-            if val is None:
+            if not _is_set(val):
                 continue
 
             if explode:
@@ -54,7 +54,7 @@ def _populate_form(
     elif isinstance(obj, Dict):
         items = []
         for key, value in obj.items():
-            if value is None:
+            if not _is_set(value):
                 continue
 
             if explode:
@@ -68,7 +68,7 @@ def _populate_form(
         items = []
 
         for value in obj:
-            if value is None:
+            if not _is_set(value):
                 continue
 
             if explode:
@@ -102,7 +102,7 @@ def serialize_multipart_form(
         field = request_fields[name]
 
         val = getattr(request, name)
-        if val is None:
+        if not _is_set(val):
             continue
 
         field_metadata = find_field_metadata(field, MultipartFormMetadata)
@@ -156,7 +156,7 @@ def serialize_multipart_form(
                 values = []
 
                 for value in val:
-                    if value is None:
+                    if not _is_set(value):
                         continue
                     values.append(_val_to_string(value))
 
@@ -176,7 +176,7 @@ def serialize_form_data(data: Any) -> Dict[str, Any]:
             field = data_fields[name]
 
             val = getattr(data, name)
-            if val is None:
+            if not _is_set(val):
                 continue
 
             metadata = find_field_metadata(field, FormMetadata)
@@ -200,7 +200,8 @@ def serialize_form_data(data: Any) -> Dict[str, Any]:
                     raise ValueError(f"Invalid form style for field {name}")
     elif isinstance(data, Dict):
         for key, value in data.items():
-            form[key] = [_val_to_string(value)]
+            if _is_set(value):
+                form[key] = [_val_to_string(value)]
     else:
         raise TypeError(f"Invalid request body type {type(data)} for form data")
 

mistralai_azure/utils/headers.py

@@ -15,16 +15,16 @@ from .metadata import (
     find_field_metadata,
 )
 
-from .values import _populate_from_globals, _val_to_string
+from .values import _is_set, _populate_from_globals, _val_to_string
 
 
 def get_headers(headers_params: Any, gbls: Optional[Any] = None) -> Dict[str, str]:
     headers: Dict[str, str] = {}
 
     globals_already_populated = []
-    if headers_params is not None:
+    if _is_set(headers_params):
         globals_already_populated = _populate_headers(headers_params, gbls, headers, [])
-    if gbls is not None:
+    if _is_set(gbls):
         _populate_headers(gbls, None, headers, globals_already_populated)
 
     return headers
@@ -67,7 +67,7 @@ def _populate_headers(
 
 
 def _serialize_header(explode: bool, obj: Any) -> str:
-    if obj is None:
+    if not _is_set(obj):
         return ""
 
     if isinstance(obj, BaseModel):
@@ -83,7 +83,7 @@ def _serialize_header(explode: bool, obj: Any) -> str:
             f_name = obj_field.alias if obj_field.alias is not None else name
 
             val = getattr(obj, name)
-            if val is None:
+            if not _is_set(val):
                 continue
 
             if explode:
@@ -98,7 +98,7 @@ def _serialize_header(explode: bool, obj: Any) -> str:
         items = []
 
         for key, value in obj.items():
-            if value is None:
+            if not _is_set(value):
                 continue
 
             if explode:
@@ -113,14 +113,14 @@ def _serialize_header(explode: bool, obj: Any) -> str:
         items = []
 
         for value in obj:
-            if value is None:
+            if not _is_set(value):
                 continue
 
             items.append(_val_to_string(value))
 
         if len(items) > 0:
             return ",".join(items)
-    else:
+    elif _is_set(obj):
         return f"{_val_to_string(obj)}"
 
     return ""

mistralai_azure/utils/logger.py

@@ -3,14 +3,20 @@
 import httpx
 from typing import Any, Protocol
 
+
 class Logger(Protocol):
     def debug(self, msg: str, *args: Any, **kwargs: Any) -> None:
         pass
 
+
 class NoOpLogger:
     def debug(self, msg: str, *args: Any, **kwargs: Any) -> None:
         pass
 
+
 def get_body_content(req: httpx.Request) -> str:
     return "<streaming body>" if not hasattr(req, "_content") else str(req.content)
 
+
+def get_default_logger() -> Logger:
+    return NoOpLogger()

mistralai_azure/utils/queryparams.py

@@ -15,7 +15,12 @@ from .metadata import (
     QueryParamMetadata,
     find_field_metadata,
 )
-from .values import _get_serialized_params, _populate_from_globals, _val_to_string
+from .values import (
+    _get_serialized_params,
+    _is_set,
+    _populate_from_globals,
+    _val_to_string,
+)
 from .forms import _populate_form
 
 
@@ -26,7 +31,7 @@ def get_query_params(
     params: Dict[str, List[str]] = {}
 
     globals_already_populated = _populate_query_params(query_params, gbls, params, [])
-    if gbls is not None:
+    if _is_set(gbls):
         _populate_query_params(gbls, None, params, globals_already_populated)
 
     return params
@@ -55,7 +60,7 @@ def _populate_query_params(
         if not metadata:
             continue
 
-        value = getattr(query_params, name) if query_params is not None else None
+        value = getattr(query_params, name) if _is_set(query_params) else None
 
         value, global_found = _populate_from_globals(
             name, value, QueryParamMetadata, gbls
@@ -99,7 +104,7 @@ def _populate_deep_object_query_params(
     obj: Any,
     params: Dict[str, List[str]],
 ):
-    if obj is None:
+    if not _is_set(obj):
         return
 
     if isinstance(obj, BaseModel):
@@ -113,10 +118,7 @@ def _populate_deep_object_query_params_basemodel(
     obj: Any,
     params: Dict[str, List[str]],
 ):
-    if obj is None:
-        return
-
-    if not isinstance(obj, BaseModel):
+    if not _is_set(obj) or not isinstance(obj, BaseModel):
         return
 
     obj_fields: Dict[str, FieldInfo] = obj.__class__.model_fields
@@ -128,11 +130,11 @@ def _populate_deep_object_query_params_basemodel(
         params_key = f"{prior_params_key}[{f_name}]"
 
         obj_param_metadata = find_field_metadata(obj_field, QueryParamMetadata)
-        if obj_param_metadata is None:
+        if not _is_set(obj_param_metadata):
             continue
 
         obj_val = getattr(obj, name)
-        if obj_val is None:
+        if not _is_set(obj_val):
             continue
 
         if isinstance(obj_val, BaseModel):
@@ -150,11 +152,11 @@ def _populate_deep_object_query_params_dict(
     value: Dict,
     params: Dict[str, List[str]],
 ):
-    if value is None:
+    if not _is_set(value):
         return
 
     for key, val in value.items():
-        if val is None:
+        if not _is_set(val):
             continue
 
         params_key = f"{prior_params_key}[{key}]"
@@ -174,11 +176,11 @@ def _populate_deep_object_query_params_list(
     value: List,
     params: Dict[str, List[str]],
 ):
-    if value is None:
+    if not _is_set(value):
         return
 
     for val in value:
-        if val is None:
+        if not _is_set(val):
             continue
 
         if params.get(params_key) is None:

mistralai_azure/utils/retries.py

@@ -1,5 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
+import asyncio
 import random
 import time
 from typing import List
@@ -212,5 +213,5 @@ async def retry_with_backoff_async(
                 raise
             sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
             sleep = min(sleep, max_interval / 1000)
-            time.sleep(sleep)
+            await asyncio.sleep(sleep)
             retries += 1