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

mistralai/_hooks/types.py

@@ -7,16 +7,19 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 
 
 class HookContext:
+    base_url: str
     operation_id: str
     oauth2_scopes: Optional[List[str]] = None
     security_source: Optional[Union[Any, Callable[[], Any]]] = None
 
     def __init__(
         self,
+        base_url: str,
         operation_id: str,
         oauth2_scopes: Optional[List[str]],
         security_source: Optional[Union[Any, Callable[[], Any]]],
     ):
+        self.base_url = base_url
         self.operation_id = operation_id
         self.oauth2_scopes = oauth2_scopes
         self.security_source = security_source
@@ -25,21 +28,30 @@ class HookContext:
 class BeforeRequestContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
-            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+            hook_ctx.base_url,
+            hook_ctx.operation_id,
+            hook_ctx.oauth2_scopes,
+            hook_ctx.security_source,
         )
 
 
 class AfterSuccessContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
-            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+            hook_ctx.base_url,
+            hook_ctx.operation_id,
+            hook_ctx.oauth2_scopes,
+            hook_ctx.security_source,
         )
 
 
 class AfterErrorContext(HookContext):
     def __init__(self, hook_ctx: HookContext):
         super().__init__(
-            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+            hook_ctx.base_url,
+            hook_ctx.operation_id,
+            hook_ctx.oauth2_scopes,
+            hook_ctx.security_source,
         )
 
 

mistralai/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "mistralai"
-__version__: str = "1.5.0"
+__version__: str = "1.5.2-rc.1"
 __openapi_doc_version__: str = "0.0.2"
-__gen_version__: str = "2.497.0"
-__user_agent__: str = "speakeasy-sdk/python 1.5.0 2.497.0 0.0.2 mistralai"
+__gen_version__: str = "2.548.6"
+__user_agent__: str = "speakeasy-sdk/python 1.5.2-rc.1 2.548.6 0.0.2 mistralai"
 
 try:
     if __package__ is not None:

mistralai/agents.py

@@ -78,6 +78,8 @@ class Agents(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.AgentsCompletionRequest(
             max_tokens=max_tokens,
@@ -132,6 +134,7 @@ class Agents(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="agents_completion_v1_agents_completions_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -143,12 +146,14 @@ class Agents(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.ChatCompletionResponse)
         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(
@@ -236,6 +241,8 @@ class Agents(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.AgentsCompletionRequest(
             max_tokens=max_tokens,
@@ -290,6 +297,7 @@ class Agents(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="agents_completion_v1_agents_completions_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -301,12 +309,14 @@ class Agents(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.ChatCompletionResponse)
         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(
@@ -396,6 +406,8 @@ class Agents(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.AgentsCompletionStreamRequest(
             max_tokens=max_tokens,
@@ -450,6 +462,7 @@ class Agents(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="stream_agents",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -462,7 +475,7 @@ class Agents(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,
@@ -471,8 +484,10 @@ class Agents(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(
@@ -562,6 +577,8 @@ class Agents(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.AgentsCompletionStreamRequest(
             max_tokens=max_tokens,
@@ -616,6 +633,7 @@ class Agents(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="stream_agents",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -628,7 +646,7 @@ class Agents(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,
@@ -637,8 +655,10 @@ class Agents(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/basesdk.py

@@ -231,6 +231,10 @@ class BaseSDK:
                     req.headers,
                     get_body_content(req),
                 )
+
+                if client is None:
+                    raise ValueError("client is required")
+
                 http_res = client.send(req, stream=stream)
             except Exception as e:
                 _, e = self.sdk_configuration.get_hooks().after_error(
@@ -303,6 +307,10 @@ class BaseSDK:
                     req.headers,
                     get_body_content(req),
                 )
+
+                if client is None:
+                    raise ValueError("client is required")
+
                 http_res = await client.send(req, stream=stream)
             except Exception as e:
                 _, e = self.sdk_configuration.get_hooks().after_error(

mistralai/chat.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 eventstreaming, get_security_from_env
 from typing import Any, List, Mapping, Optional, Union
 
@@ -96,7 +96,7 @@ class Chat(BaseSDK):
     def complete(
         self,
         *,
-        model: Nullable[str],
+        model: str,
         messages: Union[List[models.Messages], List[models.MessagesTypedDict]],
         temperature: OptionalNullable[float] = UNSET,
         top_p: Optional[float] = None,
@@ -158,6 +158,8 @@ class Chat(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.ChatCompletionRequest(
             model=model,
@@ -213,6 +215,7 @@ class Chat(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="chat_completion_v1_chat_completions_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -224,12 +227,14 @@ class Chat(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.ChatCompletionResponse)
         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(
@@ -253,7 +258,7 @@ class Chat(BaseSDK):
     async def complete_async(
         self,
         *,
-        model: Nullable[str],
+        model: str,
         messages: Union[List[models.Messages], List[models.MessagesTypedDict]],
         temperature: OptionalNullable[float] = UNSET,
         top_p: Optional[float] = None,
@@ -315,6 +320,8 @@ class Chat(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.ChatCompletionRequest(
             model=model,
@@ -370,6 +377,7 @@ class Chat(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="chat_completion_v1_chat_completions_post",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -381,12 +389,14 @@ class Chat(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.ChatCompletionResponse)
         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(
@@ -410,7 +420,7 @@ class Chat(BaseSDK):
     def stream(
         self,
         *,
-        model: Nullable[str],
+        model: str,
         messages: Union[
             List[models.ChatCompletionStreamRequestMessages],
             List[models.ChatCompletionStreamRequestMessagesTypedDict],
@@ -482,6 +492,8 @@ class Chat(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.ChatCompletionStreamRequest(
             model=model,
@@ -539,6 +551,7 @@ class Chat(BaseSDK):
 
         http_res = self.do_request(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="stream_chat",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -551,7 +564,7 @@ class Chat(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,
@@ -560,8 +573,10 @@ class Chat(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(
@@ -585,7 +600,7 @@ class Chat(BaseSDK):
     async def stream_async(
         self,
         *,
-        model: Nullable[str],
+        model: str,
         messages: Union[
             List[models.ChatCompletionStreamRequestMessages],
             List[models.ChatCompletionStreamRequestMessagesTypedDict],
@@ -657,6 +672,8 @@ class Chat(BaseSDK):
 
         if server_url is not None:
             base_url = server_url
+        else:
+            base_url = self._get_url(base_url, url_variables)
 
         request = models.ChatCompletionStreamRequest(
             model=model,
@@ -714,6 +731,7 @@ class Chat(BaseSDK):
 
         http_res = await self.do_request_async(
             hook_ctx=HookContext(
+                base_url=base_url or "",
                 operation_id="stream_chat",
                 oauth2_scopes=[],
                 security_source=get_security_from_env(
@@ -726,7 +744,7 @@ class Chat(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,
@@ -735,8 +753,10 @@ class Chat(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(