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

mistralai/models/toolmessage.py

@@ -1,24 +1,33 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
+from .contentchunk import ContentChunk, ContentChunkTypedDict
 from mistralai.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
 from pydantic import model_serializer
-from typing import Literal, Optional
-from typing_extensions import NotRequired, TypedDict
+from typing import List, Literal, Optional, Union
+from typing_extensions import NotRequired, TypeAliasType, TypedDict
+
+
+ToolMessageContentTypedDict = TypeAliasType(
+    "ToolMessageContentTypedDict", Union[str, List[ContentChunkTypedDict]]
+)
+
+
+ToolMessageContent = TypeAliasType("ToolMessageContent", Union[str, List[ContentChunk]])
 
 
 ToolMessageRole = Literal["tool"]
 
 
 class ToolMessageTypedDict(TypedDict):
-    content: str
+    content: Nullable[ToolMessageContentTypedDict]
     tool_call_id: NotRequired[Nullable[str]]
     name: NotRequired[Nullable[str]]
     role: NotRequired[ToolMessageRole]
 
 
 class ToolMessage(BaseModel):
-    content: str
+    content: Nullable[ToolMessageContent]
 
     tool_call_id: OptionalNullable[str] = UNSET
 
@@ -29,7 +38,7 @@ class ToolMessage(BaseModel):
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
         optional_fields = ["tool_call_id", "name", "role"]
-        nullable_fields = ["tool_call_id", "name"]
+        nullable_fields = ["content", "tool_call_id", "name"]
         null_default_fields = []
 
         serialized = handler(self)

mistralai/models/usermessage.py

@@ -5,13 +5,15 @@ from .contentchunk import ContentChunk, ContentChunkTypedDict
 from mistralai.types import BaseModel, Nullable, UNSET_SENTINEL
 from pydantic import model_serializer
 from typing import List, Literal, Optional, Union
-from typing_extensions import NotRequired, TypedDict
+from typing_extensions import NotRequired, TypeAliasType, TypedDict
 
 
-UserMessageContentTypedDict = Union[str, List[ContentChunkTypedDict]]
+UserMessageContentTypedDict = TypeAliasType(
+    "UserMessageContentTypedDict", Union[str, List[ContentChunkTypedDict]]
+)
 
 
-UserMessageContent = Union[str, List[ContentChunk]]
+UserMessageContent = TypeAliasType("UserMessageContent", Union[str, List[ContentChunk]])
 
 
 UserMessageRole = Literal["user"]

mistralai/models/validationerror.py

@@ -3,13 +3,13 @@
 from __future__ import annotations
 from mistralai.types import BaseModel
 from typing import List, Union
-from typing_extensions import TypedDict
+from typing_extensions import TypeAliasType, TypedDict
 
 
-LocTypedDict = Union[str, int]
+LocTypedDict = TypeAliasType("LocTypedDict", Union[str, int])
 
 
-Loc = Union[str, int]
+Loc = TypeAliasType("Loc", Union[str, int])
 
 
 class ValidationErrorTypedDict(TypedDict):

mistralai/sdk.py

@@ -129,3 +129,17 @@ class Mistral(BaseSDK):
         self.agents = Agents(self.sdk_configuration)
         self.embeddings = Embeddings(self.sdk_configuration)
         self.classifiers = Classifiers(self.sdk_configuration)
+
+    def __enter__(self):
+        return self
+
+    async def __aenter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if self.sdk_configuration.client is not None:
+            self.sdk_configuration.client.close()
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        if self.sdk_configuration.async_client is not None:
+            await self.sdk_configuration.async_client.aclose()

mistralai/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.2"
-    gen_version: str = "2.457.2"
-    user_agent: str = "speakeasy-sdk/python 1.2.2 2.457.2 0.0.2 mistralai"
+    sdk_version: str = "1.2.4"
+    gen_version: str = "2.470.1"
+    user_agent: str = "speakeasy-sdk/python 1.2.4 2.470.1 0.0.2 mistralai"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 

mistralai/utils/annotations.py

@@ -1,30 +1,55 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from enum import Enum
-from typing import Any
+from typing import Any, Optional
 
 def get_discriminator(model: Any, fieldname: str, key: str) -> str:
-    if isinstance(model, dict):
-        try:
-            return f'{model.get(key)}'
-        except AttributeError as e:
-            raise ValueError(f'Could not find discriminator key {key} in {model}') from e
+    """
+    Recursively search for the discriminator attribute in a model.
 
-    if hasattr(model, fieldname):
-        attr = getattr(model, fieldname)
+    Args:
+        model (Any): The model to search within.
+        fieldname (str): The name of the field to search for.
+        key (str): The key to search for in dictionaries.
 
-        if isinstance(attr, Enum):
-            return f'{attr.value}'
+    Returns:
+        str: The name of the discriminator attribute.
 
-        return f'{attr}'
+    Raises:
+        ValueError: If the discriminator attribute is not found.
+    """
+    upper_fieldname = fieldname.upper()
 
-    fieldname = fieldname.upper()
-    if hasattr(model, fieldname):
-        attr = getattr(model, fieldname)
+    def get_field_discriminator(field: Any) -> Optional[str]:
+        """Search for the discriminator attribute in a given field."""
 
-        if isinstance(attr, Enum):
-            return f'{attr.value}'
+        if isinstance(field, dict):
+            if key in field:
+                return f'{field[key]}'
 
-        return f'{attr}'
+        if hasattr(field, fieldname):
+            attr = getattr(field, fieldname)
+            if isinstance(attr, Enum):
+                return f'{attr.value}'
+            return f'{attr}'
+
+        if hasattr(field, upper_fieldname):
+            attr = getattr(field, upper_fieldname)
+            if isinstance(attr, Enum):
+                return f'{attr.value}'
+            return f'{attr}'
+
+        return None
+
+
+    if isinstance(model, list):
+        for field in model:
+            discriminator = get_field_discriminator(field)
+            if discriminator is not None:
+                return discriminator
+
+    discriminator = get_field_discriminator(model)
+    if discriminator is not None:
+        return discriminator
 
     raise ValueError(f'Could not find discriminator field {fieldname} in {model}')

mistralai/utils/eventstreaming.py

@@ -2,12 +2,72 @@
 
 import re
 import json
-from typing import Callable, TypeVar, Optional, Generator, AsyncGenerator, Tuple
+from typing import (
+    Callable,
+    Generic,
+    TypeVar,
+    Optional,
+    Generator,
+    AsyncGenerator,
+    Tuple,
+)
 import httpx
 
 T = TypeVar("T")
 
 
+class EventStream(Generic[T]):
+    response: httpx.Response
+    generator: Generator[T, None, None]
+
+    def __init__(
+        self,
+        response: httpx.Response,
+        decoder: Callable[[str], T],
+        sentinel: Optional[str] = None,
+    ):
+        self.response = response
+        self.generator = stream_events(response, decoder, sentinel)
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        return next(self.generator)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.response.close()
+
+
+class EventStreamAsync(Generic[T]):
+    response: httpx.Response
+    generator: AsyncGenerator[T, None]
+
+    def __init__(
+        self,
+        response: httpx.Response,
+        decoder: Callable[[str], T],
+        sentinel: Optional[str] = None,
+    ):
+        self.response = response
+        self.generator = stream_events_async(response, decoder, sentinel)
+
+    def __aiter__(self):
+        return self
+
+    async def __anext__(self):
+        return await self.generator.__anext__()
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.response.aclose()
+
+
 class ServerEvent:
     id: Optional[str] = None
     event: Optional[str] = None