mistralai 1.10.1__py3-none-any.whl → 1.12.0__py3-none-any.whl

mistralai_gcp/models/systemmessage.py

@@ -21,7 +21,7 @@ SystemMessageContent = TypeAliasType(
 )
 
 
-Role = Literal["system"]
+Role = Literal["system",]
 
 
 class SystemMessageTypedDict(TypedDict):

mistralai_gcp/models/textchunk.py

@@ -6,7 +6,7 @@ from typing import Literal, Optional
 from typing_extensions import NotRequired, TypedDict
 
 
-Type = Literal["text"]
+Type = Literal["text",]
 
 
 class TextChunkTypedDict(TypedDict):

mistralai_gcp/models/thinkchunk.py

@@ -16,7 +16,7 @@ ThinkingTypedDict = TypeAliasType(
 Thinking = TypeAliasType("Thinking", Union[ReferenceChunk, TextChunk])
 
 
-ThinkChunkType = Literal["thinking"]
+ThinkChunkType = Literal["thinking",]
 
 
 class ThinkChunkTypedDict(TypedDict):

mistralai_gcp/models/tool.py

@@ -4,10 +4,8 @@ from __future__ import annotations
 from .function import Function, FunctionTypedDict
 from .tooltypes import ToolTypes
 from mistralai_gcp.types import BaseModel
-from mistralai_gcp.utils import validate_open_enum
-from pydantic.functional_validators import PlainValidator
 from typing import Optional
-from typing_extensions import Annotated, NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 
 class ToolTypedDict(TypedDict):
@@ -18,6 +16,4 @@ class ToolTypedDict(TypedDict):
 class Tool(BaseModel):
     function: Function
 
-    type: Annotated[Optional[ToolTypes], PlainValidator(validate_open_enum(False))] = (
-        None
-    )
+    type: Optional[ToolTypes] = None

mistralai_gcp/models/toolcall.py

@@ -4,10 +4,8 @@ from __future__ import annotations
 from .functioncall import FunctionCall, FunctionCallTypedDict
 from .tooltypes import ToolTypes
 from mistralai_gcp.types import BaseModel
-from mistralai_gcp.utils import validate_open_enum
-from pydantic.functional_validators import PlainValidator
 from typing import Optional
-from typing_extensions import Annotated, NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 
 class ToolCallTypedDict(TypedDict):
@@ -22,8 +20,6 @@ class ToolCall(BaseModel):
 
     id: Optional[str] = "null"
 
-    type: Annotated[Optional[ToolTypes], PlainValidator(validate_open_enum(False))] = (
-        None
-    )
+    type: Optional[ToolTypes] = None
 
     index: Optional[int] = 0

mistralai_gcp/models/toolchoice.py

@@ -4,10 +4,8 @@ from __future__ import annotations
 from .functionname import FunctionName, FunctionNameTypedDict
 from .tooltypes import ToolTypes
 from mistralai_gcp.types import BaseModel
-from mistralai_gcp.utils import validate_open_enum
-from pydantic.functional_validators import PlainValidator
 from typing import Optional
-from typing_extensions import Annotated, NotRequired, TypedDict
+from typing_extensions import NotRequired, TypedDict
 
 
 class ToolChoiceTypedDict(TypedDict):
@@ -24,6 +22,4 @@ class ToolChoice(BaseModel):
     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
-    )
+    type: Optional[ToolTypes] = None

mistralai_gcp/models/toolchoiceenum.py

@@ -4,4 +4,9 @@ from __future__ import annotations
 from typing import Literal
 
 
-ToolChoiceEnum = Literal["auto", "none", "any", "required"]
+ToolChoiceEnum = Literal[
+    "auto",
+    "none",
+    "any",
+    "required",
+]

mistralai_gcp/models/toolmessage.py

