murf 1.2.2__tar.gz → 2.0.0__tar.gz

{murf-1.2.2 → murf-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: murf
-Version: 1.2.2
+Version: 2.0.0
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers

{murf-1.2.2 → murf-2.0.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "murf"
 
 [tool.poetry]
 name = "murf"
-version = "1.2.2"
+version = "2.0.0"
 description = ""
 readme = "README.md"
 authors = []

{murf-1.2.2 → murf-2.0.0}/src/murf/__init__.py

@@ -8,10 +8,13 @@ from .types import (
     ApiProjectResponseDubbingType,
     ApiVoice,
     ApiVoiceGender,
+    AudioOutput,
     AuthTokenResponse,
     CharacterCount,
+    ClearContext,
     DubApiDetailResponse,
     DubJobStatusResponse,
+    FinalOutput,
     FormDataContentDisposition,
     GenerateSpeechResponse,
     GroupApiProjectResponse,
@@ -21,10 +24,20 @@ from .types import (
     MurfApiTranslationResponse,
     PronunciationDetail,
     PronunciationDetailType,
+    SendText,
+    SetAdvancedSettings,
+    SetVoiceConfiguration,
+    SetVoiceConfigurationVoiceConfig,
+    SetVoiceConfigurationVoiceConfigPronunciationDictionaryValue,
+    SetVoiceConfigurationVoiceConfigPronunciationDictionaryValueType,
     SourceLocaleResponse,
     SpeechToSpeechResponse,
     StyleDetails,
     Translation,
+    TtsRequestBothPayload,
+    TtsRequestBothPayloadVoiceConfig,
+    TtsRequestBothPayloadVoiceConfigPronunciationDictionary,
+    TtsRequestBothPayloadVoiceConfigPronunciationDictionaryGuess,
     WordDurationResponse,
 )
 from .errors import (
@@ -35,10 +48,11 @@ from .errors import (
     ServiceUnavailableError,
     UnauthorizedError,
 )
-from . import auth, dubbing, text, text_to_speech, voice_changer
+from . import auth, dubbing, stream_input, text, text_to_speech, voice_changer
 from .client import AsyncMurf, Murf
 from .dubbing_client import MurfDub
 from .environment import MurfEnvironment
+from .stream_input import ReceiveMessage, SendMessage
 from .text_to_speech import GenerateSpeechRequestModelVersion
 from .version import __version__
 
@@ -51,11 +65,14 @@ __all__ = [
     "ApiVoice",
     "ApiVoiceGender",
     "AsyncMurf",
+    "AudioOutput",
     "AuthTokenResponse",
     "BadRequestError",
     "CharacterCount",
+    "ClearContext",
     "DubApiDetailResponse",
     "DubJobStatusResponse",
+    "FinalOutput",
     "ForbiddenError",
     "FormDataContentDisposition",
     "GenerateSpeechRequestModelVersion",
@@ -72,16 +89,29 @@ __all__ = [
     "PaymentRequiredError",
     "PronunciationDetail",
     "PronunciationDetailType",
+    "ReceiveMessage",
+    "SendMessage",
+    "SendText",
     "ServiceUnavailableError",
+    "SetAdvancedSettings",
+    "SetVoiceConfiguration",
+    "SetVoiceConfigurationVoiceConfig",
+    "SetVoiceConfigurationVoiceConfigPronunciationDictionaryValue",
+    "SetVoiceConfigurationVoiceConfigPronunciationDictionaryValueType",
     "SourceLocaleResponse",
     "SpeechToSpeechResponse",
     "StyleDetails",
     "Translation",
+    "TtsRequestBothPayload",
+    "TtsRequestBothPayloadVoiceConfig",
+    "TtsRequestBothPayloadVoiceConfigPronunciationDictionary",
+    "TtsRequestBothPayloadVoiceConfigPronunciationDictionaryGuess",
     "UnauthorizedError",
     "WordDurationResponse",
     "__version__",
     "auth",
     "dubbing",
+    "stream_input",
     "text",
     "text_to_speech",
     "voice_changer",

{murf-1.2.2 → murf-2.0.0}/src/murf/auth/client.py

@@ -4,7 +4,7 @@ from ..core.client_wrapper import SyncClientWrapper
 import typing
 from ..core.request_options import RequestOptions
 from ..types.auth_token_response import AuthTokenResponse
-from ..core.pydantic_utilities import parse_obj_as
+from ..core.unchecked_base_model import construct_type
 from ..errors.bad_request_error import BadRequestError
 from ..errors.unauthorized_error import UnauthorizedError
 from ..errors.service_unavailable_error import ServiceUnavailableError
@@ -42,6 +42,7 @@ class AuthClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "v1/auth/token",
+            base_url=self._client_wrapper.get_environment().base,
             method="GET",
             request_options=request_options,
         )
@@ -49,7 +50,7 @@ class AuthClient:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
                     AuthTokenResponse,
-                    parse_obj_as(
+                    construct_type(
                         type_=AuthTokenResponse,  # type: ignore
                         object_=_response.json(),
                     ),
@@ -58,7 +59,7 @@ class AuthClient:
                 raise BadRequestError(
                     typing.cast(
                         typing.Optional[typing.Any],
-                        parse_obj_as(
+                        construct_type(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
@@ -68,7 +69,7 @@ class AuthClient:
                 raise UnauthorizedError(
                     typing.cast(
                         typing.Optional[typing.Any],
-                        parse_obj_as(
+                        construct_type(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
@@ -78,7 +79,7 @@ class AuthClient:
                 raise ServiceUnavailableError(
                     typing.cast(
                         typing.Optional[typing.Any],
-                        parse_obj_as(
+                        construct_type(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
@@ -127,6 +128,7 @@ class AsyncAuthClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "v1/auth/token",
+            base_url=self._client_wrapper.get_environment().base,
             method="GET",
             request_options=request_options,
         )
@@ -134,7 +136,7 @@ class AsyncAuthClient:
             if 200 <= _response.status_code < 300:
                 return typing.cast(
                     AuthTokenResponse,
-                    parse_obj_as(
+                    construct_type(
                         type_=AuthTokenResponse,  # type: ignore
                         object_=_response.json(),
                     ),
@@ -143,7 +145,7 @@ class AsyncAuthClient:
                 raise BadRequestError(
                     typing.cast(
                         typing.Optional[typing.Any],
-                        parse_obj_as(
+                        construct_type(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
@@ -153,7 +155,7 @@ class AsyncAuthClient:
                 raise UnauthorizedError(
                     typing.cast(
                         typing.Optional[typing.Any],
-                        parse_obj_as(
+                        construct_type(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),
@@ -163,7 +165,7 @@ class AsyncAuthClient:
                 raise ServiceUnavailableError(
                     typing.cast(
                         typing.Optional[typing.Any],
-                        parse_obj_as(
+                        construct_type(
                             type_=typing.Optional[typing.Any],  # type: ignore
                             object_=_response.json(),
                         ),

{murf-1.2.2 → murf-2.0.0}/src/murf/base_client.py

@@ -1,7 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
 from .environment import MurfEnvironment
+import typing
 import httpx
 from .core.client_wrapper import SyncClientWrapper
 from .auth.client import AuthClient
@@ -23,9 +23,6 @@ class BaseClient:
 
     Parameters
     ----------
-    base_url : typing.Optional[str]
-        The base url to use for requests from the client.
-
     environment : MurfEnvironment
         The environment to use for requests from the client. from .environment import MurfEnvironment
 
@@ -57,7 +54,6 @@ class BaseClient:
     def __init__(
         self,
         *,
-        base_url: typing.Optional[str] = None,
         environment: MurfEnvironment = MurfEnvironment.DEFAULT,
         api_key: typing.Optional[str] = None,
         timeout: typing.Optional[float] = None,
@@ -66,7 +62,7 @@ class BaseClient:
     ):
         _defaulted_timeout = timeout if timeout is not None else 60 if httpx_client is None else None
         self._client_wrapper = SyncClientWrapper(
-            base_url=_get_base_url(base_url=base_url, environment=environment),
+            environment=environment,
             api_key=api_key,
             httpx_client=httpx_client
             if httpx_client is not None
@@ -88,9 +84,6 @@ class AsyncBaseClient:
 
     Parameters
     ----------
-    base_url : typing.Optional[str]
-        The base url to use for requests from the client.
-
     environment : MurfEnvironment
         The environment to use for requests from the client. from .environment import MurfEnvironment
 
@@ -122,7 +115,6 @@ class AsyncBaseClient:
     def __init__(
         self,
         *,
-        base_url: typing.Optional[str] = None,
         environment: MurfEnvironment = MurfEnvironment.DEFAULT,
         api_key: typing.Optional[str] = None,
         timeout: typing.Optional[float] = None,
@@ -131,7 +123,7 @@ class AsyncBaseClient:
     ):
         _defaulted_timeout = timeout if timeout is not None else 60 if httpx_client is None else None
         self._client_wrapper = AsyncClientWrapper(
-            base_url=_get_base_url(base_url=base_url, environment=environment),
+            environment=environment,
             api_key=api_key,
             httpx_client=httpx_client
             if httpx_client is not None
@@ -145,12 +137,3 @@ class AsyncBaseClient:
         self.text = AsyncTextClient(client_wrapper=self._client_wrapper)
         self.voice_changer = AsyncVoiceChangerClient(client_wrapper=self._client_wrapper)
         self.dubbing = AsyncDubbingClient(client_wrapper=self._client_wrapper)
-
-
-def _get_base_url(*, base_url: typing.Optional[str] = None, environment: MurfEnvironment) -> 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")

{murf-1.2.2 → murf-2.0.0}/src/murf/client.py

@@ -3,6 +3,7 @@ from .environment import MurfEnvironment
 import typing
 import os
 import httpx
+from .version import __version__
 
 class Murf(BaseClient):
     """
@@ -10,8 +11,6 @@ class Murf(BaseClient):
 
     Parameters
     ----------
-    base_url : typing.Optional[str]
-        The base url to use for requests from the client.
 
     environment : MurfEnvironment
         The environment to use for requests from the client. from .environment import MurfEnvironment
@@ -44,15 +43,17 @@ class Murf(BaseClient):
     def __init__(
         self,
         *,
-        base_url: typing.Optional[str] = None,
         environment: MurfEnvironment = MurfEnvironment.DEFAULT,
         api_key: typing.Optional[str] = os.getenv("MURF_API_KEY"),
         timeout: typing.Optional[float] = 60,
         follow_redirects: typing.Optional[bool] = True,
         httpx_client: typing.Optional[httpx.Client] = None,
     ):
+        default_params = {'origin': f'python_sdk_{__version__}'}
+        _defaulted_timeout = timeout if timeout is not None else 60 if httpx_client is None else None
+        httpx_client=httpx_client if httpx_client is not None else httpx.Client(params=default_params, timeout=_defaulted_timeout, follow_redirects=follow_redirects) if follow_redirects is not None else httpx.Client(params=default_params, timeout=_defaulted_timeout)
+
         super().__init__(
-            base_url=base_url,
             environment=environment,
             api_key=api_key,
             timeout=timeout,
@@ -68,8 +69,6 @@ class AsyncMurf(AsyncBaseClient):
 
     Parameters
     ----------
-    base_url : typing.Optional[str]
-        The base url to use for requests from the client.
 
     environment : MurfEnvironment
         The environment to use for requests from the client. from .environment import MurfEnvironment
@@ -102,15 +101,17 @@ class AsyncMurf(AsyncBaseClient):
     def __init__(
         self,
         *,
-        base_url: typing.Optional[str] = None,
         environment: MurfEnvironment = MurfEnvironment.DEFAULT,
         api_key: typing.Optional[str] = os.getenv("MURF_API_KEY"),
         timeout: typing.Optional[float] = 60,
         follow_redirects: typing.Optional[bool] = True,
         httpx_client: typing.Optional[httpx.AsyncClient] = None,
     ):
+        default_params = {'origin': f'python_sdk_{__version__}'}
+        _defaulted_timeout = timeout if timeout is not None else 60 if httpx_client is None else None
+        httpx_client=httpx_client if httpx_client is not None else httpx.AsyncClient(params=default_params, timeout=_defaulted_timeout, follow_redirects=follow_redirects) if follow_redirects is not None else httpx.AsyncClient(params=default_params, timeout=_defaulted_timeout)
+        
         super().__init__(
-            base_url=base_url,
             environment=environment,
             api_key=api_key,
             timeout=timeout,

{murf-1.2.2 → murf-2.0.0}/src/murf/core/__init__.py

@@ -19,6 +19,7 @@ from .query_encoder import encode_query
 from .remove_none_from_dict import remove_none_from_dict
 from .request_options import RequestOptions
 from .serialization import FieldMetadata, convert_and_respect_annotation_metadata
+from .unchecked_base_model import UncheckedBaseModel, UnionMetadata, construct_type
 
 __all__ = [
     "ApiError",
@@ -31,8 +32,11 @@ __all__ = [
     "IS_PYDANTIC_V2",
     "RequestOptions",
     "SyncClientWrapper",
+    "UncheckedBaseModel",
+    "UnionMetadata",
     "UniversalBaseModel",
     "UniversalRootModel",
+    "construct_type",
     "convert_and_respect_annotation_metadata",
     "convert_file_dict_to_httpx_tuples",
     "encode_query",

{murf-1.2.2 → murf-2.0.0}/src/murf/core/client_wrapper.py

@@ -1,29 +1,36 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
+from ..environment import MurfEnvironment
 import httpx
 from .http_client import HttpClient
 from .http_client import AsyncHttpClient
 
 
 class BaseClientWrapper:
-    def __init__(self, *, api_key: typing.Optional[str] = None, base_url: str, timeout: typing.Optional[float] = None):
+    def __init__(
+        self,
+        *,
+        api_key: typing.Optional[str] = None,
+        environment: MurfEnvironment,
+        timeout: typing.Optional[float] = None,
+    ):
         self._api_key = api_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] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "murf",
-            "X-Fern-SDK-Version": "1.2.2",
+            "X-Fern-SDK-Version": "2.0.0",
         }
         if self._api_key is not None:
             headers["api-key"] = self._api_key
         return headers
 
-    def get_base_url(self) -> str:
-        return self._base_url
+    def get_environment(self) -> MurfEnvironment:
+        return self._environment
 
     def get_timeout(self) -> typing.Optional[float]:
         return self._timeout
@@ -34,16 +41,13 @@ class SyncClientWrapper(BaseClientWrapper):
         self,
         *,
         api_key: typing.Optional[str] = None,
-        base_url: str,
+        environment: MurfEnvironment,
         timeout: typing.Optional[float] = None,
         httpx_client: httpx.Client,
     ):
-        super().__init__(api_key=api_key, base_url=base_url, timeout=timeout)
+        super().__init__(api_key=api_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 +56,11 @@ class AsyncClientWrapper(BaseClientWrapper):
         self,
         *,
         api_key: typing.Optional[str] = None,
-        base_url: str,
+        environment: MurfEnvironment,
         timeout: typing.Optional[float] = None,
         httpx_client: httpx.AsyncClient,
     ):
-        super().__init__(api_key=api_key, base_url=base_url, timeout=timeout)
+        super().__init__(api_key=api_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
         )