smallestai 3.1.0__py3-none-any.whl → 4.0.1__py3-none-any.whl

smallestai/atoms/models/webhook_post_request_events_inner.py

@@ -0,0 +1,99 @@
+# coding: utf-8
+
+"""
+    Agent Management API
+
+    API for managing agents, their templates, and call logs
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class WebhookPostRequestEventsInner(BaseModel):
+    """
+    WebhookPostRequestEventsInner
+    """ # noqa: E501
+    agent_id: Optional[StrictStr] = Field(default=None, description="The ID of the agent", alias="agentId")
+    event_type: Optional[StrictStr] = Field(default=None, description="The type of event to subscribe to", alias="eventType")
+    __properties: ClassVar[List[str]] = ["agentId", "eventType"]
+
+    @field_validator('event_type')
+    def event_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['pre-conversation', 'post-conversation']):
+            raise ValueError("must be one of enum values ('pre-conversation', 'post-conversation')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of WebhookPostRequestEventsInner from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of WebhookPostRequestEventsInner from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "agentId": obj.get("agentId"),
+            "eventType": obj.get("eventType")
+        })
+        return _obj
+
+

smallestai/atoms/models/webhook_subscription.py

@@ -0,0 +1,108 @@
+# coding: utf-8
+
+"""
+    Agent Management API
+
+    API for managing agents, their templates, and call logs
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from datetime import datetime
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class WebhookSubscription(BaseModel):
+    """
+    WebhookSubscription
+    """ # noqa: E501
+    id: Optional[StrictStr] = Field(default=None, description="The unique identifier for the subscription", alias="_id")
+    webhook_id: Optional[StrictStr] = Field(default=None, description="The ID of the webhook", alias="webhookId")
+    agent_id: Optional[StrictStr] = Field(default=None, description="The ID of the agent", alias="agentId")
+    event_type: Optional[StrictStr] = Field(default=None, description="The type of event subscribed to", alias="eventType")
+    created_at: Optional[datetime] = Field(default=None, description="The date and time when the subscription was created", alias="createdAt")
+    updated_at: Optional[datetime] = Field(default=None, description="The date and time when the subscription was last updated", alias="updatedAt")
+    __properties: ClassVar[List[str]] = ["_id", "webhookId", "agentId", "eventType", "createdAt", "updatedAt"]
+
+    @field_validator('event_type')
+    def event_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['pre-conversation', 'post-conversation']):
+            raise ValueError("must be one of enum values ('pre-conversation', 'post-conversation')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of WebhookSubscription from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of WebhookSubscription from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "_id": obj.get("_id"),
+            "webhookId": obj.get("webhookId"),
+            "agentId": obj.get("agentId"),
+            "eventType": obj.get("eventType"),
+            "createdAt": obj.get("createdAt"),
+            "updatedAt": obj.get("updatedAt")
+        })
+        return _obj
+
+

smallestai/atoms/models/webhook_subscription_populated.py

