mistralai 1.5.0__py3-none-any.whl → 1.5.2rc1__py3-none-any.whl

mistralai/classifiers.py

@@ -3,7 +3,7 @@
 from .basesdk import BaseSDK
 from mistralai import models, utils
 from mistralai._hooks import HookContext
-from mistralai.types import Nullable, OptionalNullable, UNSET
+from mistralai.types import OptionalNullable, UNSET
 from mistralai.utils import get_security_from_env
 from typing import Any, Mapping, Optional, Union
 
@@ -14,11 +14,11 @@ class Classifiers(BaseSDK):
     def moderate(
         self,
         *,
+        model: str,
         inputs: Union[
             models.ClassificationRequestInputs,
             models.ClassificationRequestInputsTypedDict,
         ],
-        model: OptionalNullable[str] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -26,8 +26,8 @@ class Classifiers(BaseSDK):
     ) -> models.ClassificationResponse:
         r"""Moderations
 
+        :param model: ID of the model to use.
         :param inputs: Text to classify.
-        :param model:
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -40,10 +40,12 @@ class Classifiers(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.ClassificationRequest(
-            inputs=inputs,
             model=model,
+            inputs=inputs,
         )
 
         req = self._build_request(
@@ -75,6 +77,7 @@ class Classifiers(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="moderations_v1_moderations_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -86,12 +89,14 @@ class Classifiers(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.ClassificationResponse)
         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(
@@ -115,11 +120,11 @@ class Classifiers(BaseSDK):
     async def moderate_async(
         self,
         *,
+        model: str,
         inputs: Union[
             models.ClassificationRequestInputs,
             models.ClassificationRequestInputsTypedDict,
         ],
-        model: OptionalNullable[str] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -127,8 +132,8 @@ class Classifiers(BaseSDK):
     ) -> models.ClassificationResponse:
         r"""Moderations
 
+        :param model: ID of the model to use.
         :param inputs: Text to classify.
