mistralai 1.0.3__py3-none-any.whl → 1.2.0__py3-none-any.whl

mistralai_azure/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_azure/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")
@@ -107,6 +116,19 @@ def validate_open_enum(is_int: bool):
     return validate
 
 
+def validate_const(v):
+    def validate(c):
+        if is_optional_type(type(c)) and c is None:
+            return None
+
+        if v != c:
+            raise ValueError(f"Expected {v}")
+
+        return c
+
+    return validate
+
+
 def unmarshal_json(raw, typ: Any) -> Any:
     return unmarshal(from_json(raw), typ)
 
@@ -163,6 +185,18 @@ def stream_to_text(stream: httpx.Response) -> str:
     return "".join(stream.iter_text())
 
 
+async def stream_to_text_async(stream: httpx.Response) -> str:
+    return "".join([chunk async for chunk in stream.aiter_text()])
+
+
+def stream_to_bytes(stream: httpx.Response) -> bytes:
+    return stream.content
+
+
+async def stream_to_bytes_async(stream: httpx.Response) -> bytes:
+    return await stream.aread()
+
+
 def get_pydantic_model(data: Any, typ: Any) -> Any:
     if not _contains_pydantic_model(data):
         return unmarshal(data, typ)

mistralai_azure/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

mistralai_azure/utils/values.py

@@ -10,6 +10,8 @@ from httpx import Response
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
 
+from ..types.basemodel import Unset
+
 from .serializers import marshal_json
 
 from .metadata import ParamMetadata, find_field_metadata
@@ -126,3 +128,7 @@ def _get_serialized_params(
         params[field_name] = marshal_json(obj, typ)
 
     return params
+
+
+def _is_set(value: Any) -> bool:
+    return value is not None and not isinstance(value, Unset)

mistralai_gcp/__init__.py

@@ -1,5 +1,9 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
+from ._version import __title__, __version__
 from .sdk import *
 from .sdkconfiguration import *
 from .models import *
+
+
+VERSION: str = __version__

mistralai_gcp/_hooks/sdkhooks.py

@@ -1,11 +1,21 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 import httpx
-from .types import SDKInitHook, BeforeRequestContext, BeforeRequestHook, AfterSuccessContext, AfterSuccessHook, AfterErrorContext, AfterErrorHook, Hooks
+from .types import (
+    SDKInitHook,
+    BeforeRequestContext,
+    BeforeRequestHook,
+    AfterSuccessContext,
+    AfterSuccessHook,
+    AfterErrorContext,
+    AfterErrorHook,
+    Hooks,
+)
 from .registration import init_hooks
 from typing import List, Optional, Tuple
 from mistralai_gcp.httpclient import HttpClient
 
+
 class SDKHooks(Hooks):
     def __init__(self) -> None:
         self.sdk_init_hooks: List[SDKInitHook] = []
@@ -31,7 +41,9 @@ class SDKHooks(Hooks):
             base_url, client = hook.sdk_init(base_url, client)
         return base_url, client
 
-    def before_request(self, hook_ctx: BeforeRequestContext, request: httpx.Request) -> httpx.Request:
+    def before_request(
+        self, hook_ctx: BeforeRequestContext, request: httpx.Request
+    ) -> httpx.Request:
         for hook in self.before_request_hooks:
             out = hook.before_request(hook_ctx, request)
             if isinstance(out, Exception):
@@ -40,7 +52,9 @@ class SDKHooks(Hooks):
 
         return request
 
-    def after_success(self, hook_ctx: AfterSuccessContext, response: httpx.Response) -> httpx.Response:
+    def after_success(
+        self, hook_ctx: AfterSuccessContext, response: httpx.Response
+    ) -> httpx.Response:
         for hook in self.after_success_hooks:
             out = hook.after_success(hook_ctx, response)
             if isinstance(out, Exception):
@@ -48,7 +62,12 @@ class SDKHooks(Hooks):
             response = out
         return response
 
-    def after_error(self, hook_ctx: AfterErrorContext, response: Optional[httpx.Response], error: Optional[Exception]) -> Tuple[Optional[httpx.Response], Optional[Exception]]:
+    def after_error(
+        self,
+        hook_ctx: AfterErrorContext,
+        response: Optional[httpx.Response],
+        error: Optional[Exception],
+    ) -> Tuple[Optional[httpx.Response], Optional[Exception]]:
         for hook in self.after_error_hooks:
             result = hook.after_error(hook_ctx, response, error)
             if isinstance(result, Exception):

mistralai_gcp/_hooks/types.py

@@ -1,6 +1,5 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
-
 from abc import ABC, abstractmethod
 import httpx
 from mistralai_gcp.httpclient import HttpClient
@@ -12,7 +11,12 @@ class HookContext:
     oauth2_scopes: Optional[List[str]] = None
     security_source: Optional[Union[Any, Callable[[], Any]]] = None
 
-    def __init__(self, operation_id: str, oauth2_scopes: Optional[List[str]], security_source: Optional[Union[Any, Callable[[], Any]]]):
+    def __init__(
+        self,
+        operation_id: str,
+        oauth2_scopes: Optional[List[str]],
+        security_source: Optional[Union[Any, Callable[[], Any]]],
+    ):
         self.operation_id = operation_id
         self.oauth2_scopes = oauth2_scopes
         self.security_source = security_source
@@ -20,18 +24,23 @@ 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)
+        super().__init__(
+            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)
-    
+        super().__init__(
+            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)
+        super().__init__(
+            hook_ctx.operation_id, hook_ctx.oauth2_scopes, hook_ctx.security_source
+        )
 
 
 class SDKInitHook(ABC):