@@ -22,7 +22,7 @@ ToolMessageContentTypedDict = TypeAliasType(
 ToolMessageContent = TypeAliasType("ToolMessageContent", Union[str, List[ContentChunk]])
 
 
-ToolMessageRole = Literal["tool"]
+ToolMessageRole = Literal["tool",]
 
 
 class ToolMessageTypedDict(TypedDict):

mistralai_gcp/models/tooltypes.py

@@ -5,4 +5,4 @@ from mistralai_gcp.types import UnrecognizedStr
 from typing import Literal, Union
 
 
-ToolTypes = Union[Literal["function"], UnrecognizedStr]
+ToolTypes = Union[Literal["function",], UnrecognizedStr]

mistralai_gcp/models/usermessage.py

@@ -16,7 +16,7 @@ UserMessageContentTypedDict = TypeAliasType(
 UserMessageContent = TypeAliasType("UserMessageContent", Union[str, List[ContentChunk]])
 
 
-UserMessageRole = Literal["user"]
+UserMessageRole = Literal["user",]
 
 
 class UserMessageTypedDict(TypedDict):

mistralai_gcp/types/basemodel.py

@@ -2,7 +2,8 @@
 
 from pydantic import ConfigDict, model_serializer
 from pydantic import BaseModel as PydanticBaseModel
-from typing import TYPE_CHECKING, Literal, Optional, TypeVar, Union
+from pydantic_core import core_schema
+from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, Union
 from typing_extensions import TypeAliasType, TypeAlias
 
 
@@ -35,5 +36,42 @@ else:
         "OptionalNullable", Union[Optional[Nullable[T]], Unset], type_params=(T,)
     )
 
-UnrecognizedInt: TypeAlias = int
-UnrecognizedStr: TypeAlias = str
+
+class UnrecognizedStr(str):
+    @classmethod
+    def __get_pydantic_core_schema__(cls, _source_type: Any, _handler: Any) -> core_schema.CoreSchema:
+        # Make UnrecognizedStr only work in lax mode, not strict mode
+        # This makes it a "fallback" option when more specific types (like Literals) don't match
+        def validate_lax(v: Any) -> 'UnrecognizedStr':
+            if isinstance(v, cls):
+                return v
+            return cls(str(v))
+
+        # Use lax_or_strict_schema where strict always fails
+        # This forces Pydantic to prefer other union members in strict mode
+        # and only fall back to UnrecognizedStr in lax mode
+        return core_schema.lax_or_strict_schema(
+            lax_schema=core_schema.chain_schema([
+                core_schema.str_schema(),
+                core_schema.no_info_plain_validator_function(validate_lax)
+            ]),
+            strict_schema=core_schema.none_schema(),  # Always fails in strict mode
+        )
+
+
+class UnrecognizedInt(int):
+    @classmethod
+    def __get_pydantic_core_schema__(cls, _source_type: Any, _handler: Any) -> core_schema.CoreSchema:
+        # Make UnrecognizedInt only work in lax mode, not strict mode
+        # This makes it a "fallback" option when more specific types (like Literals) don't match
+        def validate_lax(v: Any) -> 'UnrecognizedInt':
+            if isinstance(v, cls):
+                return v
+            return cls(int(v))
+        return core_schema.lax_or_strict_schema(
+            lax_schema=core_schema.chain_schema([
+                core_schema.int_schema(),
+                core_schema.no_info_plain_validator_function(validate_lax)
+            ]),
+            strict_schema=core_schema.none_schema(),  # Always fails in strict mode
+        )

mistralai_gcp/utils/__init__.py

@@ -41,7 +41,6 @@ if TYPE_CHECKING:
         validate_decimal,
         validate_float,
         validate_int,
-        validate_open_enum,
     )
     from .url import generate_url, template_url, remove_suffix
     from .values import (
@@ -102,7 +101,6 @@ __all__ = [
     "validate_const",
     "validate_float",
     "validate_int",
-    "validate_open_enum",
     "cast_partial",
 ]
 
@@ -155,7 +153,6 @@ _dynamic_imports: dict[str, str] = {
     "validate_const": ".serializers",
     "validate_float": ".serializers",
     "validate_int": ".serializers",
-    "validate_open_enum": ".serializers",
     "cast_partial": ".values",
 }
 

mistralai_gcp/utils/annotations.py

@@ -3,6 +3,7 @@
 from enum import Enum
 from typing import Any, Optional
 
+
 def get_discriminator(model: Any, fieldname: str, key: str) -> str:
     """
     Recursively search for the discriminator attribute in a model.
@@ -25,31 +26,54 @@ def get_discriminator(model: Any, fieldname: str, key: str) -> str:
 
         if isinstance(field, dict):
             if key in field:
-                return f'{field[key]}'
+                return f"{field[key]}"
 
         if hasattr(field, fieldname):
             attr = getattr(field, fieldname)
             if isinstance(attr, Enum):
-                return f'{attr.value}'
-            return f'{attr}'
+                return f"{attr.value}"
+            return f"{attr}"
 
         if hasattr(field, upper_fieldname):
             attr = getattr(field, upper_fieldname)
             if isinstance(attr, Enum):
-                return f'{attr.value}'
-            return f'{attr}'
+                return f"{attr.value}"
+            return f"{attr}"
 
         return None
 
+    def search_nested_discriminator(obj: Any) -> Optional[str]:
+        """Recursively search for discriminator in nested structures."""
+        # First try direct field lookup
+        discriminator = get_field_discriminator(obj)
+        if discriminator is not None:
+            return discriminator
+
+        # If it's a dict, search in nested values
+        if isinstance(obj, dict):
+            for value in obj.values():
+                if isinstance(value, list):
+                    # Search in list items
+                    for item in value:
+                        nested_discriminator = search_nested_discriminator(item)
+                        if nested_discriminator is not None:
+                            return nested_discriminator
+                elif isinstance(value, dict):
+                    # Search in nested dict
+                    nested_discriminator = search_nested_discriminator(value)
+                    if nested_discriminator is not None:
+                        return nested_discriminator
+
+        return None
 
     if isinstance(model, list):
         for field in model:
-            discriminator = get_field_discriminator(field)
+            discriminator = search_nested_discriminator(field)
             if discriminator is not None:
                 return discriminator
 
-    discriminator = get_field_discriminator(model)
+    discriminator = search_nested_discriminator(model)
     if discriminator is not None:
         return discriminator
 
-    raise ValueError(f'Could not find discriminator field {fieldname} in {model}')
+    raise ValueError(f"Could not find discriminator field {fieldname} in {model}")

mistralai_gcp/utils/enums.py

@@ -2,6 +2,10 @@
 
 import enum
 import sys
+from typing import Any
+
+from pydantic_core import core_schema
+
 
 class OpenEnumMeta(enum.EnumMeta):
     # The __call__ method `boundary` kwarg was added in 3.11 and must be present
@@ -72,3 +76,59 @@ class OpenEnumMeta(enum.EnumMeta):
                 )
             except ValueError:
                 return value
+
+    def __new__(mcs, name, bases, namespace, **kwargs):
+        cls = super().__new__(mcs, name, bases, namespace, **kwargs)
+
+        # Add __get_pydantic_core_schema__ to make open enums work correctly
+        # in union discrimination. In strict mode (used by Pydantic for unions),
+        # only known enum values match. In lax mode, unknown values are accepted.
+        def __get_pydantic_core_schema__(
+            cls_inner: Any, _source_type: Any, _handler: Any
+        ) -> core_schema.CoreSchema:
+            # Create a validator that only accepts known enum values (for strict mode)
+            def validate_strict(v: Any) -> Any:
+                if isinstance(v, cls_inner):
+                    return v
+                # Use the parent EnumMeta's __call__ which raises ValueError for unknown values
+                return enum.EnumMeta.__call__(cls_inner, v)
+
+            # Create a lax validator that accepts unknown values
+            def validate_lax(v: Any) -> Any:
+                if isinstance(v, cls_inner):
+                    return v
+                try:
+                    return enum.EnumMeta.__call__(cls_inner, v)
+                except ValueError:
+                    # Return the raw value for unknown enum values
+                    return v
+
+            # Determine the base type schema (str or int)
+            is_int_enum = False
+            for base in cls_inner.__mro__:
+                if base is int:
+                    is_int_enum = True
+                    break
+                if base is str:
+                    break
+
+            base_schema = (
+                core_schema.int_schema()
+                if is_int_enum
+                else core_schema.str_schema()
+            )
+
+            # Use lax_or_strict_schema:
+            # - strict mode: only known enum values match (raises ValueError for unknown)
+            # - lax mode: accept any value, return enum member or raw value
+            return core_schema.lax_or_strict_schema(
+                lax_schema=core_schema.chain_schema(
+                    [base_schema, core_schema.no_info_plain_validator_function(validate_lax)]
+                ),
+                strict_schema=core_schema.chain_schema(
+                    [base_schema, core_schema.no_info_plain_validator_function(validate_strict)]
+                ),
+            )
+
+        setattr(cls, "__get_pydantic_core_schema__", classmethod(__get_pydantic_core_schema__))
+        return cls

mistralai_gcp/utils/forms.py

@@ -142,16 +142,21 @@ def serialize_multipart_form(
         if field_metadata.file:
             if isinstance(val, List):
                 # Handle array of files
+                array_field_name = f_name + "[]"
                 for file_obj in val:
                     if not _is_set(file_obj):
                         continue
-                        
-                    file_name, content, content_type = _extract_file_properties(file_obj)
+
+                    file_name, content, content_type = _extract_file_properties(
+                        file_obj
+                    )
 
                     if content_type is not None:
-                        files.append((f_name + "[]", (file_name, content, content_type)))
+                        files.append(
+                            (array_field_name, (file_name, content, content_type))
+                        )
                     else:
-                        files.append((f_name + "[]", (file_name, content)))
+                        files.append((array_field_name, (file_name, content)))
             else:
                 # Handle single file
                 file_name, content, content_type = _extract_file_properties(val)
@@ -161,11 +166,16 @@ def serialize_multipart_form(
                 else:
                     files.append((f_name, (file_name, content)))
         elif field_metadata.json:
-            files.append((f_name, (
-                None,
-                marshal_json(val, request_field_types[name]),
-                "application/json",
-            )))
+            files.append(
+                (
+                    f_name,
+                    (
+                        None,
+                        marshal_json(val, request_field_types[name]),
+                        "application/json",
+                    ),
+                )
+            )
         else:
             if isinstance(val, List):
                 values = []
@@ -175,7 +185,8 @@ def serialize_multipart_form(
                         continue
                     values.append(_val_to_string(value))
 
-                form[f_name + "[]"] = values
+                array_field_name = f_name + "[]"
+                form[array_field_name] = values
             else:
                 form[f_name] = _val_to_string(val)
     return media_type, form, files

mistralai_gcp/utils/queryparams.py

@@ -27,12 +27,13 @@ from .forms import _populate_form
 def get_query_params(
     query_params: Any,
     gbls: Optional[Any] = None,
+    allow_empty_value: Optional[List[str]] = None,
 ) -> Dict[str, List[str]]:
     params: Dict[str, List[str]] = {}
 
-    globals_already_populated = _populate_query_params(query_params, gbls, params, [])
+    globals_already_populated = _populate_query_params(query_params, gbls, params, [], allow_empty_value)
     if _is_set(gbls):
-        _populate_query_params(gbls, None, params, globals_already_populated)
+        _populate_query_params(gbls, None, params, globals_already_populated, allow_empty_value)
 
     return params
 
@@ -42,6 +43,7 @@ def _populate_query_params(
     gbls: Any,
     query_param_values: Dict[str, List[str]],
     skip_fields: List[str],
+    allow_empty_value: Optional[List[str]] = None,
 ) -> List[str]:
     globals_already_populated: List[str] = []
 
@@ -69,6 +71,16 @@ def _populate_query_params(
             globals_already_populated.append(name)
 
         f_name = field.alias if field.alias is not None else name
+
+        allow_empty_set = set(allow_empty_value or [])
+        should_include_empty = f_name in allow_empty_set and (
+            value is None or value == [] or value == ""
+        )
+
+        if should_include_empty:
+            query_param_values[f_name] = [""]
+            continue
+
         serialization = metadata.serialization
         if serialization is not None:
             serialized_parms = _get_serialized_params(

mistralai_gcp/utils/requestbodies.py

@@ -44,15 +44,15 @@ def serialize_request_body(
 
     serialized_request_body = SerializedRequestBody(media_type)
 
-    if re.match(r"(application|text)\/.*?\+*json.*", media_type) is not None:
+    if re.match(r"^(application|text)\/([^+]+\+)*json.*", media_type) is not None:
         serialized_request_body.content = marshal_json(request_body, request_body_type)
-    elif re.match(r"multipart\/.*", media_type) is not None:
+    elif re.match(r"^multipart\/.*", media_type) is not None:
         (
             serialized_request_body.media_type,
             serialized_request_body.data,
             serialized_request_body.files,
         ) = serialize_multipart_form(media_type, request_body)
-    elif re.match(r"application\/x-www-form-urlencoded.*", media_type) is not None:
+    elif re.match(r"^application\/x-www-form-urlencoded.*", media_type) is not None:
         serialized_request_body.data = serialize_form_data(request_body)
     elif isinstance(request_body, (bytes, bytearray, io.BytesIO, io.BufferedReader)):
         serialized_request_body.content = request_body

mistralai_gcp/utils/retries.py

@@ -3,7 +3,9 @@
 import asyncio
 import random
 import time
-from typing import List
+from datetime import datetime
+from email.utils import parsedate_to_datetime
+from typing import List, Optional
 
 import httpx
 
@@ -51,9 +53,11 @@ class Retries:
 
 class TemporaryError(Exception):
     response: httpx.Response
+    retry_after: Optional[int]
 
     def __init__(self, response: httpx.Response):
         self.response = response
+        self.retry_after = _parse_retry_after_header(response)
 
 
 class PermanentError(Exception):
@@ -63,6 +67,62 @@ class PermanentError(Exception):
         self.inner = inner
 
 
+def _parse_retry_after_header(response: httpx.Response) -> Optional[int]:
+    """Parse Retry-After header from response.
+
+    Returns:
+        Retry interval in milliseconds, or None if header is missing or invalid.
+    """
+    retry_after_header = response.headers.get("retry-after")
+    if not retry_after_header:
+        return None
+
+    try:
+        seconds = float(retry_after_header)
+        return round(seconds * 1000)
+    except ValueError:
+        pass
+
+    try:
+        retry_date = parsedate_to_datetime(retry_after_header)
+        delta = (retry_date - datetime.now(retry_date.tzinfo)).total_seconds()
+        return round(max(0, delta) * 1000)
+    except (ValueError, TypeError):
+        pass
+
+    return None
+
+
+def _get_sleep_interval(
+    exception: Exception,
+    initial_interval: int,
+    max_interval: int,
+    exponent: float,
+    retries: int,
+) -> float:
+    """Get sleep interval for retry with exponential backoff.
+
+    Args:
+        exception: The exception that triggered the retry.
+        initial_interval: Initial retry interval in milliseconds.
+        max_interval: Maximum retry interval in milliseconds.
+        exponent: Base for exponential backoff calculation.
+        retries: Current retry attempt count.
+
+    Returns:
+        Sleep interval in seconds.
+    """
+    if (
+        isinstance(exception, TemporaryError)
+        and exception.retry_after is not None
+        and exception.retry_after > 0
+    ):
+        return exception.retry_after / 1000
+
+    sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
+    return min(sleep, max_interval / 1000)
+
+
 def retry(func, retries: Retries):
     if retries.config.strategy == "backoff":
 
@@ -183,8 +243,10 @@ def retry_with_backoff(
                     return exception.response
 
                 raise
-            sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
-            sleep = min(sleep, max_interval / 1000)
+
+            sleep = _get_sleep_interval(
+                exception, initial_interval, max_interval, exponent, retries
+            )
             time.sleep(sleep)
             retries += 1
 
@@ -211,7 +273,9 @@ async def retry_with_backoff_async(
                     return exception.response
 
                 raise
-            sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
-            sleep = min(sleep, max_interval / 1000)
+
+            sleep = _get_sleep_interval(
+                exception, initial_interval, max_interval, exponent, retries
+            )
             await asyncio.sleep(sleep)
             retries += 1

mistralai_gcp/utils/serializers.py

@@ -102,26 +102,6 @@ def validate_int(b):
     return int(b)
 
 
-def validate_open_enum(is_int: bool):
-    def validate(e):
-        if e is None:
-            return None
-
-        if isinstance(e, Unset):
-            return e
-
-        if is_int:
-            if not isinstance(e, int):
-                raise ValueError("Expected int")
-        else:
-            if not isinstance(e, str):
-                raise ValueError("Expected string")
-
-        return e
-
-    return validate
-
-
 def validate_const(v):
     def validate(c):
         # Optional[T] is a Union[T, None]

mistralai_gcp/utils/unmarshal_json_response.py

@@ -1,12 +1,26 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from typing import Any, Optional
+from typing import Any, Optional, Type, TypeVar, overload
 
 import httpx
 
 from .serializers import unmarshal_json
 from mistralai_gcp import models
 
+T = TypeVar("T")
+
+
+@overload
+def unmarshal_json_response(
+    typ: Type[T], http_res: httpx.Response, body: Optional[str] = None
+) -> T: ...
+
+
+@overload
+def unmarshal_json_response(
+    typ: Any, http_res: httpx.Response, body: Optional[str] = None
+) -> Any: ...
+
 
 def unmarshal_json_response(
     typ: Any, http_res: httpx.Response, body: Optional[str] = None