mistralai 1.0.0rc1__py3-none-any.whl → 1.0.0rc2__py3-none-any.whl

mistralai/models_.py

@@ -1,10 +1,10 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from .basesdk import BaseSDK
-from mistralai import models
+from mistralai import models, utils
 from mistralai._hooks import HookContext
 from mistralai.types import OptionalNullable, UNSET
-import mistralai.utils as utils
+from mistralai.utils import get_security_from_env
 from typing import Any, Optional
 
 class Models(BaseSDK):
@@ -62,7 +62,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = self.do_request(
-            hook_ctx=HookContext(operation_id="list_models_v1_models_get", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="list_models_v1_models_get", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["422","4XX","5XX"],
             retry_config=retry_config
@@ -133,7 +133,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = await self.do_request_async(
-            hook_ctx=HookContext(operation_id="list_models_v1_models_get", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="list_models_v1_models_get", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["422","4XX","5XX"],
             retry_config=retry_config
@@ -211,7 +211,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = self.do_request(
-            hook_ctx=HookContext(operation_id="retrieve_model_v1_models__model_id__get", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="retrieve_model_v1_models__model_id__get", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["422","4XX","5XX"],
             retry_config=retry_config
@@ -289,7 +289,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = await self.do_request_async(
-            hook_ctx=HookContext(operation_id="retrieve_model_v1_models__model_id__get", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="retrieve_model_v1_models__model_id__get", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["422","4XX","5XX"],
             retry_config=retry_config
@@ -367,7 +367,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = self.do_request(
-            hook_ctx=HookContext(operation_id="delete_model_v1_models__model_id__delete", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="delete_model_v1_models__model_id__delete", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["422","4XX","5XX"],
             retry_config=retry_config
@@ -445,7 +445,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = await self.do_request_async(
-            hook_ctx=HookContext(operation_id="delete_model_v1_models__model_id__delete", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="delete_model_v1_models__model_id__delete", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["422","4XX","5XX"],
             retry_config=retry_config
@@ -532,7 +532,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = self.do_request(
-            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_update_fine_tuned_model", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_update_fine_tuned_model", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["4XX","5XX"],
             retry_config=retry_config
@@ -615,7 +615,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = await self.do_request_async(
-            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_update_fine_tuned_model", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_update_fine_tuned_model", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["4XX","5XX"],
             retry_config=retry_config
@@ -689,7 +689,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = self.do_request(
-            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_archive_fine_tuned_model", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_archive_fine_tuned_model", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["4XX","5XX"],
             retry_config=retry_config
@@ -763,7 +763,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = await self.do_request_async(
-            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_archive_fine_tuned_model", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_archive_fine_tuned_model", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["4XX","5XX"],
             retry_config=retry_config
@@ -837,7 +837,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = self.do_request(
-            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_unarchive_fine_tuned_model", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_unarchive_fine_tuned_model", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["4XX","5XX"],
             retry_config=retry_config
@@ -911,7 +911,7 @@ class Models(BaseSDK):
             ])                
         
         http_res = await self.do_request_async(
-            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_unarchive_fine_tuned_model", oauth2_scopes=[], security_source=self.sdk_configuration.security),
+            hook_ctx=HookContext(operation_id="jobs_api_routes_fine_tuning_unarchive_fine_tuned_model", oauth2_scopes=[], security_source=get_security_from_env(self.sdk_configuration.security, models.Security)),
             request=req,
             error_status_codes=["4XX","5XX"],
             retry_config=retry_config

mistralai/sdk.py

@@ -3,10 +3,12 @@
 from .basesdk import BaseSDK
 from .httpclient import AsyncHttpClient, HttpClient
 from .sdkconfiguration import SDKConfiguration
+from .utils.logger import Logger, NoOpLogger
 from .utils.retries import RetryConfig
 import httpx
-from mistralai import models
+from mistralai import models, utils
 from mistralai._hooks import SDKHooks
+from mistralai.agents import Agents
 from mistralai.chat import Chat
 from mistralai.embeddings import Embeddings
 from mistralai.files import Files
@@ -14,7 +16,6 @@ from mistralai.fim import Fim
 from mistralai.fine_tuning import FineTuning
 from mistralai.models_ import Models
 from mistralai.types import OptionalNullable, UNSET
-import mistralai.utils as utils
 from typing import Any, Callable, Dict, Optional, Union
 
 class Mistral(BaseSDK):
@@ -24,23 +25,25 @@ class Mistral(BaseSDK):
     files: Files
     r"""Files API"""
     fine_tuning: FineTuning
-    r"""Fine-tuning API"""
     chat: Chat
     r"""Chat Completion API."""
     fim: Fim
     r"""Fill-in-the-middle API."""
+    agents: Agents
+    r"""Agents API."""
     embeddings: Embeddings
     r"""Embeddings API."""
     def __init__(
         self,
-        api_key: Union[str, Callable[[], str]],
+        api_key: Optional[Union[Optional[str], Callable[[], Optional[str]]]] = None,
         server: Optional[str] = None,
         server_url: Optional[str] = None,
         url_params: Optional[Dict[str, str]] = None,
         client: Optional[HttpClient] = None,
         async_client: Optional[AsyncHttpClient] = None,
         retry_config: OptionalNullable[RetryConfig] = UNSET,
-        timeout_ms: Optional[int] = None
+        timeout_ms: Optional[int] = None,
+        debug_logger: Optional[Logger] = None
     ) -> None:
         r"""Instantiates the SDK configuring it with the provided parameters.
 
@@ -63,6 +66,9 @@ class Mistral(BaseSDK):
         if async_client is None:
             async_client = httpx.AsyncClient()
 
+        if debug_logger is None:
+            debug_logger = NoOpLogger()
+
         assert issubclass(
             type(async_client), AsyncHttpClient
         ), "The provided async_client must implement the AsyncHttpClient protocol."
@@ -85,7 +91,8 @@ class Mistral(BaseSDK):
             server_url=server_url,
             server=server,
             retry_config=retry_config,
-            timeout_ms=timeout_ms
+            timeout_ms=timeout_ms,
+            debug_logger=debug_logger
         ))
 
         hooks = SDKHooks()
@@ -107,5 +114,6 @@ class Mistral(BaseSDK):
         self.fine_tuning = FineTuning(self.sdk_configuration)
         self.chat = Chat(self.sdk_configuration)
         self.fim = Fim(self.sdk_configuration)
+        self.agents = Agents(self.sdk_configuration)
         self.embeddings = Embeddings(self.sdk_configuration)
     

mistralai/sdkconfiguration.py

@@ -3,7 +3,7 @@
 
 from ._hooks import SDKHooks
 from .httpclient import AsyncHttpClient, HttpClient
-from .utils import RetryConfig, remove_suffix
+from .utils import Logger, RetryConfig, remove_suffix
 from dataclasses import dataclass
 from mistralai import models
 from mistralai.types import OptionalNullable, UNSET
@@ -23,14 +23,15 @@ SERVERS = {
 class SDKConfiguration:
     client: HttpClient
     async_client: AsyncHttpClient
+    debug_logger: Logger
     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.0rc1"
-    gen_version: str = "2.382.2"
-    user_agent: str = "speakeasy-sdk/python 1.0.0rc1 2.382.2 0.0.2 mistralai"
+    sdk_version: str = "1.0.0-rc.2"
+    gen_version: str = "2.386.0"
+    user_agent: str = "speakeasy-sdk/python 1.0.0-rc.2 2.386.0 0.0.2 mistralai"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 

mistralai/types/basemodel.py

@@ -2,8 +2,8 @@
 
 from pydantic import ConfigDict, model_serializer
 from pydantic import BaseModel as PydanticBaseModel
-from typing import Literal, Optional, TypeVar, Union, NewType
-from typing_extensions import TypeAliasType
+from typing import TYPE_CHECKING, Literal, Optional, TypeVar, Union, NewType
+from typing_extensions import TypeAliasType, TypeAlias
 
 
 class BaseModel(PydanticBaseModel):
@@ -26,10 +26,14 @@ UNSET_SENTINEL = "~?~unset~?~sentinel~?~"
 
 
 T = TypeVar("T")
-Nullable = TypeAliasType("Nullable", Union[T, None], type_params=(T,))
-OptionalNullable = TypeAliasType(
-    "OptionalNullable", Union[Optional[Nullable[T]], Unset], type_params=(T,)
-)
+if TYPE_CHECKING:
+    Nullable: TypeAlias = Union[T, None]
+    OptionalNullable: TypeAlias = Union[Optional[Nullable[T]], Unset]
+else:
+    Nullable = TypeAliasType("Nullable", Union[T, None], type_params=(T,))
+    OptionalNullable = TypeAliasType(
+        "OptionalNullable", Union[Optional[Nullable[T]], Unset], type_params=(T,)
+    )
 
 UnrecognizedInt = NewType("UnrecognizedInt", int)
 UnrecognizedStr = NewType("UnrecognizedStr", str)

mistralai/utils/__init__.py

@@ -35,6 +35,7 @@ from .serializers import (
 )
 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
 
 __all__ = [
     "BackoffStrategy",
@@ -42,6 +43,7 @@ __all__ = [
     "find_metadata",
     "FormMetadata",
     "generate_url",
+    "get_body_content",
     "get_discriminator",
     "get_global_from_env",
     "get_headers",
@@ -51,11 +53,13 @@ __all__ = [
     "get_security",
     "get_security_from_env",
     "HeaderMetadata",
+    "Logger",
     "marshal_json",
     "match_content_type",
     "match_status_codes",
     "match_response",
     "MultipartFormMetadata",
+    "NoOpLogger",
     "OpenEnumMeta",
     "PathParamMetadata",
     "QueryParamMetadata",

mistralai/utils/eventstreaming.py

@@ -147,15 +147,14 @@ def _parse_event(
         data = data[:-1]
         event.data = data
 
-        if (
-            data.isnumeric()
-            or data == "true"
-            or data == "false"
-            or data == "null"
-            or data.startswith("{")
-            or data.startswith("[")
-            or data.startswith('"')
-        ):
+        data_is_primitive = (
+            data.isnumeric() or data == "true" or data == "false" or data == "null"
+        )
+        data_is_json = (
+            data.startswith("{") or data.startswith("[") or data.startswith('"')
+        )
+
+        if data_is_primitive or data_is_json:
             try:
                 event.data = json.loads(data)
             except Exception:

mistralai/utils/logger.py

@@ -0,0 +1,16 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+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)
+

mistralai/utils/retries.py

@@ -76,7 +76,7 @@ def retry(func, retries: Retries):
 
                         status_major = res.status_code / 100
 
-                        if status_major >= code_range and status_major < code_range + 1:
+                        if code_range <= status_major < code_range + 1:
                             raise TemporaryError(res)
                     else:
                         parsed_code = int(code)
@@ -125,7 +125,7 @@ async def retry_async(func, retries: Retries):
 
                         status_major = res.status_code / 100
 
-                        if status_major >= code_range and status_major < code_range + 1:
+                        if code_range <= status_major < code_range + 1:
                             raise TemporaryError(res)
                     else:
                         parsed_code = int(code)

mistralai/utils/security.py

@@ -53,11 +53,14 @@ def get_security(security: Any) -> Tuple[Dict[str, str], Dict[str, List[str]]]:
     return headers, query_params
 
 
-def get_security_from_env(security_class: Any) -> Optional[BaseModel]:
+def get_security_from_env(security: Any, security_class: Any) -> Optional[BaseModel]:
+    if security is not None:
+        return security
+
     if not issubclass(security_class, BaseModel):
         raise TypeError("security_class must be a pydantic model class")
 
-    security_dict = {}
+    security_dict: Any = {}
 
     if os.getenv("MISTRAL_API_KEY"):
         security_dict["api_key"] = os.getenv("MISTRAL_API_KEY")