mistralai 1.0.2__py3-none-any.whl → 1.1.0__py3-none-any.whl

mistralai_gcp/models/tooltypes.py

@@ -0,0 +1,8 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from mistralai_gcp.types import UnrecognizedStr
+from typing import Literal, Union
+
+
+ToolTypes = Union[Literal["function"], UnrecognizedStr]

mistralai_gcp/models/usageinfo.py

@@ -9,10 +9,11 @@ class UsageInfoTypedDict(TypedDict):
     prompt_tokens: int
     completion_tokens: int
     total_tokens: int
-    
+
 
 class UsageInfo(BaseModel):
     prompt_tokens: int
+
     completion_tokens: int
+
     total_tokens: int
-    

mistralai_gcp/models/usermessage.py

@@ -1,26 +1,27 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .textchunk import TextChunk, TextChunkTypedDict
+from .contentchunk import ContentChunk, ContentChunkTypedDict
 from mistralai_gcp.types import BaseModel
 from typing import List, Literal, Optional, TypedDict, Union
 from typing_extensions import NotRequired
 
 
-UserMessageContentTypedDict = Union[str, List[TextChunkTypedDict]]
+UserMessageContentTypedDict = Union[str, List[ContentChunkTypedDict]]
 
 
-UserMessageContent = Union[str, List[TextChunk]]
+UserMessageContent = Union[str, List[ContentChunk]]
 
 
 UserMessageRole = Literal["user"]
 
+
 class UserMessageTypedDict(TypedDict):
     content: UserMessageContentTypedDict
     role: NotRequired[UserMessageRole]
-    
+
 
 class UserMessage(BaseModel):
     content: UserMessageContent
+
     role: Optional[UserMessageRole] = "user"
-    

mistralai_gcp/models/validationerror.py

@@ -15,10 +15,11 @@ class ValidationErrorTypedDict(TypedDict):
     loc: List[LocTypedDict]
     msg: str
     type: str
-    
+
 
 class ValidationError(BaseModel):
     loc: List[Loc]
+
     msg: str
+
     type: str
-    

mistralai_gcp/sdk.py

@@ -32,6 +32,7 @@ class MistralGoogleCloud(BaseSDK):
         self,
         region: str = "europe-west4",
         project_id: Optional[str] = None,
+        access_token: Optional[str] = None,
         client: Optional[HttpClient] = None,
         async_client: Optional[AsyncHttpClient] = None,
         retry_config: Optional[Nullable[RetryConfig]] = None,
