mistralai 1.2.4__py3-none-any.whl → 1.2.6__py3-none-any.whl

mistralai_azure/basesdk.py

@@ -9,7 +9,8 @@ from mistralai_azure._hooks import (
     BeforeRequestContext,
 )
 from mistralai_azure.utils import RetryConfig, SerializedRequestBody, get_body_content
-from typing import Callable, List, Optional, Tuple
+from typing import Callable, List, Mapping, Optional, Tuple
+from urllib.parse import parse_qs, urlparse
 
 
 class BaseSDK:
@@ -18,7 +19,7 @@ class BaseSDK:
     def __init__(self, sdk_config: SDKConfiguration) -> None:
         self.sdk_configuration = sdk_config
 
-    def get_url(self, base_url, url_variables):
+    def _get_url(self, base_url, url_variables):
         sdk_url, sdk_variables = self.sdk_configuration.get_server_details()
 
         if base_url is None:
@@ -29,7 +30,7 @@ class BaseSDK:
 
         return utils.template_url(base_url, url_variables)
 
-    def build_request_async(
+    def _build_request_async(
         self,
         method,
         path,
@@ -48,9 +49,10 @@ class BaseSDK:
             Callable[[], Optional[SerializedRequestBody]]
         ] = None,
         url_override: Optional[str] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> httpx.Request:
         client = self.sdk_configuration.async_client
-        return self.build_request_with_client(
+        return self._build_request_with_client(
             client,
             method,
             path,
@@ -67,9 +69,10 @@ class BaseSDK:
             timeout_ms,
             get_serialized_body,
             url_override,
+            http_headers,
         )
 
-    def build_request(
+    def _build_request(
         self,
         method,
         path,
@@ -88,9 +91,10 @@ class BaseSDK:
             Callable[[], Optional[SerializedRequestBody]]
         ] = None,
         url_override: Optional[str] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> httpx.Request:
         client = self.sdk_configuration.client
-        return self.build_request_with_client(
+        return self._build_request_with_client(
             client,
             method,
             path,
@@ -107,9 +111,10 @@ class BaseSDK:
             timeout_ms,
             get_serialized_body,
             url_override,
+            http_headers,
         )
 
-    def build_request_with_client(
+    def _build_request_with_client(
         self,
         client,
         method,
@@ -129,13 +134,14 @@ class BaseSDK:
             Callable[[], Optional[SerializedRequestBody]]
         ] = None,
         url_override: Optional[str] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> httpx.Request:
         query_params = {}
 
         url = url_override
         if url is None:
             url = utils.generate_url(
-                self.get_url(base_url, url_variables),
+                self._get_url(base_url, url_variables),
                 path,
                 request if request_has_path_params else None,
                 _globals if request_has_path_params else None,
@@ -145,6 +151,12 @@ class BaseSDK:
                 request if request_has_query_params else None,
                 _globals if request_has_query_params else None,
             )
+        else:
+            # Pick up the query parameter from the override so they can be
+            # preserved when building the request later on (necessary as of
+            # httpx 0.28).
+            parsed_override = urlparse(str(url_override))
+            query_params = parse_qs(parsed_override.query, keep_blank_values=True)
 
         headers = utils.get_headers(request, _globals)
         headers["Accept"] = accept_header_value
@@ -159,7 +171,7 @@ class BaseSDK:
             headers = {**headers, **security_headers}
             query_params = {**query_params, **security_query_params}
 
-        serialized_request_body = SerializedRequestBody("application/octet-stream")
+        serialized_request_body = SerializedRequestBody()
         if get_serialized_body is not None:
             rb = get_serialized_body()
             if request_body_required and rb is None:
@@ -178,6 +190,10 @@ class BaseSDK:
         ):
             headers["content-type"] = serialized_request_body.media_type
 
+        if http_headers is not None:
+            for header, value in http_headers.items():
+                headers[header] = value
+
         timeout = timeout_ms / 1000 if timeout_ms is not None else None
 
         return client.build_request(

mistralai_azure/chat.py

@@ -5,7 +5,7 @@ from mistralai_azure import models, utils
 from mistralai_azure._hooks import HookContext
 from mistralai_azure.types import OptionalNullable, UNSET
 from mistralai_azure.utils import eventstreaming
-from typing import Any, List, Optional, Union
+from typing import Any, List, Mapping, Optional, Union
 
 
 class Chat(BaseSDK):
@@ -17,7 +17,7 @@ class Chat(BaseSDK):
         messages: Union[List[models.Messages], List[models.MessagesTypedDict]],
         model: OptionalNullable[str] = "azureai",
         temperature: OptionalNullable[float] = UNSET,
-        top_p: Optional[float] = 1,
+        top_p: Optional[float] = None,
         max_tokens: OptionalNullable[int] = UNSET,
         stream: Optional[bool] = True,
         stop: Optional[Union[models.Stop, models.StopTypedDict]] = None,
@@ -37,10 +37,11 @@ class Chat(BaseSDK):
         presence_penalty: Optional[float] = None,
         frequency_penalty: Optional[float] = None,
         n: OptionalNullable[int] = UNSET,
-        safe_prompt: Optional[bool] = False,
+        safe_prompt: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> Optional[eventstreaming.EventStream[models.CompletionEvent]]:
         r"""Stream chat completion
 
@@ -64,6 +65,7 @@ class Chat(BaseSDK):
         :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
+        :param http_headers: Additional headers to set or replace on requests.
         """
         base_url = None
         url_variables = None
@@ -95,7 +97,7 @@ class Chat(BaseSDK):
             safe_prompt=safe_prompt,
         )
 
-        req = self.build_request(
+        req = self._build_request(
             method="POST",
             path="/chat/completions#stream",
             base_url=base_url,
@@ -106,6 +108,7 @@ class Chat(BaseSDK):
             request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="text/event-stream",
+            http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.ChatCompletionStreamRequest
@@ -165,7 +168,7 @@ class Chat(BaseSDK):
         messages: Union[List[models.Messages], List[models.MessagesTypedDict]],
         model: OptionalNullable[str] = "azureai",
         temperature: OptionalNullable[float] = UNSET,
-        top_p: Optional[float] = 1,
+        top_p: Optional[float] = None,
         max_tokens: OptionalNullable[int] = UNSET,
         stream: Optional[bool] = True,
         stop: Optional[Union[models.Stop, models.StopTypedDict]] = None,
@@ -185,10 +188,11 @@ class Chat(BaseSDK):
         presence_penalty: Optional[float] = None,
         frequency_penalty: Optional[float] = None,
         n: OptionalNullable[int] = UNSET,
-        safe_prompt: Optional[bool] = False,
+        safe_prompt: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> Optional[eventstreaming.EventStreamAsync[models.CompletionEvent]]:
         r"""Stream chat completion
 
@@ -212,6 +216,7 @@ class Chat(BaseSDK):
         :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
+        :param http_headers: Additional headers to set or replace on requests.
         """
         base_url = None
         url_variables = None
@@ -243,7 +248,7 @@ class Chat(BaseSDK):
             safe_prompt=safe_prompt,
         )
 
-        req = self.build_request_async(
+        req = self._build_request_async(
             method="POST",
             path="/chat/completions#stream",
             base_url=base_url,
@@ -254,6 +259,7 @@ class Chat(BaseSDK):
             request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="text/event-stream",
+            http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.ChatCompletionStreamRequest
@@ -316,7 +322,7 @@ class Chat(BaseSDK):
         ],
         model: OptionalNullable[str] = "azureai",
         temperature: OptionalNullable[float] = UNSET,
-        top_p: Optional[float] = 1,
+        top_p: Optional[float] = None,
         max_tokens: OptionalNullable[int] = UNSET,
         stream: Optional[bool] = False,
         stop: Optional[
@@ -341,10 +347,11 @@ class Chat(BaseSDK):
         presence_penalty: Optional[float] = None,
         frequency_penalty: Optional[float] = None,
         n: OptionalNullable[int] = UNSET,
-        safe_prompt: Optional[bool] = False,
+        safe_prompt: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> Optional[models.ChatCompletionResponse]:
         r"""Chat Completion
 
@@ -366,6 +373,7 @@ class Chat(BaseSDK):
         :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
+        :param http_headers: Additional headers to set or replace on requests.
         """
         base_url = None
         url_variables = None
@@ -399,7 +407,7 @@ class Chat(BaseSDK):
             safe_prompt=safe_prompt,
         )
 
-        req = self.build_request(
+        req = self._build_request(
             method="POST",
             path="/chat/completions",
             base_url=base_url,
@@ -410,6 +418,7 @@ class Chat(BaseSDK):
             request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
+            http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.ChatCompletionRequest
@@ -468,7 +477,7 @@ class Chat(BaseSDK):
         ],
         model: OptionalNullable[str] = "azureai",
         temperature: OptionalNullable[float] = UNSET,
-        top_p: Optional[float] = 1,
+        top_p: Optional[float] = None,
         max_tokens: OptionalNullable[int] = UNSET,
         stream: Optional[bool] = False,
         stop: Optional[
@@ -493,10 +502,11 @@ class Chat(BaseSDK):
         presence_penalty: Optional[float] = None,
         frequency_penalty: Optional[float] = None,
         n: OptionalNullable[int] = UNSET,
-        safe_prompt: Optional[bool] = False,
+        safe_prompt: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> Optional[models.ChatCompletionResponse]:
         r"""Chat Completion
 
@@ -518,6 +528,7 @@ class Chat(BaseSDK):
         :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
+        :param http_headers: Additional headers to set or replace on requests.
         """
         base_url = None
         url_variables = None
@@ -551,7 +562,7 @@ class Chat(BaseSDK):
             safe_prompt=safe_prompt,
         )
 
-        req = self.build_request_async(
+        req = self._build_request_async(
             method="POST",
             path="/chat/completions",
             base_url=base_url,
@@ -562,6 +573,7 @@ class Chat(BaseSDK):
             request_has_query_params=True,
             user_agent_header="user-agent",
             accept_header_value="application/json",
+            http_headers=http_headers,
             security=self.sdk_configuration.security,
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.ChatCompletionRequest

mistralai_azure/models/chatcompletionrequest.py

@@ -107,7 +107,7 @@ class ChatCompletionRequest(BaseModel):
     temperature: OptionalNullable[float] = UNSET
     r"""What sampling temperature to use, we recommend between 0.0 and 0.7. Higher values like 0.7 will make the output more random, while lower values like 0.2 will make it more focused and deterministic. We generally recommend altering this or `top_p` but not both. The default value varies depending on the model you are targeting. Call the `/models` endpoint to retrieve the appropriate value."""
 
-    top_p: Optional[float] = 1
+    top_p: Optional[float] = None
     r"""Nucleus sampling, where the model considers the results of the tokens with `top_p` probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. We generally recommend altering this or `temperature` but not both."""
 
     max_tokens: OptionalNullable[int] = UNSET
@@ -137,7 +137,7 @@ class ChatCompletionRequest(BaseModel):
     n: OptionalNullable[int] = UNSET
     r"""Number of completions to return for each request, input tokens are only billed once."""
 
-    safe_prompt: Optional[bool] = False
+    safe_prompt: Optional[bool] = None
     r"""Whether to inject a safety prompt before all conversations."""
 
     @model_serializer(mode="wrap")

mistralai_azure/models/chatcompletionstreamrequest.py

@@ -102,7 +102,7 @@ class ChatCompletionStreamRequest(BaseModel):
     temperature: OptionalNullable[float] = UNSET
     r"""What sampling temperature to use, we recommend between 0.0 and 0.7. Higher values like 0.7 will make the output more random, while lower values like 0.2 will make it more focused and deterministic. We generally recommend altering this or `top_p` but not both. The default value varies depending on the model you are targeting. Call the `/models` endpoint to retrieve the appropriate value."""
 
-    top_p: Optional[float] = 1
+    top_p: Optional[float] = None
     r"""Nucleus sampling, where the model considers the results of the tokens with `top_p` probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered. We generally recommend altering this or `temperature` but not both."""
 
     max_tokens: OptionalNullable[int] = UNSET
@@ -131,7 +131,7 @@ class ChatCompletionStreamRequest(BaseModel):
     n: OptionalNullable[int] = UNSET
     r"""Number of completions to return for each request, input tokens are only billed once."""
 
-    safe_prompt: Optional[bool] = False
+    safe_prompt: Optional[bool] = None
     r"""Whether to inject a safety prompt before all conversations."""
 
     @model_serializer(mode="wrap")

mistralai_azure/sdkconfiguration.py

@@ -28,9 +28,9 @@ class SDKConfiguration:
     server: Optional[str] = ""
     language: str = "python"
     openapi_doc_version: str = "0.0.2"
-    sdk_version: str = "1.2.3"
-    gen_version: str = "2.470.1"
-    user_agent: str = "speakeasy-sdk/python 1.2.3 2.470.1 0.0.2 mistralai_azure"
+    sdk_version: str = "1.2.6"
+    gen_version: str = "2.486.1"
+    user_agent: str = "speakeasy-sdk/python 1.2.6 2.486.1 0.0.2 mistralai_azure"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 

mistralai_azure/utils/forms.py

@@ -109,13 +109,12 @@ def serialize_multipart_form(
         if not field_metadata:
             continue
 
-        f_name = field.alias if field.alias is not None else name
+        f_name = field.alias if field.alias else name
 
         if field_metadata.file:
             file_fields: Dict[str, FieldInfo] = val.__class__.model_fields
 
             file_name = ""
-            field_name = ""
             content = None
             content_type = None
 
@@ -131,20 +130,15 @@ def serialize_multipart_form(
                 elif file_field_name == "content_type":
                     content_type = getattr(val, file_field_name, None)
                 else:
-                    field_name = (
-                        file_field.alias
-                        if file_field.alias is not None
-                        else file_field_name
-                    )
                     file_name = getattr(val, file_field_name)
 
-            if field_name == "" or file_name == "" or content is None:
+            if file_name == "" or content is None:
                 raise ValueError("invalid multipart/form-data file")
 
             if content_type is not None:
-                files[field_name] = (file_name, content, content_type)
+                files[f_name] = (file_name, content, content_type)
             else:
-                files[field_name] = (file_name, content)
+                files[f_name] = (file_name, content)
         elif field_metadata.json:
             files[f_name] = (
                 None,

mistralai_azure/utils/requestbodies.py

@@ -23,7 +23,7 @@ SERIALIZATION_METHOD_TO_CONTENT_TYPE = {
 
 @dataclass
 class SerializedRequestBody:
-    media_type: str
+    media_type: Optional[str] = None
     content: Optional[Any] = None
     data: Optional[Any] = None
     files: Optional[Any] = None

mistralai_gcp/_hooks/custom_user_agent.py

@@ -5,12 +5,18 @@ import httpx
 
 from .types import BeforeRequestContext, BeforeRequestHook
 
+PREFIX = "mistral-client-python/"
 
 class CustomUserAgentHook(BeforeRequestHook):
     def before_request(
         self, hook_ctx: BeforeRequestContext, request: httpx.Request
     ) -> Union[httpx.Request, Exception]:
+        current = request.headers["user-agent"]
+        if current.startswith(PREFIX):
+            return request
+        
         request.headers["user-agent"] = (
-            "mistral-client-python/" + request.headers["user-agent"].split(" ")[1]
+            PREFIX + current.split(" ")[1]
         )
+
         return request

mistralai_gcp/_version.py

@@ -3,7 +3,7 @@
 import importlib.metadata
 
 __title__: str = "mistralai-gcp"
-__version__: str = "1.2.3"
+__version__: str = "1.2.6"
 
 try:
     if __package__ is not None:

mistralai_gcp/basesdk.py

@@ -9,7 +9,8 @@ from mistralai_gcp._hooks import (
     BeforeRequestContext,
 )
 from mistralai_gcp.utils import RetryConfig, SerializedRequestBody, get_body_content
-from typing import Callable, List, Optional, Tuple
+from typing import Callable, List, Mapping, Optional, Tuple
+from urllib.parse import parse_qs, urlparse
 
 
 class BaseSDK:
@@ -18,7 +19,7 @@ class BaseSDK:
     def __init__(self, sdk_config: SDKConfiguration) -> None:
         self.sdk_configuration = sdk_config
 
-    def get_url(self, base_url, url_variables):
+    def _get_url(self, base_url, url_variables):
         sdk_url, sdk_variables = self.sdk_configuration.get_server_details()
 
         if base_url is None:
@@ -29,7 +30,7 @@ class BaseSDK:
 
         return utils.template_url(base_url, url_variables)
 
-    def build_request_async(
+    def _build_request_async(
         self,
         method,
         path,
@@ -48,9 +49,10 @@ class BaseSDK:
             Callable[[], Optional[SerializedRequestBody]]
         ] = None,
         url_override: Optional[str] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> httpx.Request:
         client = self.sdk_configuration.async_client
-        return self.build_request_with_client(
+        return self._build_request_with_client(
             client,
             method,
             path,
@@ -67,9 +69,10 @@ class BaseSDK:
             timeout_ms,
             get_serialized_body,
             url_override,
+            http_headers,
         )
 
-    def build_request(
+    def _build_request(
         self,
         method,
         path,
@@ -88,9 +91,10 @@ class BaseSDK:
             Callable[[], Optional[SerializedRequestBody]]
         ] = None,
         url_override: Optional[str] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> httpx.Request:
         client = self.sdk_configuration.client
-        return self.build_request_with_client(
+        return self._build_request_with_client(
             client,
             method,
             path,
@@ -107,9 +111,10 @@ class BaseSDK:
             timeout_ms,
             get_serialized_body,
             url_override,
+            http_headers,
         )
 
-    def build_request_with_client(
+    def _build_request_with_client(
         self,
         client,
         method,
@@ -129,13 +134,14 @@ class BaseSDK:
             Callable[[], Optional[SerializedRequestBody]]
         ] = None,
         url_override: Optional[str] = None,
+        http_headers: Optional[Mapping[str, str]] = None,
     ) -> httpx.Request:
         query_params = {}
 
         url = url_override
         if url is None:
             url = utils.generate_url(
-                self.get_url(base_url, url_variables),
+                self._get_url(base_url, url_variables),
                 path,
                 request if request_has_path_params else None,
                 _globals if request_has_path_params else None,
@@ -145,6 +151,12 @@ class BaseSDK:
                 request if request_has_query_params else None,
                 _globals if request_has_query_params else None,
             )
+        else:
+            # Pick up the query parameter from the override so they can be
+            # preserved when building the request later on (necessary as of
+            # httpx 0.28).
+            parsed_override = urlparse(str(url_override))
+            query_params = parse_qs(parsed_override.query, keep_blank_values=True)
 
         headers = utils.get_headers(request, _globals)
         headers["Accept"] = accept_header_value
@@ -159,7 +171,7 @@ class BaseSDK:
             headers = {**headers, **security_headers}
             query_params = {**query_params, **security_query_params}
 
-        serialized_request_body = SerializedRequestBody("application/octet-stream")
+        serialized_request_body = SerializedRequestBody()
         if get_serialized_body is not None:
             rb = get_serialized_body()
             if request_body_required and rb is None:
@@ -178,6 +190,10 @@ class BaseSDK:
         ):
             headers["content-type"] = serialized_request_body.media_type
 
+        if http_headers is not None:
+            for header, value in http_headers.items():
+                headers[header] = value
+
         timeout = timeout_ms / 1000 if timeout_ms is not None else None
 
         return client.build_request(