Add support for Amazon Polly generative engine

homeassistant/components/amazon_polly/const.py

@@ -8,135 +8,32 @@
 CONF_ACCESS_KEY_ID: Final = "aws_access_key_id"
 CONF_SECRET_ACCESS_KEY: Final = "aws_secret_access_key"
 
-DEFAULT_REGION: Final = "us-east-1"
-SUPPORTED_REGIONS: Final[list[str]] = [
-    "us-east-1",
-    "us-east-2",
-    "us-west-1",
-    "us-west-2",
-    "ca-central-1",
-    "eu-west-1",
-    "eu-central-1",
-    "eu-west-2",
-    "eu-west-3",
-    "ap-southeast-1",
-    "ap-southeast-2",
-    "ap-northeast-2",
-    "ap-northeast-1",
-    "ap-south-1",
-    "sa-east-1",
-]
-
 CONF_ENGINE: Final = "engine"
 CONF_VOICE: Final = "voice"
 CONF_OUTPUT_FORMAT: Final = "output_format"
 CONF_SAMPLE_RATE: Final = "sample_rate"
 CONF_TEXT_TYPE: Final = "text_type"
 
-SUPPORTED_VOICES: Final[list[str]] = [
-    "Aditi",  # Hindi
-    "Amy",  # English (British)
-    "Aria",  # English (New Zealand), Neural
-    "Arlet",  # Catalan, Neural
-    "Arthur",  # English, Neural
-    "Astrid",  # Swedish
-    "Ayanda",  # English (South African), Neural
-    "Bianca",  # Italian
-    "Brian",  # English (British)
-    "Camila",  # Portuguese, Brazilian
-    "Carla",  # Italian
-    "Carmen",  # Romanian
-    "Celine",  # French
-    "Chantal",  # French Canadian
-    "Conchita",  # Spanish (European)
-    "Cristiano",  # Portuguese (European)
-    "Daniel",  # German, Neural
-    "Dora",  # Icelandic
-    "Elin",  # Swedish, Neural
-    "Emma",  # English
-    "Enrique",  # Spanish (European)
-    "Ewa",  # Polish
-    "Filiz",  # Turkish
-    "Gabrielle",  # French (Canadian)
-    "Geraint",  # English Welsh
-    "Giorgio",  # Italian
-    "Gwyneth",  # Welsh
-    "Hala",  # Arabic (Gulf), Neural
-    "Hannah",  # German (Austrian), Neural
-    "Hans",  # German
-    "Hiujin",  # Chinese (Cantonese), Neural
-    "Ida",  # Norwegian, Neural
-    "Ines",  # Portuguese, European  # codespell:ignore ines
-    "Ivy",  # English
-    "Jacek",  # Polish
-    "Jan",  # Polish
-    "Joanna",  # English
-    "Joey",  # English
-    "Justin",  # English
-    "Kajal",  # English (Indian)/Hindi (Bilingual ), Neural
-    "Karl",  # Icelandic
-    "Kendra",  # English
-    "Kevin",  # English, Neural
-    "Kimberly",  # English
-    "Laura",  # Dutch, Neural
-    "Lea",  # French
-    "Liam",  # Canadian French, Neural
-    "Liv",  # Norwegian
-    "Lotte",  # Dutch
-    "Lucia",  # Spanish European
-    "Lupe",  # Spanish US
-    "Mads",  # Danish
-    "Maja",  # Polish
-    "Marlene",  # German
-    "Mathieu",  # French
-    "Matthew",  # English
-    "Maxim",  # Russian
-    "Mia",  # Spanish Mexican
-    "Miguel",  # Spanish US
-    "Mizuki",  # Japanese
-    "Naja",  # Danish
-    "Nicole",  # English Australian
-    "Ola",  # Polish, Neural
-    "Olivia",  # Female, Australian, Neural
-    "Penelope",  # Spanish US
-    "Pedro",  # Spanish US, Neural
-    "Raveena",  # English, Indian
-    "Ricardo",  # Portuguese (Brazilian)
-    "Ruben",  # Dutch
-    "Russell",  # English (Australian)
-    "Ruth",  # English, Neural
-    "Salli",  # English
-    "Seoyeon",  # Korean
-    "Stephen",  # English, Neural
-    "Suvi",  # Finnish
-    "Takumi",  # Japanese
-    "Tatyana",  # Russian
-    "Vicki",  # German
-    "Vitoria",  # Portuguese, Brazilian
-    "Zeina",  # Arabic
-    "Zhiyu",  # Chinese
-]
-
-SUPPORTED_OUTPUT_FORMATS: Final[list[str]] = ["mp3", "ogg_vorbis", "pcm"]
+SUPPORTED_OUTPUT_FORMATS: Final[set[str]] = {"mp3", "ogg_vorbis", "pcm"}
 