@@ -46,22 +47,25 @@ class MistralGoogleCloud(BaseSDK):
         :param retry_config: The retry configuration to use for all supported methods
         """
 
-        credentials, loaded_project_id = google.auth.default(
-            scopes=["https://www.googleapis.com/auth/cloud-platform"],
-        )
-
-        if not isinstance(credentials, google.auth.credentials.Credentials):
-            raise models.SDKError(
-                "credentials must be an instance of google.auth.credentials.Credentials"
+        if not access_token:
+            credentials, loaded_project_id = google.auth.default(
+                scopes=["https://www.googleapis.com/auth/cloud-platform"],
             )
+            credentials.refresh(google.auth.transport.requests.Request())
+
+            if not isinstance(credentials, google.auth.credentials.Credentials):
+                raise models.SDKError(
+                    "credentials must be an instance of google.auth.credentials.Credentials"
+                )
 
-        project_id = project_id or loaded_project_id
+            project_id = project_id or loaded_project_id
         if project_id is None:
             raise models.SDKError("project_id must be provided")
 
         def auth_token() -> str:
-            if credentials.expired:
-                credentials.refresh(google.auth.transport.requests.Request())
+            if access_token:
+                return access_token
+            credentials.refresh(google.auth.transport.requests.Request())
             token = credentials.token
             if not token:
                 raise models.SDKError("Failed to get token from credentials")

mistralai_gcp/sdkconfiguration.py

@@ -1,6 +1,5 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-
 from ._hooks import SDKHooks
 from .httpclient import AsyncHttpClient, HttpClient
 from .utils import Logger, RetryConfig, remove_suffix
@@ -14,7 +13,7 @@ from typing import Callable, Dict, Optional, Tuple, Union
 SERVER_PROD = "prod"
 r"""Production server"""
 SERVERS = {
-	SERVER_PROD: "https://api.mistral.ai",
+    SERVER_PROD: "https://api.mistral.ai",
 }
 """Contains the list of servers available to the SDK"""
 
@@ -24,14 +23,14 @@ class SDKConfiguration:
     client: HttpClient
     async_client: AsyncHttpClient
     debug_logger: Logger
-    security: Optional[Union[models.Security,Callable[[], models.Security]]] = None
+    security: Optional[Union[models.Security, Callable[[], models.Security]]] = None
     server_url: Optional[str] = ""
     server: Optional[str] = ""
     language: str = "python"
     openapi_doc_version: str = "0.0.2"
-    sdk_version: str = "1.0.1"
-    gen_version: str = "2.399.0"
-    user_agent: str = "speakeasy-sdk/python 1.0.1 2.399.0 0.0.2 mistralai-gcp"
+    sdk_version: str = "1.2.2"
+    gen_version: str = "2.415.6"
+    user_agent: str = "speakeasy-sdk/python 1.2.2 2.415.6 0.0.2 mistralai-gcp"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 
@@ -45,10 +44,9 @@ class SDKConfiguration:
             self.server = SERVER_PROD
 
         if self.server not in SERVERS:
-            raise ValueError(f"Invalid server \"{self.server}\"")
+            raise ValueError(f'Invalid server "{self.server}"')
 
         return SERVERS[self.server], {}
 
-
     def get_hooks(self) -> SDKHooks:
         return self._hooks

mistralai_gcp/utils/__init__.py

@@ -33,8 +33,13 @@ from .serializers import (
     validate_open_enum,
 )
 from .url import generate_url, template_url, remove_suffix
-from .values import get_global_from_env, match_content_type, match_status_codes, match_response
-from .logger import Logger, get_body_content, NoOpLogger
+from .values import (
+    get_global_from_env,
+    match_content_type,
+    match_status_codes,
+    match_response,
+)
+from .logger import Logger, get_body_content, get_default_logger
 
 __all__ = [
     "BackoffStrategy",
@@ -43,6 +48,7 @@ __all__ = [
     "FormMetadata",
     "generate_url",
     "get_body_content",
+    "get_default_logger",
     "get_discriminator",
     "get_global_from_env",
     "get_headers",
@@ -57,7 +63,6 @@ __all__ = [
     "match_status_codes",
     "match_response",
     "MultipartFormMetadata",
-    "NoOpLogger",
     "OpenEnumMeta",
     "PathParamMetadata",
     "QueryParamMetadata",

mistralai_gcp/utils/forms.py

@@ -17,7 +17,7 @@ from .metadata import (
     MultipartFormMetadata,
     find_field_metadata,
 )
-from .values import _val_to_string
+from .values import _is_set, _val_to_string
 
 
 def _populate_form(
@@ -27,7 +27,7 @@ def _populate_form(
     delimiter: str,
     form: Dict[str, List[str]],
 ):
-    if obj is None:
+    if not _is_set(obj):
         return form
 
     if isinstance(obj, BaseModel):
@@ -41,7 +41,7 @@ def _populate_form(
                 continue
 
             val = getattr(obj, name)
-            if val is None:
+            if not _is_set(val):
                 continue
 
             if explode:
@@ -54,7 +54,7 @@ def _populate_form(
     elif isinstance(obj, Dict):
         items = []
         for key, value in obj.items():
-            if value is None:
+            if not _is_set(value):
                 continue
 
             if explode:
@@ -68,7 +68,7 @@ def _populate_form(
         items = []
 
         for value in obj:
-            if value is None:
+            if not _is_set(value):
                 continue
 
             if explode:
@@ -102,7 +102,7 @@ def serialize_multipart_form(
         field = request_fields[name]
 
         val = getattr(request, name)
-        if val is None:
+        if not _is_set(val):
             continue
 
         field_metadata = find_field_metadata(field, MultipartFormMetadata)
@@ -156,7 +156,7 @@ def serialize_multipart_form(
                 values = []
 
                 for value in val:
-                    if value is None:
+                    if not _is_set(value):
                         continue
                     values.append(_val_to_string(value))
 
@@ -176,7 +176,7 @@ def serialize_form_data(data: Any) -> Dict[str, Any]:
             field = data_fields[name]
 
             val = getattr(data, name)
-            if val is None:
+            if not _is_set(val):
                 continue
 
             metadata = find_field_metadata(field, FormMetadata)
@@ -200,7 +200,8 @@ def serialize_form_data(data: Any) -> Dict[str, Any]:
                     raise ValueError(f"Invalid form style for field {name}")
     elif isinstance(data, Dict):
         for key, value in data.items():
-            form[key] = [_val_to_string(value)]
+            if _is_set(value):
+                form[key] = [_val_to_string(value)]
     else:
         raise TypeError(f"Invalid request body type {type(data)} for form data")
 

mistralai_gcp/utils/headers.py

@@ -15,16 +15,16 @@ from .metadata import (
     find_field_metadata,
 )
 
-from .values import _populate_from_globals, _val_to_string
+from .values import _is_set, _populate_from_globals, _val_to_string
 
 
 def get_headers(headers_params: Any, gbls: Optional[Any] = None) -> Dict[str, str]:
     headers: Dict[str, str] = {}
 
     globals_already_populated = []
-    if headers_params is not None:
+    if _is_set(headers_params):
         globals_already_populated = _populate_headers(headers_params, gbls, headers, [])
-    if gbls is not None:
+    if _is_set(gbls):
         _populate_headers(gbls, None, headers, globals_already_populated)
 
     return headers
@@ -67,7 +67,7 @@ def _populate_headers(
 
 
 def _serialize_header(explode: bool, obj: Any) -> str:
-    if obj is None:
+    if not _is_set(obj):
         return ""
 
     if isinstance(obj, BaseModel):
@@ -83,7 +83,7 @@ def _serialize_header(explode: bool, obj: Any) -> str:
             f_name = obj_field.alias if obj_field.alias is not None else name
 
             val = getattr(obj, name)
-            if val is None:
+            if not _is_set(val):
                 continue
 
             if explode:
@@ -98,7 +98,7 @@ def _serialize_header(explode: bool, obj: Any) -> str:
         items = []
 
         for key, value in obj.items():
-            if value is None:
+            if not _is_set(value):
                 continue
 
             if explode:
@@ -113,14 +113,14 @@ def _serialize_header(explode: bool, obj: Any) -> str:
         items = []
 
         for value in obj:
-            if value is None:
+            if not _is_set(value):
                 continue
 
             items.append(_val_to_string(value))
 
         if len(items) > 0:
             return ",".join(items)
-    else:
+    elif _is_set(obj):
         return f"{_val_to_string(obj)}"
 
     return ""

mistralai_gcp/utils/logger.py

@@ -3,14 +3,20 @@
 import httpx
 from typing import Any, Protocol
 
+
 class Logger(Protocol):
     def debug(self, msg: str, *args: Any, **kwargs: Any) -> None:
         pass
 
+
 class NoOpLogger:
     def debug(self, msg: str, *args: Any, **kwargs: Any) -> None:
         pass
 
+
 def get_body_content(req: httpx.Request) -> str:
     return "<streaming body>" if not hasattr(req, "_content") else str(req.content)
 
+
+def get_default_logger() -> Logger:
+    return NoOpLogger()

mistralai_gcp/utils/queryparams.py

@@ -15,7 +15,12 @@ from .metadata import (
     QueryParamMetadata,
     find_field_metadata,
 )
-from .values import _get_serialized_params, _populate_from_globals, _val_to_string
+from .values import (
+    _get_serialized_params,
+    _is_set,
+    _populate_from_globals,
+    _val_to_string,
+)
 from .forms import _populate_form
 
 
@@ -26,7 +31,7 @@ def get_query_params(
     params: Dict[str, List[str]] = {}
 
     globals_already_populated = _populate_query_params(query_params, gbls, params, [])
-    if gbls is not None:
+    if _is_set(gbls):
         _populate_query_params(gbls, None, params, globals_already_populated)
 
     return params
@@ -55,7 +60,7 @@ def _populate_query_params(
         if not metadata:
             continue
 
-        value = getattr(query_params, name) if query_params is not None else None
+        value = getattr(query_params, name) if _is_set(query_params) else None
 
         value, global_found = _populate_from_globals(
             name, value, QueryParamMetadata, gbls
@@ -99,7 +104,7 @@ def _populate_deep_object_query_params(
     obj: Any,
     params: Dict[str, List[str]],
 ):
-    if obj is None:
+    if not _is_set(obj):
         return
 
     if isinstance(obj, BaseModel):
@@ -113,10 +118,7 @@ def _populate_deep_object_query_params_basemodel(
     obj: Any,
     params: Dict[str, List[str]],
 ):
-    if obj is None:
-        return
-
-    if not isinstance(obj, BaseModel):
+    if not _is_set(obj) or not isinstance(obj, BaseModel):
         return
 
     obj_fields: Dict[str, FieldInfo] = obj.__class__.model_fields
@@ -128,11 +130,11 @@ def _populate_deep_object_query_params_basemodel(
         params_key = f"{prior_params_key}[{f_name}]"
 
         obj_param_metadata = find_field_metadata(obj_field, QueryParamMetadata)
-        if obj_param_metadata is None:
+        if not _is_set(obj_param_metadata):
             continue
 
         obj_val = getattr(obj, name)
-        if obj_val is None:
+        if not _is_set(obj_val):
             continue
 
         if isinstance(obj_val, BaseModel):
@@ -150,11 +152,11 @@ def _populate_deep_object_query_params_dict(
     value: Dict,
     params: Dict[str, List[str]],
 ):
-    if value is None:
+    if not _is_set(value):
         return
 
     for key, val in value.items():
-        if val is None:
+        if not _is_set(val):
             continue
 
         params_key = f"{prior_params_key}[{key}]"
@@ -174,11 +176,11 @@ def _populate_deep_object_query_params_list(
     value: List,
     params: Dict[str, List[str]],
 ):
-    if value is None:
+    if not _is_set(value):
         return
 
     for val in value:
-        if val is None:
+        if not _is_set(val):
             continue
 
         if params.get(params_key) is None:

mistralai_gcp/utils/retries.py

@@ -1,5 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
+import asyncio
 import random
 import time
 from typing import List
@@ -212,5 +213,5 @@ async def retry_with_backoff_async(
                 raise
             sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
             sleep = min(sleep, max_interval / 1000)
-            time.sleep(sleep)
+            await asyncio.sleep(sleep)
             retries += 1

mistralai_gcp/utils/security.py

@@ -16,7 +16,6 @@ from .metadata import (
 )
 
 
-
 def get_security(security: Any) -> Tuple[Dict[str, str], Dict[str, List[str]]]:
     headers: Dict[str, str] = {}
     query_params: Dict[str, List[str]] = {}
@@ -42,8 +41,10 @@ def get_security(security: Any) -> Tuple[Dict[str, str], Dict[str, List[str]]]:
             _parse_security_option(headers, query_params, value)
             return headers, query_params
         if metadata.scheme:
-            # Special case for basic auth which could be a flattened model
-            if metadata.sub_type == "basic" and not isinstance(value, BaseModel):
+            # Special case for basic auth or custom auth which could be a flattened model
+            if metadata.sub_type in ["basic", "custom"] and not isinstance(
+                value, BaseModel
+            ):
                 _parse_security_scheme(headers, query_params, metadata, name, security)
             else:
                 _parse_security_scheme(headers, query_params, metadata, name, value)
@@ -80,9 +81,12 @@ def _parse_security_scheme(
     sub_type = scheme_metadata.sub_type
 
     if isinstance(scheme, BaseModel):
-        if scheme_type == "http" and sub_type == "basic":
-            _parse_basic_auth_scheme(headers, scheme)
-            return
+        if scheme_type == "http":
+            if sub_type == "basic":
+                _parse_basic_auth_scheme(headers, scheme)
+                return
+            if sub_type == "custom":
+                return
 
         scheme_fields: Dict[str, FieldInfo] = scheme.__class__.model_fields
         for name in scheme_fields:
@@ -131,6 +135,8 @@ def _parse_security_scheme_value(
     elif scheme_type == "http":
         if sub_type == "bearer":
             headers[header_name] = _apply_bearer(value)
+        elif sub_type == "custom":
+            return
         else:
             raise ValueError("sub type {sub_type} not supported")
     else:

mistralai_gcp/utils/serializers.py

@@ -9,13 +9,15 @@ from pydantic import ConfigDict, create_model
 from pydantic_core import from_json
 from typing_inspect import is_optional_type
 
-from ..types.basemodel import BaseModel, Nullable, OptionalNullable
+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:
             return None
+        if isinstance(d, Unset):
+            return d
 
         if not isinstance(d, Decimal):
             raise ValueError("Expected Decimal object")
@@ -29,7 +31,7 @@ def validate_decimal(d):
     if d is None:
         return None
 
-    if isinstance(d, Decimal):
+    if isinstance(d, (Decimal, Unset)):
         return d
 
     if not isinstance(d, (str, int, float)):
@@ -42,6 +44,8 @@ def serialize_float(as_str: bool):
     def serialize(f):
         if is_optional_type(type(f)) and f is None:
             return None
+        if isinstance(f, Unset):
+            return f
 
         if not isinstance(f, float):
             raise ValueError("Expected float")
@@ -55,7 +59,7 @@ def validate_float(f):
     if f is None:
         return None
 
-    if isinstance(f, float):
+    if isinstance(f, (float, Unset)):
         return f
 
     if not isinstance(f, str):
@@ -65,14 +69,16 @@ def validate_float(f):
 
 
 def serialize_int(as_str: bool):
-    def serialize(b):
-        if is_optional_type(type(b)) and b is None:
+    def serialize(i):
+        if is_optional_type(type(i)) and i is None:
             return None
+        if isinstance(i, Unset):
+            return i
 
-        if not isinstance(b, int):
+        if not isinstance(i, int):
             raise ValueError("Expected int")
 
-        return str(b) if as_str else b
+        return str(i) if as_str else i
 
     return serialize
 
@@ -81,7 +87,7 @@ def validate_int(b):
     if b is None:
         return None
 
-    if isinstance(b, int):
+    if isinstance(b, (int, Unset)):
         return b
 
     if not isinstance(b, str):
@@ -95,6 +101,9 @@ def validate_open_enum(is_int: bool):
         if e is None:
             return None
 
+        if isinstance(e, Unset):
+            return e
+
         if is_int:
             if not isinstance(e, int):
                 raise ValueError("Expected int")

mistralai_gcp/utils/url.py

@@ -18,7 +18,12 @@ from .metadata import (
     PathParamMetadata,
     find_field_metadata,
 )
-from .values import _get_serialized_params, _populate_from_globals, _val_to_string
+from .values import (
+    _get_serialized_params,
+    _is_set,
+    _populate_from_globals,
+    _val_to_string,
+)
 
 
 def generate_url(
@@ -32,7 +37,7 @@ def generate_url(
     globals_already_populated = _populate_path_params(
         path_params, gbls, path_param_values, []
     )
-    if gbls is not None:
+    if _is_set(gbls):
         _populate_path_params(gbls, None, path_param_values, globals_already_populated)
 
     for key, value in path_param_values.items():
@@ -64,14 +69,14 @@ def _populate_path_params(
         if param_metadata is None:
             continue
 
-        param = getattr(path_params, name) if path_params is not None else None
+        param = getattr(path_params, name) if _is_set(path_params) else None
         param, global_found = _populate_from_globals(
             name, param, PathParamMetadata, gbls
         )
         if global_found:
             globals_already_populated.append(name)
 
-        if param is None:
+        if not _is_set(param):
             continue
 
         f_name = field.alias if field.alias is not None else name
@@ -87,13 +92,13 @@ def _populate_path_params(
             if param_metadata.style == "simple":
                 if isinstance(param, List):
                     for pp_val in param:
-                        if pp_val is None:
+                        if not _is_set(pp_val):
                             continue
                         pp_vals.append(_val_to_string(pp_val))
                     path_param_values[f_name] = ",".join(pp_vals)
                 elif isinstance(param, Dict):
                     for pp_key in param:
-                        if param[pp_key] is None:
+                        if not _is_set(param[pp_key]):
                             continue
                         if param_metadata.explode:
                             pp_vals.append(f"{pp_key}={_val_to_string(param[pp_key])}")
@@ -116,7 +121,7 @@ def _populate_path_params(
                         )
 
                         param_field_val = getattr(param, name)
-                        if param_field_val is None:
+                        if not _is_set(param_field_val):
                             continue
                         if param_metadata.explode:
                             pp_vals.append(
@@ -127,7 +132,7 @@ def _populate_path_params(
                                 f"{param_name},{_val_to_string(param_field_val)}"
                             )
                     path_param_values[f_name] = ",".join(pp_vals)
-                else:
+                elif _is_set(param):
                     path_param_values[f_name] = _val_to_string(param)
 
     return globals_already_populated