@@ -42,19 +51,28 @@ class SDKInitHook(ABC):
 
 class BeforeRequestHook(ABC):
     @abstractmethod
-    def before_request(self, hook_ctx: BeforeRequestContext, request: httpx.Request) -> Union[httpx.Request, Exception]:
+    def before_request(
+        self, hook_ctx: BeforeRequestContext, request: httpx.Request
+    ) -> Union[httpx.Request, Exception]:
         pass
 
 
 class AfterSuccessHook(ABC):
     @abstractmethod
-    def after_success(self, hook_ctx: AfterSuccessContext, response: httpx.Response) -> Union[httpx.Response, Exception]:
+    def after_success(
+        self, hook_ctx: AfterSuccessContext, response: httpx.Response
+    ) -> Union[httpx.Response, Exception]:
         pass
 
 
 class AfterErrorHook(ABC):
     @abstractmethod
-    def after_error(self, hook_ctx: AfterErrorContext, response: Optional[httpx.Response], error: Optional[Exception]) -> Union[Tuple[Optional[httpx.Response], Optional[Exception]], Exception]:
+    def after_error(
+        self,
+        hook_ctx: AfterErrorContext,
+        response: Optional[httpx.Response],
+        error: Optional[Exception],
+    ) -> Union[Tuple[Optional[httpx.Response], Optional[Exception]], Exception]:
         pass
 
 

mistralai_gcp/_version.py

@@ -0,0 +1,12 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+import importlib.metadata
+
+__title__: str = "mistralai-gcp"
+__version__: str = "1.2.0"
+
+try:
+    if __package__ is not None:
+        __version__ = importlib.metadata.version(__package__)
+except importlib.metadata.PackageNotFoundError:
+    pass

mistralai_gcp/basesdk.py

@@ -3,10 +3,15 @@
 from .sdkconfiguration import SDKConfiguration
 import httpx
 from mistralai_gcp import models, utils
-from mistralai_gcp._hooks import AfterErrorContext, AfterSuccessContext, BeforeRequestContext
+from mistralai_gcp._hooks import (
+    AfterErrorContext,
+    AfterSuccessContext,
+    BeforeRequestContext,
+)
 from mistralai_gcp.utils import RetryConfig, SerializedRequestBody, get_body_content
 from typing import Callable, List, Optional, Tuple
 
