sarvamai 0.1.5a0__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.
 
@@ -111,6 +106,7 @@ class RawChatClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "v1/chat/completions",
+            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "messages": convert_and_respect_annotation_metadata(
@@ -133,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,
@@ -150,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:
@@ -211,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,
@@ -231,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.
 
@@ -291,6 +287,7 @@ class AsyncRawChatClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "v1/chat/completions",
+            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "messages": convert_and_respect_annotation_metadata(
@@ -313,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,
@@ -330,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.
 
-import typing
-from .environment import SarvamAIEnvironment
 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:
@@ -23,9 +19,6 @@ class SarvamAI:
 
     Parameters
     ----------
-    base_url : typing.Optional[str]
-        The base url to use for requests from the client.
-
     environment : SarvamAIEnvironment
         The environment to use for requests from the client. from .environment import SarvamAIEnvironment
 
@@ -57,7 +50,6 @@ class SarvamAI:
     def __init__(
         self,
         *,
-        base_url: typing.Optional[str] = None,
         environment: SarvamAIEnvironment = SarvamAIEnvironment.PRODUCTION,
         api_subscription_key: typing.Optional[str] = os.getenv("SARVAM_API_KEY"),
         timeout: typing.Optional[float] = None,
@@ -72,7 +64,7 @@ class SarvamAI:
                 body="The client must be instantiated be either passing in api_subscription_key or setting SARVAM_API_KEY"
             )
         self._client_wrapper = SyncClientWrapper(
-            base_url=_get_base_url(base_url=base_url, environment=environment),
+            environment=environment,
             api_subscription_key=api_subscription_key,
             httpx_client=httpx_client
             if httpx_client is not None
@@ -93,9 +85,6 @@ class AsyncSarvamAI:
 
     Parameters
     ----------
-    base_url : typing.Optional[str]
-        The base url to use for requests from the client.
-
     environment : SarvamAIEnvironment
         The environment to use for requests from the client. from .environment import SarvamAIEnvironment
 
@@ -127,7 +116,6 @@ class AsyncSarvamAI:
     def __init__(
         self,
         *,
-        base_url: typing.Optional[str] = None,
         environment: SarvamAIEnvironment = SarvamAIEnvironment.PRODUCTION,
         api_subscription_key: typing.Optional[str] = os.getenv("SARVAM_API_KEY"),
         timeout: typing.Optional[float] = None,
@@ -142,7 +130,7 @@ class AsyncSarvamAI:
                 body="The client must be instantiated be either passing in api_subscription_key or setting SARVAM_API_KEY"
             )
         self._client_wrapper = AsyncClientWrapper(
-            base_url=_get_base_url(base_url=base_url, environment=environment),
+            environment=environment,
             api_subscription_key=api_subscription_key,
             httpx_client=httpx_client
             if httpx_client is not None
@@ -155,12 +143,3 @@ class AsyncSarvamAI:
         self.speech_to_text = AsyncSpeechToTextClient(client_wrapper=self._client_wrapper)
         self.text_to_speech = AsyncTextToSpeechClient(client_wrapper=self._client_wrapper)
         self.chat = AsyncChatClient(client_wrapper=self._client_wrapper)
-
-
-def _get_base_url(*, base_url: typing.Optional[str] = None, environment: SarvamAIEnvironment) -> str:
-    if base_url is not None:
-        return base_url
-    elif environment is not None:
-        return environment.value
-    else:
-        raise Exception("Please pass in either base_url or environment to construct the client")

sarvamai/core/__init__.py

@@ -1,8 +1,11 @@
 # 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
+from .events import EventEmitterMixin, EventType
 from .file import File, convert_file_dict_to_httpx_tuples, with_content_type
 from .http_client import AsyncHttpClient, HttpClient
 from .http_response import AsyncHttpResponse, HttpResponse
@@ -27,6 +30,8 @@ __all__ = [
     "AsyncHttpClient",
     "AsyncHttpResponse",
     "BaseClientWrapper",
+    "EventEmitterMixin",
+    "EventType",
     "FieldMetadata",
     "File",
     "HttpClient",

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,29 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
 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:
-    def __init__(self, *, api_subscription_key: str, base_url: str, timeout: typing.Optional[float] = None):
+    def __init__(
+        self, *, api_subscription_key: str, environment: SarvamAIEnvironment, timeout: typing.Optional[float] = None
+    ):
         self.api_subscription_key = api_subscription_key
-        self._base_url = base_url
+        self._environment = environment
         self._timeout = timeout
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "sarvamai/0.1.5a0",
+            "User-Agent": "sarvamai/0.1.5a3",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "sarvamai",
-            "X-Fern-SDK-Version": "0.1.5a0",
+            "X-Fern-SDK-Version": "0.1.5a3",
         }
         headers["api-subscription-key"] = self.api_subscription_key
         return headers
 
-    def get_base_url(self) -> str:
-        return self._base_url
+    def get_environment(self) -> SarvamAIEnvironment:
+        return self._environment
 
     def get_timeout(self) -> typing.Optional[float]:
         return self._timeout
@@ -34,16 +37,13 @@ class SyncClientWrapper(BaseClientWrapper):
         self,
         *,
         api_subscription_key: str,
-        base_url: str,
+        environment: SarvamAIEnvironment,
         timeout: typing.Optional[float] = None,
         httpx_client: httpx.Client,
     ):
-        super().__init__(api_subscription_key=api_subscription_key, base_url=base_url, timeout=timeout)
+        super().__init__(api_subscription_key=api_subscription_key, environment=environment, timeout=timeout)
         self.httpx_client = HttpClient(
-            httpx_client=httpx_client,
-            base_headers=self.get_headers,
-            base_timeout=self.get_timeout,
-            base_url=self.get_base_url,
+            httpx_client=httpx_client, base_headers=self.get_headers, base_timeout=self.get_timeout
         )
 
 
@@ -52,14 +52,11 @@ class AsyncClientWrapper(BaseClientWrapper):
         self,
         *,
         api_subscription_key: str,
-        base_url: str,
+        environment: SarvamAIEnvironment,
         timeout: typing.Optional[float] = None,
         httpx_client: httpx.AsyncClient,
     ):
-        super().__init__(api_subscription_key=api_subscription_key, base_url=base_url, timeout=timeout)
+        super().__init__(api_subscription_key=api_subscription_key, environment=environment, timeout=timeout)
         self.httpx_client = AsyncHttpClient(
-            httpx_client=httpx_client,
-            base_headers=self.get_headers,
-            base_timeout=self.get_timeout,
-            base_url=self.get_base_url,
+            httpx_client=httpx_client, base_headers=self.get_headers, base_timeout=self.get_timeout
         )

sarvamai/core/events.py

@@ -0,0 +1,30 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+from enum import Enum
+
+
+class EventType(str, Enum):
+    OPEN = "open"
+    MESSAGE = "message"
+    ERROR = "error"
+    CLOSE = "close"
+
+
+class EventEmitterMixin:
+    """
+    Simple mixin for registering and emitting events.
+    """
+
+    def __init__(self) -> None:
+        self._callbacks: typing.Dict[EventType, typing.List[typing.Callable]] = {}
+
+    def on(self, event_name: EventType, callback: typing.Callable[[typing.Any], None]) -> None:
+        if event_name not in self._callbacks:
+            self._callbacks[event_name] = []
+        self._callbacks[event_name].append(callback)
+
+    def _emit(self, event_name: EventType, data: typing.Any) -> None:
+        if event_name in self._callbacks:
+            for cb in self._callbacks[event_name]:
+                cb(data)

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()