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

sarvamai/__init__.py

@@ -1,7 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-# isort: skip_file
-
 from .types import (
     ChatCompletionRequestAssistantMessage,
     ChatCompletionRequestMessage,
@@ -41,12 +39,12 @@ from .types import (
     TimestampsModel,
     TranslateMode,
     TranslateModel,
-    TranslatePostprocessing,
     TranslateSourceLanguage,
     TranslateSpeakerGender,
     TranslateTargetLanguage,
     TranslationResponse,
     TranslatiterateTargetLanguage,
+    TransliterateMode,
     TransliterateSourceLanguage,
     TransliterationResponse,
 )
@@ -156,13 +154,13 @@ __all__ = [
     "TooManyRequestsError",
     "TranslateMode",
     "TranslateModel",
-    "TranslatePostprocessing",
     "TranslateSourceLanguage",
     "TranslateSpeakerGender",
     "TranslateTargetLanguage",
     "TranslationResponse",
     "TranslationResponseParams",
     "TranslatiterateTargetLanguage",
+    "TransliterateMode",
     "TransliterateSourceLanguage",
     "TransliterationResponse",
     "TransliterationResponseParams",

sarvamai/chat/__init__.py

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

sarvamai/chat/client.py

@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-
-from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from ..core.request_options import RequestOptions
+from ..core.client_wrapper import SyncClientWrapper
+from .raw_client import RawChatClient
 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 ..types.reasoning_effort import ReasoningEffort
-from .raw_client import AsyncRawChatClient, RawChatClient
+from ..core.client_wrapper import AsyncClientWrapper
+from .raw_client import AsyncRawChatClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -117,7 +118,7 @@ class ChatClient:
             messages=[{"content": "content", "role": "assistant"}],
         )
         """
-        _response = self._raw_client.completions(
+        response = self._raw_client.completions(
             messages=messages,
             temperature=temperature,
             top_p=top_p,
@@ -132,7 +133,7 @@ class ChatClient:
             wiki_grounding=wiki_grounding,
             request_options=request_options,
         )
-        return _response.data
+        return response.data
 
 
 class AsyncChatClient:
@@ -246,7 +247,7 @@ class AsyncChatClient:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client.completions(
+        response = await self._raw_client.completions(
             messages=messages,
             temperature=temperature,
             top_p=top_p,
@@ -261,4 +262,4 @@ class AsyncChatClient:
             wiki_grounding=wiki_grounding,
             request_options=request_options,
         )
-        return _response.data
+        return response.data

sarvamai/chat/raw_client.py

@@ -1,23 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-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.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 ..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.internal_server_error import InternalServerError
-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
+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
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -106,7 +107,6 @@ 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(
@@ -145,63 +145,58 @@ class RawChatClient:
                 return HttpResponse(response=_response, data=_data)
             if _response.status_code == 400:
                 raise BadRequestError(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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, headers=dict(_response.headers), body=_response.text)
-        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
 
 
 class AsyncRawChatClient:
@@ -287,7 +282,6 @@ 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(
@@ -326,60 +320,55 @@ class AsyncRawChatClient:
                 return AsyncHttpResponse(response=_response, data=_data)
             if _response.status_code == 400:
                 raise BadRequestError(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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(
-                    headers=dict(_response.headers),
-                    body=typing.cast(
+                    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, headers=dict(_response.headers), body=_response.text)
-        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)

sarvamai/client.py

@@ -1,16 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import os
 import typing
-
+from .environment import SarvamAIEnvironment
+import os
 import httpx
-from .chat.client import AsyncChatClient, ChatClient
 from .core.api_error import ApiError
-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
+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
 
 
 class SarvamAI:
@@ -19,6 +23,9 @@ 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
 
@@ -50,6 +57,7 @@ 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,
@@ -64,7 +72,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(
-            environment=environment,
+            base_url=_get_base_url(base_url=base_url, environment=environment),
             api_subscription_key=api_subscription_key,
             httpx_client=httpx_client
             if httpx_client is not None
@@ -85,6 +93,9 @@ 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
 
@@ -116,6 +127,7 @@ 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,
@@ -130,7 +142,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(
-            environment=environment,
+            base_url=_get_base_url(base_url=base_url, environment=environment),
             api_subscription_key=api_subscription_key,
             httpx_client=httpx_client
             if httpx_client is not None
@@ -143,3 +155,12 @@ 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,11 +1,8 @@
 # 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
@@ -30,8 +27,6 @@ __all__ = [
     "AsyncHttpClient",
     "AsyncHttpResponse",
     "BaseClientWrapper",
-    "EventEmitterMixin",
-    "EventType",
     "FieldMetadata",
     "File",
     "HttpClient",

sarvamai/core/api_error.py

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

sarvamai/core/client_wrapper.py

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