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

mistralai/classifiers.py

@@ -40,6 +40,8 @@ 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(
             model=model,
@@ -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(
@@ -141,6 +146,8 @@ 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(
             model=model,
@@ -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(
@@ -227,7 +237,7 @@ class Classifiers(BaseSDK):
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
     ) -> models.ClassificationResponse:
-        r"""Moderations Chat
+        r"""Chat Moderations
 
         :param model:
         :param inputs: Chat to classify
@@ -244,6 +254,8 @@ 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.ChatModerationRequest(
             model=model,
@@ -280,7 +292,8 @@ class Classifiers(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
-                operation_id="moderations_chat_v1_chat_moderations_post",
+                base_url=base_url or "",
+                operation_id="chat_moderations_v1_chat_moderations_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
                     self.sdk_configuration.security, models.Security
@@ -291,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(
@@ -331,7 +346,7 @@ class Classifiers(BaseSDK):
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
     ) -> models.ClassificationResponse:
-        r"""Moderations Chat
+        r"""Chat Moderations
 
         :param model:
         :param inputs: Chat to classify
@@ -348,6 +363,8 @@ 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.ChatModerationRequest(
             model=model,
@@ -384,7 +401,8 @@ class Classifiers(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
-                operation_id="moderations_chat_v1_chat_moderations_post",
+                base_url=base_url or "",
+                operation_id="chat_moderations_v1_chat_moderations_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
                     self.sdk_configuration.security, models.Security
@@ -395,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

@@ -39,6 +39,8 @@ 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(
             model=model,
@@ -74,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(
@@ -85,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(
@@ -139,6 +144,8 @@ 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(
             model=model,
@@ -174,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(
@@ -185,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/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(

mistralai/fim.py

@@ -60,6 +60,8 @@ class Fim(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FIMCompletionRequest(
             model=model,
@@ -103,6 +105,7 @@ class Fim(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="fim_completion_v1_fim_completions_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -114,12 +117,14 @@ class Fim(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.FIMCompletionResponse)
         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(
@@ -189,6 +194,8 @@ class Fim(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FIMCompletionRequest(
             model=model,
@@ -232,6 +239,7 @@ class Fim(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="fim_completion_v1_fim_completions_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -243,12 +251,14 @@ class Fim(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.FIMCompletionResponse)
         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(
@@ -318,6 +328,8 @@ class Fim(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FIMCompletionStreamRequest(
             model=model,
@@ -361,6 +373,7 @@ class Fim(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="stream_fim",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -373,7 +386,7 @@ class Fim(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "text/event-stream"):
             return eventstreaming.EventStream(
                 http_res,
@@ -382,8 +395,10 @@ class Fim(BaseSDK):
             )
         if utils.match_response(http_res, "422", "application/json"):
             http_res_text = utils.stream_to_text(http_res)
-            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(
@@ -453,6 +468,8 @@ class Fim(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.FIMCompletionStreamRequest(
             model=model,
@@ -496,6 +513,7 @@ class Fim(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="stream_fim",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -508,7 +526,7 @@ class Fim(BaseSDK):
             retry_config=retry_config,
         )
 
-        data: Any = None
+        response_data: Any = None
         if utils.match_response(http_res, "200", "text/event-stream"):
             return eventstreaming.EventStreamAsync(
                 http_res,
@@ -517,8 +535,10 @@ class Fim(BaseSDK):
             )
         if utils.match_response(http_res, "422", "application/json"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            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/httpclient.py

@@ -94,7 +94,9 @@ class ClientOwner(Protocol):
 def close_clients(
     owner: ClientOwner,
     sync_client: Union[HttpClient, None],
+    sync_client_supplied: bool,
     async_client: Union[AsyncHttpClient, None],
+    async_client_supplied: bool,
 ) -> None:
     """
     A finalizer function that is meant to be used with weakref.finalize to close
@@ -107,13 +109,13 @@ def close_clients(
     owner.client = None
     owner.async_client = None
 
-    if sync_client is not None:
+    if sync_client is not None and not sync_client_supplied:
         try:
             sync_client.close()
         except Exception:
             pass
 
-    if async_client is not None:
+    if async_client is not None and not async_client_supplied:
         is_async = False
         try:
             asyncio.get_running_loop()