mistralai 1.10.0__py3-none-any.whl → 1.10.1__py3-none-any.whl

mistralai/_hooks/tracing.py

@@ -30,13 +30,30 @@ class TracingHook(BeforeRequestHook, AfterSuccessHook, AfterErrorHook):
     def before_request(
         self, hook_ctx: BeforeRequestContext, request: httpx.Request
     ) -> Union[httpx.Request, Exception]:
-        request, self.request_span = get_traced_request_and_span(tracing_enabled=self.tracing_enabled, tracer=self.tracer, span=self.request_span, operation_id=hook_ctx.operation_id, request=request)
+        # Refresh tracer/provider per request so tracing can be enabled if the
+        # application configures OpenTelemetry after the client is instantiated.
+        self.tracing_enabled, self.tracer = get_or_create_otel_tracer()
+        self.request_span = None
+        request, self.request_span = get_traced_request_and_span(
+            tracing_enabled=self.tracing_enabled,
+            tracer=self.tracer,
+            span=self.request_span,
+            operation_id=hook_ctx.operation_id,
+            request=request,
+        )
         return request
 
     def after_success(
         self, hook_ctx: AfterSuccessContext, response: httpx.Response
     ) -> Union[httpx.Response, Exception]:
-        response = get_traced_response(tracing_enabled=self.tracing_enabled, tracer=self.tracer, span=self.request_span, operation_id=hook_ctx.operation_id, response=response)
+        response = get_traced_response(
+            tracing_enabled=self.tracing_enabled,
+            tracer=self.tracer,
+            span=self.request_span,
+            operation_id=hook_ctx.operation_id,
+            response=response,
+        )
+        self.request_span = None
         return response
 
     def after_error(
@@ -46,5 +63,13 @@ class TracingHook(BeforeRequestHook, AfterSuccessHook, AfterErrorHook):
         error: Optional[Exception],
     ) -> Union[Tuple[Optional[httpx.Response], Optional[Exception]], Exception]:
         if response:
-            response, error = get_response_and_error(tracing_enabled=self.tracing_enabled, tracer=self.tracer, span=self.request_span, operation_id=hook_ctx.operation_id, response=response, error=error)
+            response, error = get_response_and_error(
+                tracing_enabled=self.tracing_enabled,
+                tracer=self.tracer,
+                span=self.request_span,
+                operation_id=hook_ctx.operation_id,
+                response=response,
+                error=error,
+            )
+        self.request_span = None
         return response, error

mistralai/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "mistralai"
-__version__: str = "1.10.0"
+__version__: str = "1.10.1"
 __openapi_doc_version__: str = "1.0.0"
 __gen_version__: str = "2.687.13"
-__user_agent__: str = "speakeasy-sdk/python 1.10.0 2.687.13 1.0.0 mistralai"
+__user_agent__: str = "speakeasy-sdk/python 1.10.1 2.687.13 1.0.0 mistralai"
 
 try:
     if __package__ is not None:

mistralai/classifiers.py

@@ -6,7 +6,7 @@ from mistralai._hooks import HookContext
 from mistralai.types import OptionalNullable, UNSET
 from mistralai.utils import get_security_from_env
 from mistralai.utils.unmarshal_json_response import unmarshal_json_response
-from typing import Any, Mapping, Optional, Union
+from typing import Any, Dict, Mapping, Optional, Union
 
 
 class Classifiers(BaseSDK):
@@ -20,6 +20,7 @@ class Classifiers(BaseSDK):
             models.ClassificationRequestInputs,
             models.ClassificationRequestInputsTypedDict,
         ],
+        metadata: OptionalNullable[Dict[str, Any]] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -29,6 +30,7 @@ class Classifiers(BaseSDK):
 
         :param model: ID of the model to use.
         :param inputs: Text to classify.
+        :param metadata:
         :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
@@ -46,6 +48,7 @@ class Classifiers(BaseSDK):
 
         request = models.ClassificationRequest(
             model=model,
+            metadata=metadata,
             inputs=inputs,
         )
 
@@ -116,6 +119,7 @@ class Classifiers(BaseSDK):
             models.ClassificationRequestInputs,
             models.ClassificationRequestInputsTypedDict,
         ],
+        metadata: OptionalNullable[Dict[str, Any]] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -125,6 +129,7 @@ class Classifiers(BaseSDK):
 
         :param model: ID of the model to use.
         :param inputs: Text to classify.
+        :param metadata:
         :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
@@ -142,6 +147,7 @@ class Classifiers(BaseSDK):
 
         request = models.ClassificationRequest(
             model=model,
+            metadata=metadata,
             inputs=inputs,
         )
 