-        :param model:
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -141,10 +146,12 @@ class Classifiers(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.ClassificationRequest(
-            inputs=inputs,
             model=model,
+            inputs=inputs,
         )
 
         req = self._build_request_async(
@@ -176,6 +183,7 @@ class Classifiers(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="moderations_v1_moderations_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -187,12 +195,14 @@ class Classifiers(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.ClassificationResponse)
         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(
@@ -216,11 +226,12 @@ class Classifiers(BaseSDK):
     def moderate_chat(
         self,
         *,
+        model: str,
         inputs: Union[
-            models.ChatClassificationRequestInputs,
-            models.ChatClassificationRequestInputsTypedDict,
+            models.ChatModerationRequestInputs,
+            models.ChatModerationRequestInputsTypedDict,
         ],
-        model: Nullable[str],
+        truncate_for_context_length: Optional[bool] = False,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -228,8 +239,9 @@ class Classifiers(BaseSDK):
     ) -> models.ClassificationResponse:
         r"""Moderations Chat
 
-        :param inputs: Chat to classify
         :param model:
+        :param inputs: Chat to classify
+        :param truncate_for_context_length:
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -242,12 +254,13 @@ class Classifiers(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
-        request = models.ChatClassificationRequest(
-            inputs=utils.get_pydantic_model(
-                inputs, models.ChatClassificationRequestInputs
-            ),
+        request = models.ChatModerationRequest(
             model=model,
+            inputs=utils.get_pydantic_model(inputs, models.ChatModerationRequestInputs),
+            truncate_for_context_length=truncate_for_context_length,
         )
 
         req = self._build_request(
@@ -264,7 +277,7 @@ class Classifiers(BaseSDK):
             http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
-                request, False, False, "json", models.ChatClassificationRequest
+                request, False, False, "json", models.ChatModerationRequest
             ),
             timeout_ms=timeout_ms,
         )
@@ -279,6 +292,7 @@ class Classifiers(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="moderations_chat_v1_chat_moderations_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -290,12 +304,14 @@ class Classifiers(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.ClassificationResponse)
         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(
@@ -319,11 +335,12 @@ class Classifiers(BaseSDK):
     async def moderate_chat_async(
         self,
         *,
+        model: str,
         inputs: Union[
-            models.ChatClassificationRequestInputs,
-            models.ChatClassificationRequestInputsTypedDict,
+            models.ChatModerationRequestInputs,
+            models.ChatModerationRequestInputsTypedDict,
         ],
-        model: Nullable[str],
+        truncate_for_context_length: Optional[bool] = False,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -331,8 +348,9 @@ class Classifiers(BaseSDK):
     ) -> models.ClassificationResponse:
         r"""Moderations Chat
 
-        :param inputs: Chat to classify
         :param model:
+        :param inputs: Chat to classify
+        :param truncate_for_context_length:
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -345,12 +363,13 @@ class Classifiers(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
-        request = models.ChatClassificationRequest(
-            inputs=utils.get_pydantic_model(
-                inputs, models.ChatClassificationRequestInputs
-            ),
+        request = models.ChatModerationRequest(
             model=model,
+            inputs=utils.get_pydantic_model(inputs, models.ChatModerationRequestInputs),
+            truncate_for_context_length=truncate_for_context_length,
         )
 
         req = self._build_request_async(
@@ -367,7 +386,7 @@ class Classifiers(BaseSDK):
             http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
-                request, False, False, "json", models.ChatClassificationRequest
+                request, False, False, "json", models.ChatModerationRequest
             ),
             timeout_ms=timeout_ms,
         )
@@ -382,6 +401,7 @@ class Classifiers(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="moderations_chat_v1_chat_moderations_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -393,12 +413,14 @@ class Classifiers(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.ClassificationResponse)
         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/embeddings.py

@@ -14,9 +14,8 @@ class Embeddings(BaseSDK):
     def create(
         self,
         *,
+        model: str,
         inputs: Union[models.Inputs, models.InputsTypedDict],
-        model: Optional[str] = "mistral-embed",
-        encoding_format: OptionalNullable[str] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -26,9 +25,8 @@ class Embeddings(BaseSDK):
 
         Embeddings
 
-        :param inputs: Text to embed.
         :param model: ID of the model to use.
-        :param encoding_format: The format to return the embeddings in.
+        :param inputs: Text to embed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -41,11 +39,12 @@ class Embeddings(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.EmbeddingRequest(
-            inputs=inputs,
             model=model,
-            encoding_format=encoding_format,
+            inputs=inputs,
         )
 
         req = self._build_request(
@@ -77,6 +76,7 @@ class Embeddings(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="embeddings_v1_embeddings_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -88,12 +88,14 @@ class Embeddings(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.EmbeddingResponse)
         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(
@@ -117,9 +119,8 @@ class Embeddings(BaseSDK):
     async def create_async(
         self,
         *,
+        model: str,
         inputs: Union[models.Inputs, models.InputsTypedDict],
-        model: Optional[str] = "mistral-embed",
-        encoding_format: OptionalNullable[str] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -129,9 +130,8 @@ class Embeddings(BaseSDK):
 
         Embeddings
 
-        :param inputs: Text to embed.
         :param model: ID of the model to use.
-        :param encoding_format: The format to return the embeddings in.
+        :param inputs: Text to embed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -144,11 +144,12 @@ class Embeddings(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.EmbeddingRequest(
-            inputs=inputs,
             model=model,
-            encoding_format=encoding_format,
+            inputs=inputs,
         )
 
         req = self._build_request_async(
@@ -180,6 +181,7 @@ class Embeddings(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="embeddings_v1_embeddings_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -191,12 +193,14 @@ class Embeddings(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.EmbeddingResponse)
         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/extra/utils/response_format.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from typing import TypeVar, Any, Type
+from typing import TypeVar, Any, Type, Dict
 from ...models import JSONSchema, ResponseFormat
 from ._pydantic_helper import rec_strict_json_schema
 
@@ -7,7 +7,7 @@ CustomPydanticModel = TypeVar("CustomPydanticModel", bound=BaseModel)
 
 
 def response_format_from_pydantic_model(
-    model: type[CustomPydanticModel],
+    model: Type[CustomPydanticModel],
 ) -> ResponseFormat:
     """Generate a strict JSON schema from a pydantic model."""
     model_schema = rec_strict_json_schema(model.model_json_schema())
@@ -18,7 +18,7 @@ def response_format_from_pydantic_model(
 
 
 def pydantic_model_from_json(
-    json_data: dict[str, Any], pydantic_model: Type[CustomPydanticModel]
+    json_data: Dict[str, Any], pydantic_model: Type[CustomPydanticModel]
 ) -> CustomPydanticModel:
     """Parse a JSON schema into a pydantic model."""
     return pydantic_model.model_validate(json_data)

mistralai/files.py

@@ -44,6 +44,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesUploadFileMultiPartBodyParams(
             file=utils.get_pydantic_model(file, models.File),
@@ -83,6 +85,7 @@ class Files(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_upload_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -148,6 +151,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesUploadFileMultiPartBodyParams(
             file=utils.get_pydantic_model(file, models.File),
@@ -187,6 +192,7 @@ class Files(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_upload_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -256,6 +262,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesListFilesRequest(
             page=page,
@@ -292,6 +300,7 @@ class Files(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_list_files",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -361,6 +370,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesListFilesRequest(
             page=page,
@@ -397,6 +408,7 @@ class Files(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_list_files",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -456,6 +468,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesRetrieveFileRequest(
             file_id=file_id,
@@ -487,6 +501,7 @@ class Files(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_retrieve_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -546,6 +561,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesRetrieveFileRequest(
             file_id=file_id,
@@ -577,6 +594,7 @@ class Files(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_retrieve_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -636,6 +654,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesDeleteFileRequest(
             file_id=file_id,
@@ -667,6 +687,7 @@ class Files(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_delete_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -726,6 +747,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesDeleteFileRequest(
             file_id=file_id,
@@ -757,6 +780,7 @@ class Files(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_delete_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -816,6 +840,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesDownloadFileRequest(
             file_id=file_id,
@@ -847,6 +873,7 @@ class Files(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_download_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -907,6 +934,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesDownloadFileRequest(
             file_id=file_id,
@@ -938,6 +967,7 @@ class Files(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_download_file",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -998,6 +1028,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesGetSignedURLRequest(
             file_id=file_id,
@@ -1030,6 +1062,7 @@ class Files(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_get_signed_url",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -1089,6 +1122,8 @@ class Files(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FilesAPIRoutesGetSignedURLRequest(
             file_id=file_id,
@@ -1121,6 +1156,7 @@ class Files(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="files_api_routes_get_signed_url",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(