mistralai 1.8.2__py3-none-any.whl → 1.9.1__py3-none-any.whl

mistralai/sdk.py

@@ -6,46 +6,62 @@ from .sdkconfiguration import SDKConfiguration
 from .utils.logger import Logger, get_default_logger
 from .utils.retries import RetryConfig
 import httpx
+import importlib
 from mistralai import models, utils
 from mistralai._hooks import SDKHooks
-from mistralai.agents import Agents
-from mistralai.batch import Batch
-from mistralai.beta import Beta
-from mistralai.chat import Chat
-from mistralai.classifiers import Classifiers
-from mistralai.embeddings import Embeddings
-from mistralai.files import Files
-from mistralai.fim import Fim
-from mistralai.fine_tuning import FineTuning
-from mistralai.models_ import Models
-from mistralai.ocr import Ocr
 from mistralai.types import OptionalNullable, UNSET
-from typing import Any, Callable, Dict, Optional, Union, cast
+from typing import Any, Callable, Dict, Optional, TYPE_CHECKING, Union, cast
 import weakref
 
+if TYPE_CHECKING:
+    from mistralai.agents import Agents
+    from mistralai.batch import Batch
+    from mistralai.beta import Beta
+    from mistralai.chat import Chat
+    from mistralai.classifiers import Classifiers
+    from mistralai.embeddings import Embeddings
+    from mistralai.files import Files
+    from mistralai.fim import Fim
+    from mistralai.fine_tuning import FineTuning
+    from mistralai.models_ import Models
+    from mistralai.ocr import Ocr
+
 
 class Mistral(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."""
 
-    models: Models
+    models: "Models"
     r"""Model Management API"""
-    beta: Beta
-    files: Files
+    beta: "Beta"
+    files: "Files"
     r"""Files API"""
-    fine_tuning: FineTuning
-    batch: Batch
-    chat: Chat
+    fine_tuning: "FineTuning"
+    batch: "Batch"
+    chat: "Chat"
     r"""Chat Completion API."""
-    fim: Fim
+    fim: "Fim"
     r"""Fill-in-the-middle API."""
-    agents: Agents
+    agents: "Agents"
     r"""Agents API."""
-    embeddings: Embeddings
+    embeddings: "Embeddings"
     r"""Embeddings API."""
-    classifiers: Classifiers
+    classifiers: "Classifiers"
     r"""Classifiers API."""
-    ocr: Ocr
+    ocr: "Ocr"
     r"""OCR API"""
+    _sub_sdk_map = {
+        "models": ("mistralai.models_", "Models"),
+        "beta": ("mistralai.beta", "Beta"),
+        "files": ("mistralai.files", "Files"),
+        "fine_tuning": ("mistralai.fine_tuning", "FineTuning"),
+        "batch": ("mistralai.batch", "Batch"),
+        "chat": ("mistralai.chat", "Chat"),
+        "fim": ("mistralai.fim", "Fim"),
+        "agents": ("mistralai.agents", "Agents"),
+        "embeddings": ("mistralai.embeddings", "Embeddings"),
+        "classifiers": ("mistralai.classifiers", "Classifiers"),
+        "ocr": ("mistralai.ocr", "Ocr"),
+    }
 
     def __init__(
         self,
@@ -120,6 +136,9 @@ class Mistral(BaseSDK):
 
         hooks = SDKHooks()
 
+        # pylint: disable=protected-access
+        self.sdk_configuration.__dict__["_hooks"] = hooks
+
         current_server_url, *_ = self.sdk_configuration.get_server_details()
         server_url, self.sdk_configuration.client = hooks.sdk_init(
             current_server_url, client
@@ -127,9 +146,6 @@ class Mistral(BaseSDK):
         if current_server_url != server_url:
             self.sdk_configuration.server_url = server_url
 
-        # pylint: disable=protected-access
-        self.sdk_configuration.__dict__["_hooks"] = hooks
-
         weakref.finalize(
             self,
             close_clients,
@@ -140,20 +156,32 @@ class Mistral(BaseSDK):
             self.sdk_configuration.async_client_supplied,
         )
 
-        self._init_sdks()
-
-    def _init_sdks(self):
-        self.models = Models(self.sdk_configuration)
-        self.beta = Beta(self.sdk_configuration)
-        self.files = Files(self.sdk_configuration)
-        self.fine_tuning = FineTuning(self.sdk_configuration)
-        self.batch = Batch(self.sdk_configuration)
-        self.chat = Chat(self.sdk_configuration)
-        self.fim = Fim(self.sdk_configuration)
-        self.agents = Agents(self.sdk_configuration)
-        self.embeddings = Embeddings(self.sdk_configuration)
-        self.classifiers = Classifiers(self.sdk_configuration)
-        self.ocr = Ocr(self.sdk_configuration)
+    def __getattr__(self, name: str):
+        if name in self._sub_sdk_map:
+            module_path, class_name = self._sub_sdk_map[name]
+            try:
+                module = importlib.import_module(module_path)
+                klass = getattr(module, class_name)
+                instance = klass(self.sdk_configuration)
+                setattr(self, name, instance)
+                return instance
+            except ImportError as e:
+                raise AttributeError(
+                    f"Failed to import module {module_path} for attribute {name}: {e}"
+                ) from e
+            except AttributeError as e:
+                raise AttributeError(
+                    f"Failed to find class {class_name} in module {module_path} for attribute {name}: {e}"
+                ) from e
+
+        raise AttributeError(
+            f"'{type(self).__name__}' object has no attribute '{name}'"
+        )
+
+    def __dir__(self):
+        default_attrs = list(super().__dir__())
+        lazy_attrs = list(self._sub_sdk_map.keys())
+        return sorted(list(set(default_attrs + lazy_attrs)))
 
     def __enter__(self):
         return self

mistralai/sdkconfiguration.py

@@ -1,6 +1,5 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from ._hooks import SDKHooks
 from ._version import (
     __gen_version__,
     __openapi_doc_version__,
@@ -42,9 +41,6 @@ class SDKConfiguration:
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 
-    def __post_init__(self):
-        self._hooks = SDKHooks()
-
     def get_server_details(self) -> Tuple[str, Dict[str, str]]:
         if self.server_url is not None and self.server_url:
             return remove_suffix(self.server_url, "/"), {}
@@ -55,6 +51,3 @@ class SDKConfiguration:
             raise ValueError(f'Invalid server "{self.server}"')
 
         return SERVERS[self.server], {}
-
-    def get_hooks(self) -> SDKHooks:
-        return self._hooks

mistralai/types/basemodel.py

@@ -2,7 +2,7 @@
 
 from pydantic import ConfigDict, model_serializer
 from pydantic import BaseModel as PydanticBaseModel
-from typing import TYPE_CHECKING, Literal, Optional, TypeVar, Union, NewType
+from typing import TYPE_CHECKING, Literal, Optional, TypeVar, Union
 from typing_extensions import TypeAliasType, TypeAlias
 
 
@@ -35,5 +35,5 @@ else:
         "OptionalNullable", Union[Optional[Nullable[T]], Unset], type_params=(T,)
     )
 
-UnrecognizedInt = NewType("UnrecognizedInt", int)
-UnrecognizedStr = NewType("UnrecognizedStr", str)
+UnrecognizedInt: TypeAlias = int
+UnrecognizedStr: TypeAlias = str

mistralai/utils/__init__.py

@@ -1,51 +1,56 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-from .annotations import get_discriminator
-from .enums import OpenEnumMeta
-from .headers import get_headers, get_response_headers
-from .metadata import (
-    FieldMetadata,
-    find_metadata,
-    FormMetadata,
-    HeaderMetadata,
-    MultipartFormMetadata,
-    PathParamMetadata,
-    QueryParamMetadata,
-    RequestMetadata,
-    SecurityMetadata,
-)
-from .queryparams import get_query_params
-from .retries import BackoffStrategy, Retries, retry, retry_async, RetryConfig
-from .requestbodies import serialize_request_body, SerializedRequestBody
-from .security import get_security, get_security_from_env
+from typing import TYPE_CHECKING
+from importlib import import_module
 
-from .serializers import (
-    get_pydantic_model,
-    marshal_json,
-    unmarshal,
-    unmarshal_json,
-    serialize_decimal,
-    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,
-    cast_partial,
-)
-from .logger import Logger, get_body_content, get_default_logger
+if TYPE_CHECKING:
+    from .annotations import get_discriminator
+    from .datetimes import parse_datetime
+    from .enums import OpenEnumMeta
+    from .headers import get_headers, get_response_headers
+    from .metadata import (
+        FieldMetadata,
+        find_metadata,
+        FormMetadata,
+        HeaderMetadata,
+        MultipartFormMetadata,
+        PathParamMetadata,
+        QueryParamMetadata,
+        RequestMetadata,
+        SecurityMetadata,
+    )
+    from .queryparams import get_query_params
+    from .retries import BackoffStrategy, Retries, retry, retry_async, RetryConfig
+    from .requestbodies import serialize_request_body, SerializedRequestBody
+    from .security import get_security, get_security_from_env
+
+    from .serializers import (
+        get_pydantic_model,
+        marshal_json,
+        unmarshal,
+        unmarshal_json,
+        serialize_decimal,
+        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,
+        cast_partial,
+    )
+    from .logger import Logger, get_body_content, get_default_logger
 
 __all__ = [
     "BackoffStrategy",
@@ -56,6 +61,7 @@ __all__ = [
     "get_body_content",
     "get_default_logger",
     "get_discriminator",
+    "parse_datetime",
     "get_global_from_env",
     "get_headers",
     "get_pydantic_model",
@@ -99,3 +105,83 @@ __all__ = [
     "validate_open_enum",
     "cast_partial",
 ]
+
+_dynamic_imports: dict[str, str] = {
+    "BackoffStrategy": ".retries",
+    "FieldMetadata": ".metadata",
+    "find_metadata": ".metadata",
+    "FormMetadata": ".metadata",
+    "generate_url": ".url",
+    "get_body_content": ".logger",
+    "get_default_logger": ".logger",
+    "get_discriminator": ".annotations",
+    "parse_datetime": ".datetimes",
+    "get_global_from_env": ".values",
+    "get_headers": ".headers",
+    "get_pydantic_model": ".serializers",
+    "get_query_params": ".queryparams",
+    "get_response_headers": ".headers",
+    "get_security": ".security",
+    "get_security_from_env": ".security",
+    "HeaderMetadata": ".metadata",
+    "Logger": ".logger",
+    "marshal_json": ".serializers",
+    "match_content_type": ".values",
+    "match_status_codes": ".values",
+    "match_response": ".values",
+    "MultipartFormMetadata": ".metadata",
+    "OpenEnumMeta": ".enums",
+    "PathParamMetadata": ".metadata",
+    "QueryParamMetadata": ".metadata",
+    "remove_suffix": ".url",
+    "Retries": ".retries",
+    "retry": ".retries",
+    "retry_async": ".retries",
+    "RetryConfig": ".retries",
+    "RequestMetadata": ".metadata",
+    "SecurityMetadata": ".metadata",
+    "serialize_decimal": ".serializers",
+    "serialize_float": ".serializers",
+    "serialize_int": ".serializers",
+    "serialize_request_body": ".requestbodies",
+    "SerializedRequestBody": ".requestbodies",
+    "stream_to_text": ".serializers",
+    "stream_to_text_async": ".serializers",
+    "stream_to_bytes": ".serializers",
+    "stream_to_bytes_async": ".serializers",
+    "template_url": ".url",
+    "unmarshal": ".serializers",
+    "unmarshal_json": ".serializers",
+    "validate_decimal": ".serializers",
+    "validate_const": ".serializers",
+    "validate_float": ".serializers",
+    "validate_int": ".serializers",
+    "validate_open_enum": ".serializers",
+    "cast_partial": ".values",
+}
+
+
+def __getattr__(attr_name: str) -> object:
+    module_name = _dynamic_imports.get(attr_name)
+    if module_name is None:
+        raise AttributeError(
+            f"no {attr_name} found in _dynamic_imports, module name -> {__name__} "
+        )
+
+    try:
+        module = import_module(module_name, __package__)
+        result = getattr(module, attr_name)
+        return result
+    except ImportError as e:
+        raise ImportError(
+            f"Failed to import {attr_name} from {module_name}: {e}"
+        ) from e
+    except AttributeError as e:
+        raise AttributeError(
+            f"Failed to get {attr_name} from {module_name}: {e}"
+        ) from e
+
+
+def __dir__():
+    lazy_attrs = list(_dynamic_imports.keys())
+    return sorted(lazy_attrs)

mistralai/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/utils/enums.py

@@ -1,34 +1,74 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 import enum
-
+import sys
 
 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
+    # 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,
-            )
+            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
+            try:
+                return super().__call__(
+                    value,
+                    names=names,  # pyright: ignore[reportArgumentType]
+                    module=module,
+                    qualname=qualname,
+                    type=type,
+                    start=start,
+                )
+            except ValueError:
+                return value

mistralai/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,39 +140,32 @@ 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
-
-            for file_field_name in file_fields:
-                file_field = file_fields[file_field_name]
+            if isinstance(val, List):
+                # Handle array of files
+                for file_obj in val:
+                    if not _is_set(file_obj):
+                        continue
+                        
+                    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((f_name + "[]", (file_name, content, content_type)))
+                    else:
+                        files.append((f_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] = (
+            files.append((f_name, (
                 None,
                 marshal_json(val, request_field_types[name]),
                 "application/json",
-            )
+            )))
         else:
             if isinstance(val, List):
                 values = []

mistralai/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
 
@@ -185,6 +188,13 @@ 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 +227,22 @@ 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
+