@@ -404,6 +410,7 @@ class Classifiers(BaseSDK):
             models.ClassificationRequestInputs,
             models.ClassificationRequestInputsTypedDict,
         ],
+        metadata: OptionalNullable[Dict[str, Any]] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -413,6 +420,7 @@ class Classifiers(BaseSDK):
 
         :param model: ID of the model to use.
         :param inputs: Text to classify.
+        :param metadata:
         :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
@@ -430,6 +438,7 @@ class Classifiers(BaseSDK):
 
         request = models.ClassificationRequest(
             model=model,
+            metadata=metadata,
             inputs=inputs,
         )
 
@@ -500,6 +509,7 @@ class Classifiers(BaseSDK):
             models.ClassificationRequestInputs,
             models.ClassificationRequestInputsTypedDict,
         ],
+        metadata: OptionalNullable[Dict[str, Any]] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -509,6 +519,7 @@ class Classifiers(BaseSDK):
 
         :param model: ID of the model to use.
         :param inputs: Text to classify.
+        :param metadata:
         :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
@@ -526,6 +537,7 @@ class Classifiers(BaseSDK):
 
         request = models.ClassificationRequest(
             model=model,
+            metadata=metadata,
             inputs=inputs,
         )
 

mistralai/embeddings.py

@@ -6,7 +6,7 @@ from mistralai._hooks import HookContext
 from mistralai.types import OptionalNullable, UNSET
 from mistralai.utils import get_security_from_env
 from mistralai.utils.unmarshal_json_response import unmarshal_json_response
-from typing import Any, Mapping, Optional, Union
+from typing import Any, Dict, Mapping, Optional, Union
 
 
 class Embeddings(BaseSDK):
@@ -19,6 +19,7 @@ class Embeddings(BaseSDK):
         inputs: Union[
             models.EmbeddingRequestInputs, models.EmbeddingRequestInputsTypedDict
         ],
+        metadata: OptionalNullable[Dict[str, Any]] = UNSET,
         output_dimension: OptionalNullable[int] = UNSET,
         output_dtype: Optional[models.EmbeddingDtype] = None,
         encoding_format: Optional[models.EncodingFormat] = None,
@@ -33,6 +34,7 @@ class Embeddings(BaseSDK):
 
         :param model: The ID of the model to be used for embedding.
         :param inputs: The text content to be embedded, can be a string or an array of strings for fast processing in bulk.
+        :param metadata:
         :param output_dimension: The dimension of the output embeddings when feature available. If not provided, a default output dimension will be used.
         :param output_dtype:
         :param encoding_format:
@@ -53,6 +55,7 @@ class Embeddings(BaseSDK):
 
         request = models.EmbeddingRequest(
             model=model,
+            metadata=metadata,
             inputs=inputs,
             output_dimension=output_dimension,
             output_dtype=output_dtype,
@@ -125,6 +128,7 @@ class Embeddings(BaseSDK):
         inputs: Union[
             models.EmbeddingRequestInputs, models.EmbeddingRequestInputsTypedDict
         ],
+        metadata: OptionalNullable[Dict[str, Any]] = UNSET,
         output_dimension: OptionalNullable[int] = UNSET,
         output_dtype: Optional[models.EmbeddingDtype] = None,
         encoding_format: Optional[models.EncodingFormat] = None,
@@ -139,6 +143,7 @@ class Embeddings(BaseSDK):
 
         :param model: The ID of the model to be used for embedding.
         :param inputs: The text content to be embedded, can be a string or an array of strings for fast processing in bulk.
+        :param metadata:
         :param output_dimension: The dimension of the output embeddings when feature available. If not provided, a default output dimension will be used.
         :param output_dtype:
         :param encoding_format:
@@ -159,6 +164,7 @@ class Embeddings(BaseSDK):
 
         request = models.EmbeddingRequest(
             model=model,
+            metadata=metadata,
             inputs=inputs,
             output_dimension=output_dimension,
             output_dtype=output_dtype,

mistralai/extra/README.md

@@ -34,7 +34,7 @@ class Chat(BaseSDK):
 
 3. Now build the SDK with the custom code:
 ```bash
-rm -rf dist; poetry build; python3 -m pip install ~/client-python/dist/mistralai-1.4.1-py3-none-any.whl --force-reinstall
+rm -rf dist; uv build; uv pip install --reinstall ~/client-python/dist/mistralai-1.4.1-py3-none-any.whl
 ```
 
 4. And now you should be able to call the custom method:

mistralai/extra/mcp/auth.py

@@ -1,9 +1,8 @@
-from typing import Optional
+import logging
 
-from authlib.oauth2.rfc8414 import AuthorizationServerMetadata
-from authlib.integrations.httpx_client import AsyncOAuth2Client as AsyncOAuth2ClientBase
 import httpx
-import logging
+from authlib.integrations.httpx_client import AsyncOAuth2Client as AsyncOAuth2ClientBase
+from authlib.oauth2.rfc8414 import AuthorizationServerMetadata
 
 from mistralai.types import BaseModel
 
@@ -16,8 +15,8 @@ class Oauth2AuthorizationScheme(BaseModel):
     authorization_url: str
     token_url: str
     scope: list[str]
-    description: Optional[str] = None
-    refresh_url: Optional[str] = None
+    description: str | None = None
+    refresh_url: str | None = None
 
 
 class OAuthParams(BaseModel):
@@ -42,7 +41,7 @@ class AsyncOAuth2Client(AsyncOAuth2ClientBase):
 
 async def get_well_known_authorization_server_metadata(
     server_url: str,
-) -> Optional[AuthorizationServerMetadata]:
+) -> AuthorizationServerMetadata | None:
     """Fetch the metadata from the well-known location.
 
     This should be available on MCP servers as described by the specification:
@@ -123,10 +122,10 @@ async def dynamic_client_registration(
 async def build_oauth_params(
     server_url: str,
     redirect_url: str,
-    client_id: Optional[str] = None,
-    client_secret: Optional[str] = None,
-    scope: Optional[list[str]] = None,
-    async_client: Optional[httpx.AsyncClient] = None,
+    client_id: str | None = None,
+    client_secret: str | None = None,
+    scope: list[str] | None = None,
+    async_client: httpx.AsyncClient | None = None,
 ) -> OAuthParams:
     """Get issuer metadata and build the oauth required params."""
     metadata = await get_oauth_server_metadata(server_url=server_url)

mistralai/extra/mcp/base.py

@@ -1,11 +1,14 @@
-from typing import Optional, Union
 import logging
 import typing
+from collections.abc import Sequence
 from contextlib import AsyncExitStack
-from typing import Protocol, Any
+from typing import Any, Protocol
 
-from mcp import ClientSession
-from mcp.types import ListPromptsResult, EmbeddedResource, ImageContent, TextContent
+from mcp import ClientSession  # pyright: ignore[reportMissingImports]
+from mcp.types import (  # pyright: ignore[reportMissingImports]
+    ContentBlock,
+    ListPromptsResult,
+)
 
 from mistralai.extra.exceptions import MCPException
 from mistralai.models import (
@@ -20,8 +23,8 @@ logger = logging.getLogger(__name__)
 
 
 class MCPSystemPrompt(typing.TypedDict):
-    description: Optional[str]
-    messages: list[Union[SystemMessageTypedDict, AssistantMessageTypedDict]]
+    description: str | None
+    messages: list[SystemMessageTypedDict | AssistantMessageTypedDict]
 
 
 class MCPClientProtocol(Protocol):
@@ -29,7 +32,7 @@ class MCPClientProtocol(Protocol):
 
     _name: str
 
-    async def initialize(self, exit_stack: Optional[AsyncExitStack]) -> None:
+    async def initialize(self, exit_stack: AsyncExitStack | None) -> None:
         ...
 
     async def aclose(self) -> None:
@@ -39,7 +42,7 @@ class MCPClientProtocol(Protocol):
         ...
 
     async def execute_tool(
-        self, name: str, arguments: dict
+        self, name: str, arguments: dict[str, Any]
     ) -> list[TextChunkTypedDict]:
         ...
 
@@ -57,20 +60,18 @@ class MCPClientBase(MCPClientProtocol):
 
     _session: ClientSession
 
-    def __init__(self, name: Optional[str] = None):
+    def __init__(self, name: str | None = None):
         self._name = name or self.__class__.__name__
-        self._exit_stack: Optional[AsyncExitStack] = None
+        self._exit_stack: AsyncExitStack | None = None
         self._is_initialized = False
 
-    def _convert_content(
-        self, mcp_content: Union[TextContent, ImageContent, EmbeddedResource]
-    ) -> TextChunkTypedDict:
+    def _convert_content(self, mcp_content: ContentBlock) -> TextChunkTypedDict:
         if not mcp_content.type == "text":
             raise MCPException("Only supporting text tool responses for now.")
         return {"type": "text", "text": mcp_content.text}
 
     def _convert_content_list(
-        self, mcp_contents: list[Union[TextContent, ImageContent, EmbeddedResource]]
+        self, mcp_contents: Sequence[ContentBlock]
     ) -> list[TextChunkTypedDict]:
         content_chunks = []
         for mcp_content in mcp_contents:
@@ -108,7 +109,7 @@ class MCPClientBase(MCPClientProtocol):
             "description": prompt_result.description,
             "messages": [
                 typing.cast(
-                    Union[SystemMessageTypedDict, AssistantMessageTypedDict],
+                    SystemMessageTypedDict | AssistantMessageTypedDict,
                     {
                         "role": message.role,
                         "content": self._convert_content(mcp_content=message.content),
@@ -121,7 +122,7 @@ class MCPClientBase(MCPClientProtocol):
     async def list_system_prompts(self) -> ListPromptsResult:
         return await self._session.list_prompts()
 
-    async def initialize(self, exit_stack: Optional[AsyncExitStack] = None) -> None:
+    async def initialize(self, exit_stack: AsyncExitStack | None = None) -> None:
         """Initialize the MCP session."""
         # client is already initialized so return
         if self._is_initialized:

mistralai/extra/mcp/sse.py

@@ -1,22 +1,20 @@
 import http
 import logging
-import typing
-from typing import Any, Optional
 from contextlib import AsyncExitStack
 from functools import cached_property
+from typing import Any
 
 import httpx
+from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
+from authlib.oauth2.rfc6749 import OAuth2Token
+from mcp.client.sse import sse_client  # pyright: ignore[reportMissingImports]
+from mcp.shared.message import SessionMessage  # pyright: ignore[reportMissingImports]
 
 from mistralai.extra.exceptions import MCPAuthException
 from mistralai.extra.mcp.base import (
     MCPClientBase,
 )
 from mistralai.extra.mcp.auth import OAuthParams, AsyncOAuth2Client
-from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
-
-from mcp.client.sse import sse_client
-from mcp.shared.message import SessionMessage
-from authlib.oauth2.rfc6749 import OAuth2Token
 
 from mistralai.types import BaseModel
 
@@ -27,7 +25,7 @@ class SSEServerParams(BaseModel):
     """Parameters required for a MCPClient with SSE transport"""
 
     url: str
-    headers: Optional[dict[str, Any]] = None
+    headers: dict[str, Any] | None = None
     timeout: float = 5
     sse_read_timeout: float = 60 * 5
 
@@ -41,20 +39,20 @@ class MCPClientSSE(MCPClientBase):
     This is possibly going to change in the future since the protocol has ongoing discussions.
     """
 
-    _oauth_params: Optional[OAuthParams]
+    _oauth_params: OAuthParams | None
     _sse_params: SSEServerParams
 
     def __init__(
         self,
         sse_params: SSEServerParams,
-        name: Optional[str] = None,
-        oauth_params: Optional[OAuthParams] = None,
-        auth_token: Optional[OAuth2Token] = None,
+        name: str | None = None,
+        oauth_params: OAuthParams | None = None,
+        auth_token: OAuth2Token | None = None,
     ):
         super().__init__(name=name)
         self._sse_params = sse_params
-        self._oauth_params: Optional[OAuthParams] = oauth_params
-        self._auth_token: Optional[OAuth2Token] = auth_token
+        self._oauth_params: OAuthParams | None = oauth_params
+        self._auth_token: OAuth2Token | None = auth_token
 
     @cached_property
     def base_url(self) -> str:
@@ -142,7 +140,7 @@ class MCPClientSSE(MCPClientBase):
     async def _get_transport(
         self, exit_stack: AsyncExitStack
     ) -> tuple[
-        MemoryObjectReceiveStream[typing.Union[SessionMessage, Exception]],
+        MemoryObjectReceiveStream[SessionMessage | Exception],
         MemoryObjectSendStream[SessionMessage],
     ]:
         try:

mistralai/extra/mcp/stdio.py

@@ -1,12 +1,9 @@
-from typing import Optional
 import logging
 from contextlib import AsyncExitStack
 
-from mistralai.extra.mcp.base import (
-    MCPClientBase,
-)
+from mcp import StdioServerParameters, stdio_client  # pyright: ignore[reportMissingImports]
 
-from mcp import stdio_client, StdioServerParameters
+from mistralai.extra.mcp.base import MCPClientBase
 
 logger = logging.getLogger(__name__)
 
@@ -14,7 +11,9 @@ logger = logging.getLogger(__name__)
 class MCPClientSTDIO(MCPClientBase):
     """MCP client that uses stdio for communication."""
 
-    def __init__(self, stdio_params: StdioServerParameters, name: Optional[str] = None):
+    def __init__(
+        self, stdio_params: StdioServerParameters, name: str | None = None
+    ):
         super().__init__(name=name)
         self._stdio_params = stdio_params