@@ -0,0 +1,112 @@
+# coding: utf-8
+
+"""
+    Agent Management API
+
+    API for managing agents, their templates, and call logs
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from datetime import datetime
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from smallestai.atoms.models.webhook_agent import WebhookAgent
+from typing import Optional, Set
+from typing_extensions import Self
+
+class WebhookSubscriptionPopulated(BaseModel):
+    """
+    WebhookSubscriptionPopulated
+    """ # noqa: E501
+    id: Optional[StrictStr] = Field(default=None, description="The unique identifier for the subscription", alias="_id")
+    webhook_id: Optional[StrictStr] = Field(default=None, description="The ID of the webhook", alias="webhookId")
+    agent_id: Optional[WebhookAgent] = Field(default=None, alias="agentId")
+    event_type: Optional[StrictStr] = Field(default=None, description="The type of event subscribed to", alias="eventType")
+    created_at: Optional[datetime] = Field(default=None, description="The date and time when the subscription was created", alias="createdAt")
+    updated_at: Optional[datetime] = Field(default=None, description="The date and time when the subscription was last updated", alias="updatedAt")
+    __properties: ClassVar[List[str]] = ["_id", "webhookId", "agentId", "eventType", "createdAt", "updatedAt"]
+
+    @field_validator('event_type')
+    def event_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['pre-conversation', 'post-conversation']):
+            raise ValueError("must be one of enum values ('pre-conversation', 'post-conversation')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of WebhookSubscriptionPopulated from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of agent_id
+        if self.agent_id:
+            _dict['agentId'] = self.agent_id.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of WebhookSubscriptionPopulated from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "_id": obj.get("_id"),
+            "webhookId": obj.get("webhookId"),
+            "agentId": WebhookAgent.from_dict(obj["agentId"]) if obj.get("agentId") is not None else None,
+            "eventType": obj.get("eventType"),
+            "createdAt": obj.get("createdAt"),
+            "updatedAt": obj.get("updatedAt")
+        })
+        return _obj
+
+

smallestai/waves/__init__.py

@@ -1,5 +1,5 @@
 from smallestai.waves.waves_client import WavesClient
 from smallestai.waves.async_waves_client import AsyncWavesClient
-from smallestai.waves.stream_tts import TextToAudioStream
+from smallestai.waves.stream_tts import WavesStreamingTTS, TTSConfig
 
-__all__ = ["WavesClient", "AsyncWavesClient", "TextToAudioStream"]
+__all__ = ["WavesClient", "AsyncWavesClient", "WavesStreamingTTS", "TTSConfig"]

smallestai/waves/async_waves_client.py

@@ -4,10 +4,10 @@ import json
 import aiohttp
 import aiofiles
 import requests
-from typing import Optional, Union, List, AsyncIterator
+from typing import Optional, Union, List
 
 from smallestai.waves.exceptions import TTSError, APIError
-from smallestai.waves.utils import (TTSOptions, validate_input, preprocess_text, add_wav_header, chunk_text,
+from smallestai.waves.utils import (TTSOptions, validate_input,
                      get_smallest_languages, get_smallest_models, ALLOWED_AUDIO_EXTENSIONS, API_BASE_URL)
 
 
@@ -22,7 +22,8 @@ class AsyncWavesClient:
         consistency: Optional[float] = 0.5,
         similarity: Optional[float] = 0.0,
         enhancement: Optional[int] = 1,
-        add_wav_header: Optional[bool] = True
+        language: Optional[str] = "en",
+        output_format: Optional[str] = "wav"
     ) -> None:
         """
         AsyncSmallest Instance for asynchronous text-to-speech synthesis.
@@ -40,7 +41,8 @@ class AsyncWavesClient:
         - consistency (float): This parameter controls word repetition and skipping. Decrease it to prevent skipped words, and increase it to prevent repetition. Only supported in `lightning-large` model. Range - [0, 1]
         - similarity (float): This parameter controls the similarity between the synthesized audio and the reference audio. Increase it to make the speech more similar to the reference audio. Only supported in `lightning-large` model. Range - [0, 1]
         - enhancement (int): Enhances speech quality at the cost of increased latency. Only supported in `lightning-large` model. Range - [0, 2].
-        - add_wav_header (bool): Whether to add a WAV header to the output audio.
+        - language (str): The language for synthesis. Default is "en".
+        - output_format (str): The output audio format. Options: "pcm", "mp3", "wav", "mulaw". Default is "pcm".
 
         Methods:
         - get_languages: Returns a list of available languages for synthesis.
@@ -61,11 +63,12 @@ class AsyncWavesClient:
             sample_rate=sample_rate,
             voice_id=voice_id,
             api_key=self.api_key,
-            add_wav_header=add_wav_header,
             speed=speed,
             consistency=consistency,
             similarity=similarity,
-            enhancement=enhancement
+            enhancement=enhancement,
+            language=language,
+            output_format=output_format
         )
         self.session = None
 
@@ -130,18 +133,14 @@ class AsyncWavesClient:
     async def synthesize(
             self,
             text: str,
-            stream: Optional[bool] = False,
-            save_as: Optional[str] = None,
             **kwargs
-        ) -> Union[bytes, None, AsyncIterator[bytes]]:
+        ) -> Union[bytes]:
         """
         Asynchronously synthesize speech from the provided text.
 
         Args:
         - text (str): The text to be converted to speech.
         - stream (Optional[bool]): If True, returns an iterator yielding audio chunks instead of a full byte array.
-        - save_as (Optional[str]): If provided, the synthesized audio will be saved to this file path.
-                                   The file must have a .wav extension.
         - kwargs: Additional optional parameters to override `__init__` options for this call.
 
         Returns:
@@ -151,7 +150,7 @@ class AsyncWavesClient:
             - Otherwise, returns the synthesized audio content as bytes.
 
         Raises:
-        - TTSError: If the provided file name does not have a .wav extension when `save_as` is specified.
+        - TTSError: If the provided file name does not have a .wav or .mp3 extension when `save_as` is specified.
         - APIError: If the API request fails or returns an error.
         - ValueError: If an unexpected parameter is passed in `kwargs`.
         """
