sarvamai 0.1.4a0__tar.gz → 0.1.5a0__tar.gz

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sarvamai
-Version: 0.1.4a0
+Version: 0.1.5a0
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "sarvamai"
 
 [tool.poetry]
 name = "sarvamai"
-version = "0.1.4a0"
+version = "0.1.5a0"
 description = ""
 readme = "README.md"
 authors = []

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/src/sarvamai/chat/raw_client.py

@@ -111,7 +111,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(
@@ -292,7 +291,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(

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/src/sarvamai/client.py

@@ -1,7 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .environment import SarvamAIEnvironment
 import typing
+from .environment import SarvamAIEnvironment
 import os
 import httpx
 from .core.api_error import ApiError
@@ -23,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
 
@@ -54,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,
@@ -68,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
@@ -89,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
 
@@ -120,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,
@@ -134,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
@@ -147,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-0.1.4a0 → sarvamai-0.1.5a0}/src/sarvamai/core/client_wrapper.py

@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..environment import SarvamAIEnvironment
 import typing
 import httpx
 from .http_client import HttpClient
@@ -8,25 +7,23 @@ 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.4a0",
+            "User-Agent": "sarvamai/0.1.5a0",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "sarvamai",
-            "X-Fern-SDK-Version": "0.1.4a0",
+            "X-Fern-SDK-Version": "0.1.5a0",
         }
         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,
         )

sarvamai-0.1.5a0/src/sarvamai/environment.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import enum
+
+
+class SarvamAIEnvironment(enum.Enum):
+    PRODUCTION = "https://api.sarvam.ai"

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/src/sarvamai/speech_to_text/raw_client.py

@@ -80,7 +80,6 @@ class RawSpeechToTextClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "speech-to-text",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             data={
                 "model": model,
@@ -211,7 +210,6 @@ class RawSpeechToTextClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "speech-to-text-translate",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             data={
                 "prompt": prompt,
@@ -352,7 +350,6 @@ class AsyncRawSpeechToTextClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "speech-to-text",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             data={
                 "model": model,
@@ -483,7 +480,6 @@ class AsyncRawSpeechToTextClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "speech-to-text-translate",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             data={
                 "prompt": prompt,

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/src/sarvamai/text/raw_client.py

@@ -145,7 +145,6 @@ class RawTextClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "translate",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "input": input,
@@ -250,7 +249,6 @@ class RawTextClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "text-lid",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "input": input,
@@ -424,7 +422,6 @@ class RawTextClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "transliterate",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "input": input,
@@ -619,7 +616,6 @@ class AsyncRawTextClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "translate",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "input": input,
@@ -724,7 +720,6 @@ class AsyncRawTextClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "text-lid",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "input": input,
@@ -898,7 +893,6 @@ class AsyncRawTextClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "transliterate",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "input": input,

{sarvamai-0.1.4a0 → sarvamai-0.1.5a0}/src/sarvamai/text_to_speech/raw_client.py

@@ -97,7 +97,6 @@ class RawTextToSpeechClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "text-to-speech",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "text": text,
@@ -255,7 +254,6 @@ class AsyncRawTextToSpeechClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "text-to-speech",
-            base_url=self._client_wrapper.get_environment().base,
             method="POST",
             json={
                 "text": text,

sarvamai-0.1.4a0/src/sarvamai/environment.py

@@ -1,14 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-from __future__ import annotations
-
-
-class SarvamAIEnvironment:
-    PRODUCTION: SarvamAIEnvironment
-
-    def __init__(self, *, base: str, production: str):
-        self.base = base
-        self.production = production
-
-
-SarvamAIEnvironment.PRODUCTION = SarvamAIEnvironment(base="https://api.sarvam.ai", production="wss://api.sarvam.ai")