-SUPPORTED_ENGINES: Final[list[str]] = ["neural", "standard"]
+SUPPORTED_SAMPLE_RATES: Final[set[str]] = {"8000", "16000", "22050", "24000"}
 
-SUPPORTED_SAMPLE_RATES: Final[list[str]] = ["8000", "16000", "22050", "24000"]
-
-SUPPORTED_SAMPLE_RATES_MAP: Final[dict[str, list[str]]] = {
-    "mp3": ["8000", "16000", "22050", "24000"],
-    "ogg_vorbis": ["8000", "16000", "22050"],
-    "pcm": ["8000", "16000"],
+SUPPORTED_SAMPLE_RATES_MAP: Final[dict[str, set[str]]] = {
+    "mp3": {"8000", "16000", "22050", "24000"},
+    "ogg_vorbis": {"8000", "16000", "22050"},
+    "pcm": {"8000", "16000"},
 }
 
-SUPPORTED_TEXT_TYPES: Final[list[str]] = ["text", "ssml"]
+SUPPORTED_TEXT_TYPES: Final[set[str]] = {"text", "ssml"}
 
 CONTENT_TYPE_EXTENSIONS: Final[dict[str, str]] = {
     "audio/mpeg": "mp3",
     "audio/ogg": "ogg",
     "audio/pcm": "pcm",
 }
 
+DEFAULT_REGION: Final = "us-east-1"
+
 DEFAULT_ENGINE: Final = "standard"
 DEFAULT_VOICE: Final = "Joanna"
 DEFAULT_OUTPUT_FORMAT: Final = "mp3"

homeassistant/components/amazon_polly/tts.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections import defaultdict
 import logging
 from typing import Any, Final
 
@@ -16,6 +17,11 @@
 )
 from homeassistant.const import ATTR_CREDENTIALS, CONF_PROFILE_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.generated.amazon_polly import (
+    SUPPORTED_ENGINES,
+    SUPPORTED_REGIONS,
+    SUPPORTED_VOICES,
+)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -38,13 +44,10 @@
     DEFAULT_SAMPLE_RATES,
     DEFAULT_TEXT_TYPE,
     DEFAULT_VOICE,
-    SUPPORTED_ENGINES,
     SUPPORTED_OUTPUT_FORMATS,
-    SUPPORTED_REGIONS,
     SUPPORTED_SAMPLE_RATES,
     SUPPORTED_SAMPLE_RATES_MAP,
     SUPPORTED_TEXT_TYPES,
-    SUPPORTED_VOICES,
 )
 
 _LOGGER: Final = logging.getLogger(__name__)
