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

mistralai_gcp/models/functioncall.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 from mistralai_gcp.types import BaseModel
-from typing import Any, Dict, TypedDict, Union
+from typing import Any, Dict, Union
+from typing_extensions import TypedDict
 
 
 ArgumentsTypedDict = Union[Dict[str, Any], str]

mistralai_gcp/models/functionname.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from mistralai_gcp.types import BaseModel
-from typing import TypedDict
+from typing_extensions import TypedDict
 
 
 class FunctionNameTypedDict(TypedDict):

mistralai_gcp/models/httpvalidationerror.py

@@ -12,8 +12,6 @@ class HTTPValidationErrorData(BaseModel):
 
 
 class HTTPValidationError(Exception):
-    r"""Validation Error"""
-
     data: HTTPValidationErrorData
 
     def __init__(self, data: HTTPValidationErrorData):

mistralai_gcp/models/responseformat.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 from .responseformats import ResponseFormats
 from mistralai_gcp.types import BaseModel
-from typing import Optional, TypedDict
-from typing_extensions import NotRequired
+from typing import Optional
+from typing_extensions import NotRequired, TypedDict
 
 
 class ResponseFormatTypedDict(TypedDict):

mistralai_gcp/models/security.py

@@ -3,8 +3,7 @@
 from __future__ import annotations
 from mistralai_gcp.types import BaseModel
 from mistralai_gcp.utils import FieldMetadata, SecurityMetadata
-from typing import TypedDict
-from typing_extensions import Annotated
+from typing_extensions import Annotated, TypedDict
 
 
 class SecurityTypedDict(TypedDict):

mistralai_gcp/models/systemmessage.py

@@ -3,25 +3,25 @@
 from __future__ import annotations
 from .textchunk import TextChunk, TextChunkTypedDict
 from mistralai_gcp.types import BaseModel
-from typing import List, Literal, Optional, TypedDict, Union
-from typing_extensions import NotRequired
+from typing import List, Literal, Optional, Union
+from typing_extensions import NotRequired, TypedDict
 
 
-ContentTypedDict = Union[str, List[TextChunkTypedDict]]
+SystemMessageContentTypedDict = Union[str, List[TextChunkTypedDict]]
 
 
-Content = Union[str, List[TextChunk]]
+SystemMessageContent = Union[str, List[TextChunk]]
 
 
 Role = Literal["system"]
 
 
 class SystemMessageTypedDict(TypedDict):
-    content: ContentTypedDict
+    content: SystemMessageContentTypedDict
     role: NotRequired[Role]
 
 
 class SystemMessage(BaseModel):
-    content: Content
+    content: SystemMessageContent
 
     role: Optional[Role] = "system"

mistralai_gcp/models/textchunk.py

@@ -2,9 +2,11 @@
 
 from __future__ import annotations
 from mistralai_gcp.types import BaseModel
+from mistralai_gcp.utils import validate_const
 import pydantic
-from typing import Final, Literal, Optional, TypedDict
-from typing_extensions import Annotated
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional
+from typing_extensions import Annotated, TypedDict
 
 
 Type = Literal["text"]
@@ -12,11 +14,13 @@ Type = Literal["text"]
 
 class TextChunkTypedDict(TypedDict):
     text: str
+    type: Type
 
 
 class TextChunk(BaseModel):
     text: str
 
-    # fmt: off
-    TYPE: Annotated[Final[Optional[Type]], pydantic.Field(alias="type")] = "text" # type: ignore
-    # fmt: on
+    TYPE: Annotated[
+        Annotated[Optional[Type], AfterValidator(validate_const("text"))],
+        pydantic.Field(alias="type"),
+    ] = "text"

mistralai_gcp/models/tool.py

@@ -6,8 +6,8 @@ from .tooltypes import ToolTypes
 from mistralai_gcp.types import BaseModel
 from mistralai_gcp.utils import validate_open_enum
 from pydantic.functional_validators import PlainValidator
-from typing import Optional, TypedDict
-from typing_extensions import Annotated, NotRequired
+from typing import Optional
+from typing_extensions import Annotated, NotRequired, TypedDict
 
 
 class ToolTypedDict(TypedDict):

mistralai_gcp/models/toolcall.py

@@ -6,8 +6,8 @@ from .tooltypes import ToolTypes
 from mistralai_gcp.types import BaseModel
 from mistralai_gcp.utils import validate_open_enum
 from pydantic.functional_validators import PlainValidator
