mistralai 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl

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/datetimes.py

@@ -0,0 +1,23 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from datetime import datetime
+import sys
+
+
+def parse_datetime(datetime_string: str) -> datetime:
+    """
+    Convert a RFC 3339 / ISO 8601 formatted string into a datetime object.
+    Python versions 3.11 and later support parsing RFC 3339 directly with
+    datetime.fromisoformat(), but for earlier versions, this function
+    encapsulates the necessary extra logic.
+    """
+    # Python 3.11 and later can parse RFC 3339 directly
+    if sys.version_info >= (3, 11):
+        return datetime.fromisoformat(datetime_string)
+    
+    # For Python 3.10 and earlier, a common ValueError is trailing 'Z' suffix,
+    # so fix that upfront.
+    if datetime_string.endswith("Z"):
+        datetime_string = datetime_string[:-1] + "+00:00"
+
+    return datetime.fromisoformat(datetime_string)

mistralai_gcp/utils/enums.py

@@ -1,34 +1,134 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 import enum
+import sys
+from typing import Any
+
+from pydantic_core import core_schema
 
 
 class OpenEnumMeta(enum.EnumMeta):
-    def __call__(
-        cls, value, names=None, *, module=None, qualname=None, type=None, start=1
-    ):
-        # The `type` kwarg also happens to be a built-in that pylint flags as
-        # redeclared. Safe to ignore this lint rule with this scope.
-        # pylint: disable=redefined-builtin
-
-        if names is not None:
-            return super().__call__(
-                value,
-                names=names,
-                module=module,
-                qualname=qualname,
-                type=type,
-                start=start,
+    # The __call__ method `boundary` kwarg was added in 3.11 and must be present
+    # for pyright. Refer also: https://github.com/pylint-dev/pylint/issues/9622
+    # pylint: disable=unexpected-keyword-arg
+    # The __call__ method `values` varg must be named for pyright.
+    # pylint: disable=keyword-arg-before-vararg
+
+    if sys.version_info >= (3, 11):
+        def __call__(
+            cls, value, names=None, *values, module=None, qualname=None, type=None, start=1, boundary=None
+        ):
+            # The `type` kwarg also happens to be a built-in that pylint flags as
+            # redeclared. Safe to ignore this lint rule with this scope.
+            # pylint: disable=redefined-builtin
+
+            if names is not None:
+                return super().__call__(
+                    value,
+                    names=names,
+                    *values,
+                    module=module,
+                    qualname=qualname,
+                    type=type,
+                    start=start,
+                    boundary=boundary,
+                )
+
+            try:
+                return super().__call__(
+                    value,
+                    names=names,  # pyright: ignore[reportArgumentType]
+                    *values,
+                    module=module,
+                    qualname=qualname,
+                    type=type,
+                    start=start,
+                    boundary=boundary,
+                )
+            except ValueError:
+                return value
+    else:
+        def __call__(
+            cls, value, names=None, *, module=None, qualname=None, type=None, start=1
+        ):
+            # The `type` kwarg also happens to be a built-in that pylint flags as
+            # redeclared. Safe to ignore this lint rule with this scope.
+            # pylint: disable=redefined-builtin
+
+            if names is not None:
+                return super().__call__(
+                    value,
+                    names=names,
+                    module=module,
+                    qualname=qualname,
+                    type=type,
+                    start=start,
+                )
+
+            try:
+                return super().__call__(
+                    value,
+                    names=names,  # pyright: ignore[reportArgumentType]
+                    module=module,
+                    qualname=qualname,
+                    type=type,
+                    start=start,
+                )
+            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()
             )
 
-        try:
-            return super().__call__(
-                value,
-                names=names,  # pyright: ignore[reportArgumentType]
-                module=module,
-                qualname=qualname,
-                type=type,
-                start=start,
+            # 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)]
+                ),
             )
-        except ValueError:
-            return value
+
+        setattr(cls, "__get_pydantic_core_schema__", classmethod(__get_pydantic_core_schema__))
+        return cls

mistralai_gcp/utils/eventstreaming.py

@@ -17,6 +17,9 @@ T = TypeVar("T")
 
 
 class EventStream(Generic[T]):
+    # Holds a reference to the SDK client to avoid it being garbage collected
+    # and cause termination of the underlying httpx client.
+    client_ref: Optional[object]
     response: httpx.Response
     generator: Generator[T, None, None]
 
@@ -25,9 +28,11 @@ class EventStream(Generic[T]):
         response: httpx.Response,
         decoder: Callable[[str], T],
         sentinel: Optional[str] = None,
+        client_ref: Optional[object] = None,
     ):
         self.response = response
         self.generator = stream_events(response, decoder, sentinel)
+        self.client_ref = client_ref
 
     def __iter__(self):
         return self
@@ -43,6 +48,9 @@ class EventStream(Generic[T]):
 
 
 class EventStreamAsync(Generic[T]):
+    # Holds a reference to the SDK client to avoid it being garbage collected
+    # and cause termination of the underlying httpx client.
+    client_ref: Optional[object]
     response: httpx.Response
     generator: AsyncGenerator[T, None]
 
