mistralai 1.5.2__py3-none-any.whl → 1.6.0__py3-none-any.whl

mistralai/models_.py

@@ -35,6 +35,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
         req = self._build_request(
             method="GET",
             path="/v1/models",
@@ -61,6 +63,7 @@ class Models(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="list_models_v1_models_get",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -72,12 +75,14 @@ class Models(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(http_res.text, models.ModelList)
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
             raise models.SDKError(
@@ -122,6 +127,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
         req = self._build_request_async(
             method="GET",
             path="/v1/models",
@@ -148,6 +155,7 @@ class Models(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="list_models_v1_models_get",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -159,12 +167,14 @@ class Models(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(http_res.text, models.ModelList)
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
             raise models.SDKError(
@@ -211,6 +221,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.RetrieveModelV1ModelsModelIDGetRequest(
             model_id=model_id,
@@ -242,6 +254,7 @@ class Models(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="retrieve_model_v1_models__model_id__get",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -253,15 +266,17 @@ class Models(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(
                 http_res.text,
                 models.RetrieveModelV1ModelsModelIDGetResponseRetrieveModelV1ModelsModelIDGet,
             )
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
             raise models.SDKError(
@@ -308,6 +323,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.RetrieveModelV1ModelsModelIDGetRequest(
             model_id=model_id,
@@ -339,6 +356,7 @@ class Models(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="retrieve_model_v1_models__model_id__get",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -350,15 +368,17 @@ class Models(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(
                 http_res.text,
                 models.RetrieveModelV1ModelsModelIDGetResponseRetrieveModelV1ModelsModelIDGet,
             )
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
             raise models.SDKError(
@@ -405,6 +425,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.DeleteModelV1ModelsModelIDDeleteRequest(
             model_id=model_id,
@@ -436,6 +458,7 @@ class Models(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="delete_model_v1_models__model_id__delete",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -447,12 +470,14 @@ class Models(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(http_res.text, models.DeleteModelOut)
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
             raise models.SDKError(
@@ -499,6 +524,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.DeleteModelV1ModelsModelIDDeleteRequest(
             model_id=model_id,
@@ -530,6 +557,7 @@ class Models(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="delete_model_v1_models__model_id__delete",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -541,12 +569,14 @@ class Models(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(http_res.text, models.DeleteModelOut)
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
             raise models.SDKError(
@@ -597,6 +627,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.JobsAPIRoutesFineTuningUpdateFineTunedModelRequest(
             model_id=model_id,
@@ -635,6 +667,7 @@ class Models(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="jobs_api_routes_fine_tuning_update_fine_tuned_model",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -698,6 +731,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.JobsAPIRoutesFineTuningUpdateFineTunedModelRequest(
             model_id=model_id,
@@ -736,6 +771,7 @@ class Models(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="jobs_api_routes_fine_tuning_update_fine_tuned_model",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -795,6 +831,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.JobsAPIRoutesFineTuningArchiveFineTunedModelRequest(
             model_id=model_id,
@@ -826,6 +864,7 @@ class Models(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="jobs_api_routes_fine_tuning_archive_fine_tuned_model",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -885,6 +924,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.JobsAPIRoutesFineTuningArchiveFineTunedModelRequest(
             model_id=model_id,
@@ -916,6 +957,7 @@ class Models(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="jobs_api_routes_fine_tuning_archive_fine_tuned_model",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -975,6 +1017,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.JobsAPIRoutesFineTuningUnarchiveFineTunedModelRequest(
             model_id=model_id,
@@ -1006,6 +1050,7 @@ class Models(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="jobs_api_routes_fine_tuning_unarchive_fine_tuned_model",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -1065,6 +1110,8 @@ class Models(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.JobsAPIRoutesFineTuningUnarchiveFineTunedModelRequest(
             model_id=model_id,
@@ -1096,6 +1143,7 @@ class Models(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="jobs_api_routes_fine_tuning_unarchive_fine_tuned_model",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(

mistralai/ocr.py

@@ -47,6 +47,8 @@ class Ocr(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.OCRRequest(
             model=model,
@@ -87,6 +89,7 @@ class Ocr(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="ocr_v1_ocr_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -98,12 +101,14 @@ class Ocr(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(http_res.text, models.OCRResponse)
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
             raise models.SDKError(
@@ -160,6 +165,8 @@ class Ocr(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.OCRRequest(
             model=model,
@@ -200,6 +207,7 @@ class Ocr(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="ocr_v1_ocr_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -211,12 +219,14 @@ class Ocr(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
             return utils.unmarshal_json(http_res.text, models.OCRResponse)
         if utils.match_response(http_res, "422", "application/json"):
-            data = utils.unmarshal_json(http_res.text, models.HTTPValidationErrorData)
-            raise models.HTTPValidationError(data=data)
+            response_data = utils.unmarshal_json(
+                http_res.text, models.HTTPValidationErrorData
+            )
+            raise models.HTTPValidationError(data=response_data)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
             raise models.SDKError(

mistralai/sdk.py

@@ -68,15 +68,19 @@ class Mistral(BaseSDK):
         :param retry_config: The retry configuration to use for all supported methods
         :param timeout_ms: Optional request timeout applied to each operation in milliseconds
         """
+        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()
@@ -100,7 +104,9 @@ class Mistral(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=server,
@@ -114,7 +120,7 @@ class Mistral(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
@@ -127,7 +133,9 @@ class Mistral(BaseSDK):
             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()
@@ -151,9 +159,17 @@ class Mistral(BaseSDK):
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        if self.sdk_configuration.client is not None:
+        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:
+        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/sdkconfiguration.py

@@ -26,8 +26,10 @@ 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] = ""

mistralai/utils/__init__.py

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

mistralai/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/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]