mistralai 0.1.8__py3-none-any.whl → 0.2.0__py3-none-any.whl

mistralai/async_client.py

@@ -1,6 +1,5 @@
-import os
+import asyncio
 import posixpath
-import time
 from json import JSONDecodeError
 from typing import Any, AsyncGenerator, Dict, List, Optional, Union
 
@@ -34,7 +33,7 @@ from mistralai.models.models import ModelList
 class MistralAsyncClient(ClientBase):
     def __init__(
         self,
-        api_key: Optional[str] = os.environ.get("MISTRAL_API_KEY", None),
+        api_key: Optional[str] = None,
         endpoint: str = ENDPOINT,
         max_retries: int = 5,
         timeout: int = 120,
@@ -151,7 +150,7 @@ class MistralAsyncClient(ClientBase):
             if attempt > self._max_retries:
                 raise MistralAPIStatusException.from_response(response, message=str(e)) from e
             backoff = 2.0**attempt  # exponential backoff
-            time.sleep(backoff)
+            await asyncio.sleep(backoff)
 
             # Retry as a generator
             async for r in self._request(method, json, path, stream=stream, attempt=attempt):

mistralai/client.py

@@ -1,4 +1,3 @@
-import os
 import posixpath
 import time
 from json import JSONDecodeError
@@ -31,7 +30,7 @@ class MistralClient(ClientBase):
 
     def __init__(
         self,
-        api_key: Optional[str] = os.environ.get("MISTRAL_API_KEY", None),
+        api_key: Optional[str] = None,
         endpoint: str = ENDPOINT,
         max_retries: int = 5,
         timeout: int = 120,

mistralai/client_base.py

@@ -10,10 +10,7 @@ from mistralai.exceptions import (
 )
 from mistralai.models.chat_completion import ChatMessage, Function, ResponseFormat, ToolChoice
 
-logging.basicConfig(
-    format="%(asctime)s %(levelname)s %(name)s: %(message)s",
-    level=os.getenv("LOG_LEVEL", "ERROR"),
-)
+CLIENT_VERSION = "0.2.0"
 
 
 class ClientBase(ABC):
@@ -27,16 +24,19 @@ class ClientBase(ABC):
         self._max_retries = max_retries
         self._timeout = timeout
 
-        self._endpoint = endpoint
+        if api_key is None:
+            api_key = os.environ.get("MISTRAL_API_KEY")
+        if api_key is None:
+            raise MistralException(message="API key not provided. Please set MISTRAL_API_KEY environment variable.")
         self._api_key = api_key
+        self._endpoint = endpoint
         self._logger = logging.getLogger(__name__)
 
         # For azure endpoints, we default to the mistral model
         if "inference.azure.com" in self._endpoint:
             self._default_model = "mistral"
 
-        # This should be automatically updated by the deploy script
-        self._version = "0.1.8"
+        self._version = CLIENT_VERSION
 
     def _parse_tools(self, tools: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
         parsed_tools: List[Dict[str, Any]] = []

mistralai/constants.py

@@ -1,5 +1,3 @@
-
-
 RETRY_STATUS_CODES = {429, 500, 502, 503, 504}
 
 ENDPOINT = "https://api.mistral.ai"

mistralai/exceptions.py

@@ -35,9 +35,7 @@ class MistralAPIException(MistralException):
         self.headers = headers or {}
 
     @classmethod
-    def from_response(
-        cls, response: Response, message: Optional[str] = None
-    ) -> MistralAPIException:
+    def from_response(cls, response: Response, message: Optional[str] = None) -> MistralAPIException:
         return cls(
             message=message or response.text,
             http_status=response.status_code,
@@ -47,8 +45,10 @@ class MistralAPIException(MistralException):
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}(message={str(self)}, http_status={self.http_status})"
 
+
 class MistralAPIStatusException(MistralAPIException):
     """Returned when we receive a non-200 response from the API that we should retry"""
 
+
 class MistralConnectionException(MistralException):
     """Returned when the SDK can not reach the API server for any reason"""

mistralai/models/chat_completion.py

@@ -47,6 +47,7 @@ class ChatMessage(BaseModel):
     content: Union[str, List[str]]
     name: Optional[str] = None
     tool_calls: Optional[List[ToolCall]] = None
+    tool_call_id: Optional[str] = None
 
 
 class DeltaMessage(BaseModel):

mistralai/models/models.py

@@ -17,6 +17,7 @@ class ModelPermission(BaseModel):
     group: Optional[str] = None
     is_blocking: bool = False
 
+
 class ModelCard(BaseModel):
     id: str
     object: str

{mistralai-0.1.8.dist-info → mistralai-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mistralai
-Version: 0.1.8
+Version: 0.2.0
 Summary: 
 Author: Bam4d
 Author-email: bam4d@mistral.ai
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: httpx (>=0.25.2,<0.26.0)
+Requires-Dist: httpx (>=0.25.2,<1)
 Requires-Dist: orjson (>=3.9.10,<4.0.0)
 Requires-Dist: pydantic (>=2.5.2,<3.0.0)
 Description-Content-Type: text/markdown

mistralai-0.2.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+mistralai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mistralai/async_client.py,sha256=orHDWXtchV8yYk5AQdX-rBPvPdARFdAXqjX_Mlo6H8U,11378
+mistralai/client.py,sha256=3ta6VFeKKngp1tI8doK7WKDLcndk_4LYAbn01_6GodE,11119
+mistralai/client_base.py,sha256=SY8E1VctuPvD3LVTX0hudUGRHd-j6xee-LtE0f2ABSs,4710
+mistralai/constants.py,sha256=FvokZPfTBC-DC6-HfiV83pD3FP6huHk3SUIl0yx5jx8,84
+mistralai/exceptions.py,sha256=R3pswvZyY5CuSbqhVklgfGPVJoz7T7l2VQKMOXK229A,1652
+mistralai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mistralai/models/chat_completion.py,sha256=E751VZ_YXm5xNuwLiGdb8RThJ7OC19S25AHMm0Sf1ng,1884
+mistralai/models/common.py,sha256=zatP4aV_LIEpzj3_igsKkJBICwGhmXG0LX3CdO3kn-o,172
+mistralai/models/embeddings.py,sha256=-VthLQBj6wrq7HXJbGmnkQEEanSemA3MAlaMFh94VBg,331
+mistralai/models/models.py,sha256=mDNIPnbsZOnfS7i8563NnIvYYxYbavu1CBijEoEqitw,714
+mistralai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mistralai-0.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mistralai-0.2.0.dist-info/METADATA,sha256=r-IhqjSA1z1eQcN7uU2Nm0oCe5fAfJaagkH64-ZKHeQ,1831
+mistralai-0.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mistralai-0.2.0.dist-info/RECORD,,

mistralai-0.1.8.dist-info/RECORD

@@ -1,16 +0,0 @@
-mistralai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mistralai/async_client.py,sha256=dpaZ7W7R2Fmo19vvf1SfyViT6JbmjJUGzaT-keT1vTc,11411
-mistralai/client.py,sha256=cneaYGtFOkrE0sUPh6GQeuX_eXKcCpNjomJjPlVWD4g,11164
-mistralai/client_base.py,sha256=hujTJDw6huSpe21brkvw8o0k5Xr1CmEXA9D6qD0Susk,4645
-mistralai/constants.py,sha256=KK286HFjpoTxPKih8xdTp0lW4YMDPyYu2Shi3Nu5Vdw,86
-mistralai/exceptions.py,sha256=d1cli28ZaPEBQy2RKKcSh-dO2T20GXHNoaJrXXBmyIs,1664
-mistralai/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mistralai/models/chat_completion.py,sha256=WnjepDpenuzDjpzkCu3RPaR1snMead7krfM1OgLsVLs,1845
-mistralai/models/common.py,sha256=zatP4aV_LIEpzj3_igsKkJBICwGhmXG0LX3CdO3kn-o,172
-mistralai/models/embeddings.py,sha256=-VthLQBj6wrq7HXJbGmnkQEEanSemA3MAlaMFh94VBg,331
-mistralai/models/models.py,sha256=I4I1kQwP0tJ2_rd4lbSUwOkCJE5E-dSTIExQg2ZNFcw,713
-mistralai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mistralai-0.1.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mistralai-0.1.8.dist-info/METADATA,sha256=2oEOkdjck_AQmqnIkowiXOTovKcv0frrtLb5IhcENXU,1836
-mistralai-0.1.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mistralai-0.1.8.dist-info/RECORD,,