+
 class BaseSDK:
     sdk_configuration: SDKConfiguration
 
@@ -24,6 +29,46 @@ class BaseSDK:
 
         return utils.template_url(base_url, url_variables)
 
+    def build_request_async(
+        self,
+        method,
+        path,
+        base_url,
+        url_variables,
+        request,
+        request_body_required,
+        request_has_path_params,
+        request_has_query_params,
+        user_agent_header,
+        accept_header_value,
+        _globals=None,
+        security=None,
+        timeout_ms: Optional[int] = None,
+        get_serialized_body: Optional[
+            Callable[[], Optional[SerializedRequestBody]]
+        ] = None,
+        url_override: Optional[str] = None,
+    ) -> httpx.Request:
+        client = self.sdk_configuration.async_client
+        return self.build_request_with_client(
+            client,
+            method,
+            path,
+            base_url,
+            url_variables,
+            request,
+            request_body_required,
+            request_has_path_params,
+            request_has_query_params,
+            user_agent_header,
+            accept_header_value,
+            _globals,
+            security,
+            timeout_ms,
+            get_serialized_body,
+            url_override,
+        )
+
     def build_request(
         self,
         method,
@@ -45,7 +90,46 @@ class BaseSDK:
         url_override: Optional[str] = None,
     ) -> httpx.Request:
         client = self.sdk_configuration.client
+        return self.build_request_with_client(
+            client,
+            method,
+            path,
+            base_url,
+            url_variables,
+            request,
+            request_body_required,
+            request_has_path_params,
+            request_has_query_params,
+            user_agent_header,
+            accept_header_value,
+            _globals,
+            security,
+            timeout_ms,
+            get_serialized_body,
+            url_override,
+        )
 
+    def build_request_with_client(
+        self,
+        client,
+        method,
+        path,
+        base_url,
+        url_variables,
+        request,
+        request_body_required,
+        request_has_path_params,
+        request_has_query_params,
+        user_agent_header,
+        accept_header_value,
+        _globals=None,
+        security=None,
+        timeout_ms: Optional[int] = None,
+        get_serialized_body: Optional[
+            Callable[[], Optional[SerializedRequestBody]]
+        ] = None,
+        url_override: Optional[str] = None,
+    ) -> httpx.Request:
         query_params = {}
 
         url = url_override
@@ -69,7 +153,7 @@ class BaseSDK:
         if security is not None:
             if callable(security):
                 security = security()
-        
+
         if security is not None:
             security_headers, security_query_params = utils.get_security(security)
             headers = {**headers, **security_headers}
@@ -129,7 +213,7 @@ class BaseSDK:
                     req.method,
                     req.url,
                     req.headers,
-                    get_body_content(req)
+                    get_body_content(req),
                 )
                 http_res = client.send(req, stream=stream)
             except Exception as e:
@@ -149,7 +233,7 @@ class BaseSDK:
                 http_res.status_code,
                 http_res.url,
                 http_res.headers,
-                "<streaming response>" if stream else http_res.text
+                "<streaming response>" if stream else http_res.text,
             )
 
             if utils.match_status_codes(error_status_codes, http_res.status_code):
@@ -189,6 +273,7 @@ class BaseSDK:
     ) -> httpx.Response:
         client = self.sdk_configuration.async_client
         logger = self.sdk_configuration.debug_logger
+
         async def do():
             http_res = None
             try:
@@ -200,7 +285,7 @@ class BaseSDK:
                     req.method,
                     req.url,
                     req.headers,
-                    get_body_content(req)
+                    get_body_content(req),
                 )
                 http_res = await client.send(req, stream=stream)
             except Exception as e:
@@ -220,7 +305,7 @@ class BaseSDK:
                 http_res.status_code,
                 http_res.url,
                 http_res.headers,
-                "<streaming response>" if stream else http_res.text
+                "<streaming response>" if stream else http_res.text,
             )
 
             if utils.match_status_codes(error_status_codes, http_res.status_code):