@@ -51,9 +59,11 @@ class EventStreamAsync(Generic[T]):
         response: httpx.Response,
         decoder: Callable[[str], T],
         sentinel: Optional[str] = None,
+        client_ref: Optional[object] = None,
     ):
         self.response = response
         self.generator = stream_events_async(response, decoder, sentinel)
+        self.client_ref = client_ref
 
     def __aiter__(self):
         return self

mistralai_gcp/utils/forms.py

@@ -86,11 +86,39 @@ def _populate_form(
     return form
 
 
+def _extract_file_properties(file_obj: Any) -> Tuple[str, Any, Any]:
+    """Extract file name, content, and content type from a file object."""
+    file_fields: Dict[str, FieldInfo] = file_obj.__class__.model_fields
+
+    file_name = ""
+    content = None
+    content_type = None
+
+    for file_field_name in file_fields:
+        file_field = file_fields[file_field_name]
+
+        file_metadata = find_field_metadata(file_field, MultipartFormMetadata)
+        if file_metadata is None:
+            continue
+
+        if file_metadata.content:
+            content = getattr(file_obj, file_field_name, None)
+        elif file_field_name == "content_type":
+            content_type = getattr(file_obj, file_field_name, None)
+        else:
+            file_name = getattr(file_obj, file_field_name)
+
+    if file_name == "" or content is None:
+        raise ValueError("invalid multipart/form-data file")
+
+    return file_name, content, content_type
+
+
 def serialize_multipart_form(
     media_type: str, request: Any
-) -> Tuple[str, Dict[str, Any], Dict[str, Any]]:
+) -> Tuple[str, Dict[str, Any], List[Tuple[str, Any]]]:
     form: Dict[str, Any] = {}
-    files: Dict[str, Any] = {}
+    files: List[Tuple[str, Any]] = []
 
     if not isinstance(request, BaseModel):
         raise TypeError("invalid request body type")
@@ -112,38 +140,41 @@ def serialize_multipart_form(
         f_name = field.alias if field.alias else name
 
         if field_metadata.file:
-            file_fields: Dict[str, FieldInfo] = val.__class__.model_fields
-
-            file_name = ""
-            content = None
-            content_type = None
+            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
 
-            for file_field_name in file_fields:
-                file_field = file_fields[file_field_name]
+                    file_name, content, content_type = _extract_file_properties(
+                        file_obj
+                    )
 
-                file_metadata = find_field_metadata(file_field, MultipartFormMetadata)
-                if file_metadata is None:
-                    continue
+                    if content_type is not None:
+                        files.append(
+                            (array_field_name, (file_name, content, content_type))
+                        )
+                    else:
+                        files.append((array_field_name, (file_name, content)))
+            else:
+                # Handle single file
+                file_name, content, content_type = _extract_file_properties(val)
 
-                if file_metadata.content:
-                    content = getattr(val, file_field_name, None)
-                elif file_field_name == "content_type":
-                    content_type = getattr(val, file_field_name, None)
+                if content_type is not None:
+                    files.append((f_name, (file_name, content, content_type)))
                 else:
-                    file_name = getattr(val, file_field_name)
-
-            if file_name == "" or content is None:
-                raise ValueError("invalid multipart/form-data file")
-
-            if content_type is not None:
-                files[f_name] = (file_name, content, content_type)
-            else:
-                files[f_name] = (file_name, content)
+                    files.append((f_name, (file_name, content)))
         elif field_metadata.json:
-            files[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):
@@ -154,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

@@ -1,13 +1,16 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from decimal import Decimal
+import functools
 import json
-from typing import Any, Dict, List, Union, get_args
-import httpx
+import typing
+from typing import Any, Dict, List, Tuple, Union, get_args
+import typing_extensions
 from typing_extensions import get_origin
+
+import httpx
 from pydantic import ConfigDict, create_model
 from pydantic_core import from_json
-from typing_inspection.typing_objects import is_union
 
 from ..types.basemodel import BaseModel, Nullable, OptionalNullable, Unset
 
@@ -99,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]
@@ -185,6 +168,15 @@ def is_nullable(field):
     return False
 
 
+def is_union(obj: object) -> bool:
+    """
+    Returns True if the given object is a typing.Union or typing_extensions.Union.
+    """
+    return any(
+        obj is typing_obj for typing_obj in _get_typing_objects_by_name_of("Union")
+    )
+
+
 def stream_to_text(stream: httpx.Response) -> str:
     return "".join(stream.iter_text())
 
@@ -217,3 +209,21 @@ def _contains_pydantic_model(data: Any) -> bool:
         return any(_contains_pydantic_model(value) for value in data.values())
 
     return False
+
+
+@functools.cache
+def _get_typing_objects_by_name_of(name: str) -> Tuple[Any, ...]:
+    """
+    Get typing objects by name from typing and typing_extensions.
+    Reference: https://typing-extensions.readthedocs.io/en/latest/#runtime-use-of-types
+    """
+    result = tuple(
+        getattr(module, name)
+        for module in (typing, typing_extensions)
+        if hasattr(module, name)
+    )
+    if not result:
+        raise ValueError(
+            f"Neither typing nor typing_extensions has an object called {name!r}"
+        )
+    return result