-from typing import Optional, TypedDict
-from typing_extensions import Annotated, NotRequired
+from typing import Optional
+from typing_extensions import Annotated, NotRequired, TypedDict
 
 
 class ToolCallTypedDict(TypedDict):

mistralai_gcp/models/toolchoice.py

@@ -6,8 +6,8 @@ from .tooltypes import ToolTypes
 from mistralai_gcp.types import BaseModel
 from mistralai_gcp.utils import validate_open_enum
 from pydantic.functional_validators import PlainValidator
-from typing import Optional, TypedDict
-from typing_extensions import Annotated, NotRequired
+from typing import Optional
+from typing_extensions import Annotated, NotRequired, TypedDict
 
 
 class ToolChoiceTypedDict(TypedDict):

mistralai_gcp/models/toolmessage.py

@@ -9,8 +9,8 @@ from mistralai_gcp.types import (
     UNSET_SENTINEL,
 )
 from pydantic import model_serializer
-from typing import Literal, Optional, TypedDict
-from typing_extensions import NotRequired
+from typing import Literal, Optional
+from typing_extensions import NotRequired, TypedDict
 
 
 ToolMessageRole = Literal["tool"]

mistralai_gcp/models/usageinfo.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from mistralai_gcp.types import BaseModel
-from typing import TypedDict
+from typing_extensions import TypedDict
 
 
 class UsageInfoTypedDict(TypedDict):

mistralai_gcp/models/usermessage.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 from .contentchunk import ContentChunk, ContentChunkTypedDict
-from mistralai_gcp.types import BaseModel
-from typing import List, Literal, Optional, TypedDict, Union
-from typing_extensions import NotRequired
+from mistralai_gcp.types import BaseModel, Nullable, UNSET_SENTINEL
+from pydantic import model_serializer
+from typing import List, Literal, Optional, Union
+from typing_extensions import NotRequired, TypedDict
 
 
 UserMessageContentTypedDict = Union[str, List[ContentChunkTypedDict]]
@@ -17,11 +18,41 @@ UserMessageRole = Literal["user"]
 
 
 class UserMessageTypedDict(TypedDict):
-    content: UserMessageContentTypedDict
+    content: Nullable[UserMessageContentTypedDict]
     role: NotRequired[UserMessageRole]
 
 
 class UserMessage(BaseModel):
