sarvamai 0.1.5a1__py3-none-any.whl → 0.1.5a3__py3-none-any.whl

sarvamai/__init__.py

@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from .types import (
     ChatCompletionRequestAssistantMessage,
     ChatCompletionRequestMessage,

sarvamai/chat/__init__.py

@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+

sarvamai/chat/client.py

@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawChatClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.request_options import RequestOptions
 from ..requests.chat_completion_request_message import ChatCompletionRequestMessageParams
-from ..types.reasoning_effort import ReasoningEffort
 from ..requests.stop_configuration import StopConfigurationParams
-from ..core.request_options import RequestOptions
 from ..types.create_chat_completion_response import CreateChatCompletionResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawChatClient
+from ..types.reasoning_effort import ReasoningEffort
+from .raw_client import AsyncRawChatClient, RawChatClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -33,7 +32,6 @@ class ChatClient:
     def completions(
         self,
         *,
-        authorization: str,
         messages: typing.Sequence[ChatCompletionRequestMessageParams],
         temperature: typing.Optional[float] = OMIT,
         top_p: typing.Optional[float] = OMIT,
@@ -53,9 +51,6 @@ class ChatClient:
 
         Parameters
         ----------
-        authorization : str
-            Bearer token for authentication. Format: "Bearer <token>"
-
         messages : typing.Sequence[ChatCompletionRequestMessageParams]
             A list of messages comprising the conversation so far.
 
@@ -119,12 +114,10 @@ class ChatClient:
             api_subscription_key="YOUR_API_SUBSCRIPTION_KEY",
         )
         client.chat.completions(
-            authorization="Authorization",
             messages=[{"content": "content", "role": "assistant"}],
         )
         """
-        response = self._raw_client.completions(
-            authorization=authorization,
+        _response = self._raw_client.completions(
             messages=messages,
             temperature=temperature,
             top_p=top_p,
@@ -139,7 +132,7 @@ class ChatClient:
             wiki_grounding=wiki_grounding,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncChatClient:
@@ -160,7 +153,6 @@ class AsyncChatClient:
     async def completions(
         self,
         *,
-        authorization: str,
         messages: typing.Sequence[ChatCompletionRequestMessageParams],
         temperature: typing.Optional[float] = OMIT,
         top_p: typing.Optional[float] = OMIT,
@@ -180,9 +172,6 @@ class AsyncChatClient:
 
         Parameters
         ----------
-        authorization : str
-            Bearer token for authentication. Format: "Bearer <token>"
-
         messages : typing.Sequence[ChatCompletionRequestMessageParams]
             A list of messages comprising the conversation so far.
 
@@ -251,15 +240,13 @@ class AsyncChatClient:
 
         async def main() -> None:
             await client.chat.completions(
-                authorization="Authorization",
                 messages=[{"content": "content", "role": "assistant"}],
             )
 
 
         asyncio.run(main())
         """
-        response = await self._raw_client.completions(
-            authorization=authorization,
+        _response = await self._raw_client.completions(
             messages=messages,
             temperature=temperature,
             top_p=top_p,
@@ -274,4 +261,4 @@ class AsyncChatClient:
             wiki_grounding=wiki_grounding,
             request_options=request_options,
         )
-        return response.data
+        return _response.data

sarvamai/chat/raw_client.py

@@ -1,24 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.chat_completion_request_message import ChatCompletionRequestMessageParams
-from ..types.reasoning_effort import ReasoningEffort
-from ..requests.stop_configuration import StopConfigurationParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.pydantic_utilities import parse_obj_as
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_chat_completion_response import CreateChatCompletionResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
-from ..core.pydantic_utilities import parse_obj_as
 from ..errors.bad_request_error import BadRequestError
 from ..errors.forbidden_error import ForbiddenError
-from ..errors.unprocessable_entity_error import UnprocessableEntityError
-from ..errors.too_many_requests_error import TooManyRequestsError
 from ..errors.internal_server_error import InternalServerError
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..errors.too_many_requests_error import TooManyRequestsError
+from ..errors.unprocessable_entity_error import UnprocessableEntityError
+from ..requests.chat_completion_request_message import ChatCompletionRequestMessageParams
+from ..requests.stop_configuration import StopConfigurationParams
+from ..types.create_chat_completion_response import CreateChatCompletionResponse
+from ..types.reasoning_effort import ReasoningEffort
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -31,7 +30,6 @@ class RawChatClient:
     def completions(
         self,
         *,
-        authorization: str,
         messages: typing.Sequence[ChatCompletionRequestMessageParams],
         temperature: typing.Optional[float] = OMIT,
         top_p: typing.Optional[float] = OMIT,
@@ -51,9 +49,6 @@ class RawChatClient:
 
         Parameters
         ----------
-        authorization : str
-            Bearer token for authentication. Format: "Bearer <token>"
-
         messages : typing.Sequence[ChatCompletionRequestMessageParams]
             A list of messages comprising the conversation so far.
 
@@ -134,7 +129,6 @@ class RawChatClient:
             },
             headers={
                 "content-type": "application/json",
-                "Authorization": str(authorization) if authorization is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -151,58 +145,63 @@ class RawChatClient:
                 return HttpResponse(response=_response, data=_data)
             if _response.status_code == 400:
                 raise BadRequestError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 403:
                 raise ForbiddenError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 422:
                 raise UnprocessableEntityError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 429:
                 raise TooManyRequestsError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 500:
                 raise InternalServerError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawChatClient:
@@ -212,7 +211,6 @@ class AsyncRawChatClient:
     async def completions(
         self,
         *,
-        authorization: str,
         messages: typing.Sequence[ChatCompletionRequestMessageParams],
         temperature: typing.Optional[float] = OMIT,
         top_p: typing.Optional[float] = OMIT,
@@ -232,9 +230,6 @@ class AsyncRawChatClient:
 
         Parameters
         ----------
-        authorization : str
-            Bearer token for authentication. Format: "Bearer <token>"
-
         messages : typing.Sequence[ChatCompletionRequestMessageParams]
             A list of messages comprising the conversation so far.
 
@@ -315,7 +310,6 @@ class AsyncRawChatClient:
             },
             headers={
                 "content-type": "application/json",
-                "Authorization": str(authorization) if authorization is not None else None,
             },
             request_options=request_options,
             omit=OMIT,
@@ -332,55 +326,60 @@ class AsyncRawChatClient:
                 return AsyncHttpResponse(response=_response, data=_data)
             if _response.status_code == 400:
                 raise BadRequestError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 403:
                 raise ForbiddenError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 422:
                 raise UnprocessableEntityError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 429:
                 raise TooManyRequestsError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             if _response.status_code == 500:
                 raise InternalServerError(
-                    typing.cast(
+                    headers=dict(_response.headers),
+                    body=typing.cast(
                         typing.Optional[typing.Any],
                         parse_obj_as(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
-                    )
+                    ),
                 )
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)

sarvamai/client.py

@@ -1,20 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .environment import SarvamAIEnvironment
-import typing
 import os
+import typing
+
 import httpx
+from .chat.client import AsyncChatClient, ChatClient
 from .core.api_error import ApiError
-from .core.client_wrapper import SyncClientWrapper
-from .text.client import TextClient
-from .speech_to_text.client import SpeechToTextClient
-from .text_to_speech.client import TextToSpeechClient
-from .chat.client import ChatClient
-from .core.client_wrapper import AsyncClientWrapper
-from .text.client import AsyncTextClient
-from .speech_to_text.client import AsyncSpeechToTextClient
-from .text_to_speech.client import AsyncTextToSpeechClient
-from .chat.client import AsyncChatClient
+from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .environment import SarvamAIEnvironment
+from .speech_to_text.client import AsyncSpeechToTextClient, SpeechToTextClient
+from .text.client import AsyncTextClient, TextClient
+from .text_to_speech.client import AsyncTextToSpeechClient, TextToSpeechClient
 
 
 class SarvamAI:

sarvamai/core/__init__.py

@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from .api_error import ApiError
 from .client_wrapper import AsyncClientWrapper, BaseClientWrapper, SyncClientWrapper
 from .datetime_utils import serialize_datetime

sarvamai/core/api_error.py

@@ -1,15 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
+from typing import Any, Dict, Optional
 
 
 class ApiError(Exception):
-    status_code: typing.Optional[int]
-    body: typing.Any
+    headers: Optional[Dict[str, str]]
+    status_code: Optional[int]
+    body: Any
 
-    def __init__(self, *, status_code: typing.Optional[int] = None, body: typing.Any = None):
+    def __init__(
+        self,
+        *,
+        headers: Optional[Dict[str, str]] = None,
+        status_code: Optional[int] = None,
+        body: Any = None,
+    ) -> None:
+        self.headers = headers
         self.status_code = status_code
         self.body = body
 
     def __str__(self) -> str:
-        return f"status_code: {self.status_code}, body: {self.body}"
+        return f"headers: {self.headers}, status_code: {self.status_code}, body: {self.body}"

sarvamai/core/client_wrapper.py

@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..environment import SarvamAIEnvironment
 import typing
+
 import httpx
-from .http_client import HttpClient
-from .http_client import AsyncHttpClient
+from ..environment import SarvamAIEnvironment
+from .http_client import AsyncHttpClient, HttpClient
 
 
 class BaseClientWrapper:
@@ -17,10 +17,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "sarvamai/0.1.5a1",
+            "User-Agent": "sarvamai/0.1.5a3",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "sarvamai",
-            "X-Fern-SDK-Version": "0.1.5a1",
+            "X-Fern-SDK-Version": "0.1.5a3",
         }
         headers["api-subscription-key"] = self.api_subscription_key
         return headers

sarvamai/core/force_multipart.py

@@ -0,0 +1,16 @@
+# This file was auto-generated by Fern from our API Definition.
+
+
+class ForceMultipartDict(dict):
+    """
+    A dictionary subclass that always evaluates to True in boolean contexts.
+
+    This is used to force multipart/form-data encoding in HTTP requests even when
+    the dictionary is empty, which would normally evaluate to False.
+    """
+
+    def __bool__(self):
+        return True
+
+
+FORCE_MULTIPART = ForceMultipartDict()

sarvamai/core/http_client.py

@@ -11,10 +11,12 @@ from random import random
 
 import httpx
 from .file import File, convert_file_dict_to_httpx_tuples
+from .force_multipart import FORCE_MULTIPART
 from .jsonable_encoder import jsonable_encoder
 from .query_encoder import encode_query
 from .remove_none_from_dict import remove_none_from_dict
 from .request_options import RequestOptions
+from httpx._types import RequestFiles
 
 INITIAL_RETRY_DELAY_SECONDS = 0.5
 MAX_RETRY_DELAY_SECONDS = 10
@@ -178,11 +180,17 @@ class HttpClient:
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> httpx.Response:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -193,6 +201,15 @@ class HttpClient:
 
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         response = self.httpx_client.request(
             method=method,
             url=urllib.parse.urljoin(f"{base_url}/", path),
@@ -225,11 +242,7 @@ class HttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if (files is not None and files is not omit)
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         )
 
@@ -264,11 +277,17 @@ class HttpClient:
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> typing.Iterator[httpx.Response]:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -277,6 +296,15 @@ class HttpClient:
             else self.base_timeout()
         )
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
         with self.httpx_client.stream(
@@ -311,11 +339,7 @@ class HttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if (files is not None and files is not omit)
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         ) as stream:
             yield stream
@@ -354,11 +378,17 @@ class AsyncHttpClient:
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> httpx.Response:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -367,6 +397,15 @@ class AsyncHttpClient:
             else self.base_timeout()
         )
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
         # Add the input to each of these and do None-safety checks
@@ -402,11 +441,7 @@ class AsyncHttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if files is not None
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         )
 
@@ -440,11 +475,17 @@ class AsyncHttpClient:
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> typing.AsyncIterator[httpx.Response]:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -453,6 +494,15 @@ class AsyncHttpClient:
             else self.base_timeout()
         )
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
         async with self.httpx_client.stream(
@@ -487,11 +537,7 @@ class AsyncHttpClient:
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if files is not None
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         ) as stream:
             yield stream