@@ -172,65 +171,40 @@ class AsyncWavesClient:
             for key, value in kwargs.items():
                 setattr(opts, key, value)
 
-            text = preprocess_text(text)
             validate_input(text, opts.model, opts.sample_rate, opts.speed, opts.consistency, opts.similarity, opts.enhancement)
 
-            self.chunk_size = 250
-            if opts.model == 'lightning-large' or opts.model == "lightning-v2":
-                self.chunk_size = 140
-
-            chunks = chunk_text(text, self.chunk_size)
-
-            async def audio_stream():
-                for chunk in chunks:
-                    payload = {
-                        "text": chunk,
-                        "sample_rate": opts.sample_rate,
-                        "voice_id": opts.voice_id,
-                        "add_wav_header": False,
-                        "speed": opts.speed,
-                        "model": opts.model
-                    }
-                    
-                    if opts.model == "lightning-large" or opts.model == "lightning-v2":
-                        if opts.consistency is not None:
-                            payload["consistency"] = opts.consistency
-                        if opts.similarity is not None:
-                            payload["similarity"] = opts.similarity
-                        if opts.enhancement is not None:
-                            payload["enhancement"] = opts.enhancement
-
-
-                    headers = {
-                        "Authorization": f"Bearer {self.api_key}",
-                        "Content-Type": "application/json",
-                    }
-
-                    async with self.session.post(f"{API_BASE_URL}/{opts.model}/get_speech", json=payload, headers=headers) as res:
-                        if res.status != 200:
-                            raise APIError(f"Failed to synthesize speech: {await res.text()}. For more information, visit https://waves.smallest.ai/")
-
-                        yield await res.read()
+            payload = {
+                "text": text,
+                "voice_id": opts.voice_id,
+                "sample_rate": opts.sample_rate,
+                "speed": opts.speed,
+                "consistency": opts.consistency,
+                "similarity": opts.similarity,
+                "enhancement": opts.enhancement,
+                "language": opts.language,
+                "output_format": opts.output_format
+            }
             
-            if stream:
-                return audio_stream()
-
-            audio_content = b"".join([chunk async for chunk in audio_stream()])
-
-            if save_as:
-                if not save_as.endswith(".wav"):
-                    raise TTSError("Invalid file name. Extension must be .wav")
-
-                async with aiofiles.open(save_as, mode='wb') as f:
-                    await f.write(add_wav_header(audio_content, opts.sample_rate))
-
-                return None
-
-            if opts.add_wav_header:
-                return add_wav_header(audio_content, opts.sample_rate)
+            if opts.model == "lightning-large" or opts.model == "lightning-v2":
+                if opts.consistency is not None:
+                    payload["consistency"] = opts.consistency
+                if opts.similarity is not None:
+                    payload["similarity"] = opts.similarity
+                if opts.enhancement is not None:
+                    payload["enhancement"] = opts.enhancement
+                    
+            headers = {
+                "Authorization": f"Bearer {self.api_key}",
+                "Content-Type": "application/json",
+            }
 
-            return audio_content
+            async with self.session.post(f"{API_BASE_URL}/{opts.model}/get_speech", json=payload, headers=headers) as res:
+                if res.status != 200:
+                    raise APIError(f"Failed to synthesize speech: {await res.text()}. For more information, visit https://waves.smallest.ai/")
+                
+                audio_bytes = await res.content.read()  
 
+            return audio_bytes
         finally:
             if should_cleanup and self.session:
                 await self.session.close()
@@ -316,9 +290,8 @@ class AsyncWavesClient:
                 if res.status != 200:
                     raise APIError(f"Failed to delete voice: {await res.text()}. For more information, visit https://waves.smallest.ai/")
 
-                return await res.text()
-        
+                return json.dumps(await res.json(), indent=4, ensure_ascii=False)
         finally:
             if should_cleanup and self.session:
                 await self.session.close()
-                self.session = None
+                self.session = None