-    content: UserMessageContent
+    content: Nullable[UserMessageContent]
 
     role: Optional[UserMessageRole] = "user"
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["role"]
+        nullable_fields = ["content"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in self.model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m

mistralai_gcp/models/validationerror.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 from mistralai_gcp.types import BaseModel
-from typing import List, TypedDict, Union
+from typing import List, Union
+from typing_extensions import TypedDict
 
 
 LocTypedDict = Union[str, int]

mistralai_gcp/sdk.py

@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
 import json
-from typing import Optional, Union
+from typing import Optional, Tuple, Union
 
 import google.auth
 import google.auth.credentials
@@ -20,6 +20,19 @@ from .sdkconfiguration import SDKConfiguration
 from .utils.logger import Logger, NoOpLogger
 from .utils.retries import RetryConfig
 
+LEGACY_MODEL_ID_FORMAT = {
+    "codestral-2405": "codestral@2405",
+    "mistral-large-2407": "mistral-large@2407",
+    "mistral-nemo-2407": "mistral-nemo@2407",
+}
+
+def get_model_info(model: str) -> Tuple[str,str]:
+    # if the model requiers the legacy fomat, use it, else do nothing.
+    model_id = LEGACY_MODEL_ID_FORMAT.get(model, model)
+    model = "-".join(model.split("-")[:-1])
+    return model, model_id
+
+
 
 class MistralGoogleCloud(BaseSDK):
     r"""Mistral AI API: Our Chat Completion and Embeddings APIs specification. Create your account on [La Plateforme](https://console.mistral.ai) to get access and read the [docs](https://docs.mistral.ai) to learn how to use it."""
@@ -140,28 +153,24 @@ class GoogleCloudBeforeRequestHook(BeforeRequestHook):
     def before_request(
         self, hook_ctx, request: httpx.Request
     ) -> Union[httpx.Request, Exception]:
-        # The goal of this function is to template in the region, project, model, and model_version into the URL path
+        # The goal of this function is to template in the region, project and model into the URL path
         # We do this here so that the API remains more user-friendly
-        model = None
-        model_version = None
+        model_id = None
         new_content = None
         if request.content:
             parsed = json.loads(request.content.decode("utf-8"))
             model_raw = parsed.get("model")
-            model = "-".join(model_raw.split("-")[:-1])
-            model_version = model_raw.split("-")[-1]
-            parsed["model"] = model
+            model_name, model_id = get_model_info(model_raw)
+            parsed["model"] = model_name
             new_content = json.dumps(parsed).encode("utf-8")
 
-        if model == "":
+        if model_id == "":
             raise models.SDKError("model must be provided")
 
-        if model_version is None:
-            raise models.SDKError("model_version must be provided")
 
         stream = "streamRawPredict" in request.url.path
         specifier = "streamRawPredict" if stream else "rawPredict"
-        url = f"/v1/projects/{self.project_id}/locations/{self.region}/publishers/mistralai/models/{model}@{model_version}:{specifier}"
+        url = f"/v1/projects/{self.project_id}/locations/{self.region}/publishers/mistralai/models/{model_id}:{specifier}"
 
         headers = dict(request.headers)
         # Delete content-length header as it will need to be recalculated

mistralai_gcp/sdkconfiguration.py

@@ -10,10 +10,10 @@ from pydantic import Field
 from typing import Callable, Dict, Optional, Tuple, Union
 
 
-SERVER_PROD = "prod"
-r"""Production server"""
+SERVER_EU = "eu"
+r"""EU Production server"""
 SERVERS = {
-    SERVER_PROD: "https://api.mistral.ai",
+    SERVER_EU: "https://api.mistral.ai",
 }
 """Contains the list of servers available to the SDK"""
 
@@ -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.415.6"
-    user_agent: str = "speakeasy-sdk/python 1.2.2 2.415.6 0.0.2 mistralai-gcp"
+    sdk_version: str = "1.2.0"
+    gen_version: str = "2.452.0"
+    user_agent: str = "speakeasy-sdk/python 1.2.0 2.452.0 0.0.2 mistralai-gcp"
     retry_config: OptionalNullable[RetryConfig] = Field(default_factory=lambda: UNSET)
     timeout_ms: Optional[int] = None
 
@@ -41,7 +41,7 @@ class SDKConfiguration:
         if self.server_url is not None and self.server_url:
             return remove_suffix(self.server_url, "/"), {}
         if not self.server:
-            self.server = SERVER_PROD
+            self.server = SERVER_EU
 
         if self.server not in SERVERS:
             raise ValueError(f'Invalid server "{self.server}"')

mistralai_gcp/utils/__init__.py

@@ -27,6 +27,10 @@ from .serializers import (
     serialize_float,
     serialize_int,
     stream_to_text,
+    stream_to_text_async,
+    stream_to_bytes,
+    stream_to_bytes_async,
+    validate_const,
     validate_decimal,
     validate_float,
     validate_int,
@@ -79,10 +83,14 @@ __all__ = [
     "serialize_request_body",
     "SerializedRequestBody",
     "stream_to_text",
+    "stream_to_text_async",
+    "stream_to_bytes",
+    "stream_to_bytes_async",
     "template_url",
     "unmarshal",
     "unmarshal_json",
     "validate_decimal",
+    "validate_const",
     "validate_float",
     "validate_int",
     "validate_open_enum",

mistralai_gcp/utils/annotations.py

@@ -1,5 +1,6 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
+from enum import Enum
 from typing import Any
 
 def get_discriminator(model: Any, fieldname: str, key: str) -> str:
@@ -10,10 +11,20 @@ def get_discriminator(model: Any, fieldname: str, key: str) -> str:
             raise ValueError(f'Could not find discriminator key {key} in {model}') from e
 
     if hasattr(model, fieldname):
-        return f'{getattr(model, fieldname)}'
+        attr = getattr(model, fieldname)
+
+        if isinstance(attr, Enum):
+            return f'{attr.value}'
+
+        return f'{attr}'
 
     fieldname = fieldname.upper()
     if hasattr(model, fieldname):
-        return f'{getattr(model, fieldname)}'
+        attr = getattr(model, fieldname)
+
+        if isinstance(attr, Enum):
+            return f'{attr.value}'
+
+        return f'{attr}'
 
     raise ValueError(f'Could not find discriminator field {fieldname} in {model}')

mistralai_gcp/utils/serializers.py

@@ -116,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)
 
@@ -172,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)