@@ -112,6 +115,8 @@ def get_engine(
 
     all_voices: dict[str, dict[str, str]] = {}
 
+    all_engines: dict[str, set[str]] = defaultdict(set)
+
     all_voices_req = polly_client.describe_voices()
 
     for voice in all_voices_req.get("Voices", []):
@@ -122,8 +127,12 @@ def get_engine(
         language_code: str | None = voice.get("LanguageCode")
         if language_code is not None and language_code not in supported_languages:
             supported_languages.append(language_code)
+        for engine in voice.get("SupportedEngines"):
+            all_engines[engine].add(voice_id)
 
-    return AmazonPollyProvider(polly_client, config, supported_languages, all_voices)
+    return AmazonPollyProvider(
+        polly_client, config, supported_languages, all_voices, all_engines
+    )
 
 
 class AmazonPollyProvider(Provider):
@@ -135,13 +144,16 @@ def __init__(
         config: ConfigType,
         supported_languages: list[str],
         all_voices: dict[str, dict[str, str]],
+        all_engines: dict[str, set[str]],
     ) -> None:
         """Initialize Amazon Polly provider for TTS."""
         self.client = polly_client
         self.config = config
         self.supported_langs = supported_languages
         self.all_voices = all_voices
+        self.all_engines = all_engines
         self.default_voice: str = self.config[CONF_VOICE]
+        self.default_engine: str = self.config[CONF_ENGINE]
         self.name = "Amazon Polly"
 
     @property
@@ -157,12 +169,12 @@ def default_language(self) -> str | None:
     @property
     def default_options(self) -> dict[str, str]:
         """Return dict include default options."""
-        return {CONF_VOICE: self.default_voice}
+        return {CONF_VOICE: self.default_voice, CONF_ENGINE: self.default_engine}
 
     @property
     def supported_options(self) -> list[str]:
         """Return a list of supported options."""
-        return [CONF_VOICE]
+        return [CONF_VOICE, CONF_ENGINE]
 
     def get_tts_audio(
         self,
@@ -177,9 +189,14 @@ def get_tts_audio(
             _LOGGER.error("%s does not support the %s language", voice_id, language)
             return None, None
 
+        engine = options.get(CONF_ENGINE, self.default_engine)
+        if voice_id not in self.all_engines[engine]:
+            _LOGGER.error("%s does not support the %s engine", voice_id, engine)
+            return None, None
+
         _LOGGER.debug("Requesting TTS file for text: %s", message)
         resp = self.client.synthesize_speech(
-            Engine=self.config[CONF_ENGINE],
+            Engine=engine,
             OutputFormat=self.config[CONF_OUTPUT_FORMAT],
             SampleRate=self.config[CONF_SAMPLE_RATE],
             Text=message,

homeassistant/generated/amazon_polly.py

@@ -0,0 +1,137 @@
+"""Automatically generated file.
+
+To update, run python3 -m script.amazon_polly
+"""
+
+from __future__ import annotations
+
+from typing import Final
+
+SUPPORTED_ENGINES: Final[set[str]] = {
+    "generative",
+    "long-form",
+    "neural",
+    "standard",
+}
+
+SUPPORTED_REGIONS: Final[set[str]] = {
+    "af-south-1",
+    "ap-east-1",
+    "ap-northeast-1",
+    "ap-northeast-2",
+    "ap-northeast-3",
+    "ap-south-1",
+    "ap-southeast-1",
+    "ap-southeast-2",
+    "ca-central-1",
+    "eu-central-1",
+    "eu-north-1",
+    "eu-west-1",
+    "eu-west-2",
+    "eu-west-3",
+    "me-south-1",
+    "sa-east-1",
+    "us-east-1",
+    "us-east-2",
+    "us-west-1",
+    "us-west-2",
+}
+
+SUPPORTED_VOICES: Final[set[str]] = {
+    "Aditi",
+    "Adriano",
+    "Amy",
+    "Andres",
+    "Aria",
+    "Arlet",
+    "Arthur",
+    "Astrid",
+    "Ayanda",
+    "Bianca",
+    "Brian",
+    "Burcu",
+    "Camila",
+    "Carla",
+    "Carmen",
+    "Celine",
+    "Chantal",
+    "Conchita",
+    "Cristiano",
+    "Daniel",
+    "Danielle",
+    "Dora",
+    "Elin",
+    "Emma",
+    "Enrique",
+    "Ewa",
+    "Filiz",
+    "Gabrielle",
+    "Geraint",
+    "Giorgio",
+    "Gregory",
+    "Gwyneth",
+    "Hala",
+    "Hannah",
+    "Hans",
+    "Hiujin",
+    "Ida",
+    "Ines",
+    "Isabelle",
+    "Ivy",
+    "Jacek",
+    "Jan",
+    "Joanna",
+    "Joey",
+    "Justin",
+    "Kajal",
+    "Karl",
+    "Kazuha",
+    "Kendra",
+    "Kevin",
+    "Kimberly",
+    "Laura",
+    "Lea",
+    "Liam",
+    "Lisa",
+    "Liv",
+    "Lotte",
+    "Lucia",
+    "Lupe",
+    "Mads",
+    "Maja",
+    "Marlene",
+    "Mathieu",
+    "Matthew",
+    "Maxim",
+    "Mia",
+    "Miguel",
+    "Mizuki",
+    "Naja",
+    "Niamh",
+    "Nicole",
+    "Ola",
+    "Olivia",
+    "Pedro",
+    "Penelope",
+    "Raveena",
+    "Remi",
+    "Ricardo",
+    "Ruben",
+    "Russell",
+    "Ruth",
+    "Salli",
+    "Seoyeon",
+    "Sergio",
+    "Sofie",
+    "Stephen",
+    "Suvi",
+    "Takumi",
+    "Tatyana",
+    "Thiago",
+    "Tomoko",
+    "Vicki",
+    "Vitoria",
+    "Zayd",
+    "Zeina",
+    "Zhiyu",
+}