Enable override on API keys for external services

.python-version

@@ -0,0 +1 @@
+icespeak-venv

src/icespeak/voices/__init__.py

@@ -28,7 +28,7 @@
 
 from pydantic import BaseModel, Field
 
-from icespeak.settings import MAX_SPEED, MIN_SPEED, SETTINGS, TextFormats
+from icespeak.settings import Keys, MAX_SPEED, MIN_SPEED, SETTINGS, TextFormats
 from icespeak.transcribe import DefaultTranscriber
 
 if TYPE_CHECKING:
@@ -125,5 +125,5 @@ def load_api_keys(self) -> None:
         raise NotImplementedError
 
     @abstractmethod
-    def text_to_speech(self, text: str, options: TTSOptions) -> Path:
+    def text_to_speech(self, text: str, options: TTSOptions, keys_override: Keys | None = None) -> Path:
         raise NotImplementedError

src/icespeak/voices/aws_polly.py

@@ -30,7 +30,7 @@
 
 import boto3
 
-from icespeak.settings import API_KEYS, SETTINGS
+from icespeak.settings import API_KEYS, Keys, SETTINGS
 
 from . import BaseVoice, ModuleAudioFormatsT, ModuleVoicesT, TTSOptions
 
@@ -47,6 +47,14 @@ class AWSPollyVoice(BaseVoice):
 
     _lock = Lock()
 
+    def _create_client(self, aws_key: AWSPollyKey) -> boto3.client:
+        return boto3.client(
+            "polly",
+            region_name=aws_key.region_name.get_secret_value(),
+            aws_access_key_id=aws_key.aws_access_key_id.get_secret_value(),
+            aws_secret_access_key=aws_key.aws_secret_access_key.get_secret_value(),
+        )
+
     @property
     @override
     def name(self):
@@ -78,7 +86,13 @@ def load_api_keys(self):
                 )
 
     @override
-    def text_to_speech(self, text: str, options: TTSOptions):
+    def text_to_speech(self, text: str, options: TTSOptions, keys_override: Keys | None = None):
+        if keys_override and keys_override.aws:
+            _LOG.info(f"Using overridden AWS keys")
+            client = self._create_client(keys_override.aws)
+        else:
+            _LOG.info(f"Using default AWS keys")
+            client = self._aws_client
         # Special preprocessing for SSML markup
         if options.text_format == "ssml":
             # Adjust voice speed as appropriate
@@ -99,7 +113,7 @@ def text_to_speech(self, text: str, options: TTSOptions):
                 "OutputFormat": options.audio_format,
             }
             _LOG.debug("Synthesizing with AWS Polly: %s", aws_args)
-            response: dict[str, Any] = self._aws_client.synthesize_speech(**aws_args)
+            response: dict[str, Any] = client.synthesize_speech(**aws_args)
         except Exception:
             _LOG.exception("Error synthesizing speech.")
             raise

src/icespeak/voices/azure.py

@@ -29,7 +29,7 @@
 
 import azure.cognitiveservices.speech as speechsdk
 
-from icespeak.settings import API_KEYS, SETTINGS
+from icespeak.settings import API_KEYS, Keys, SETTINGS
 from icespeak.transcribe import DefaultTranscriber, strip_markup
 
 from . import BaseVoice, ModuleAudioFormatsT, ModuleVoicesT, TTSOptions
@@ -179,10 +179,16 @@ def load_api_keys(self):
         AzureVoice.AZURE_REGION = API_KEYS.azure.region.get_secret_value()
 
     @override
-    def text_to_speech(self, text: str, options: TTSOptions):
-        speech_conf = speechsdk.SpeechConfig(
-            subscription=AzureVoice.AZURE_KEY, region=AzureVoice.AZURE_REGION
-        )
+    def text_to_speech(self, text: str, options: TTSOptions, keys_override: Keys | None = None):
+        if keys_override and keys_override.azure:
+            _LOG.info(f"Using overridden Azure keys")
+            subscription = keys_override.azure.key
+            region = keys_override.azure.region
+        else:
+            _LOG.info(f"Using default Azure keys")
+            subscription = API_KEYS.azure.key
+            region = API_KEYS.azure.region
+        speech_conf = speechsdk.SpeechConfig(subscription=subscription, region=region)
 
         azure_voice_id = AzureVoice._VOICES[options.voice]["id"]
         speech_conf.speech_synthesis_voice_name = azure_voice_id

src/icespeak/voices/tiro.py

@@ -29,7 +29,7 @@
 
 import requests
 
-from icespeak.settings import SETTINGS
+from icespeak.settings import Keys, SETTINGS
 from icespeak.transcribe import strip_markup
 
 from . import BaseVoice, ModuleAudioFormatsT, ModuleVoicesT, TTSOptions
@@ -70,7 +70,7 @@ def load_api_keys(self):
         pass
 
     @override
-    def text_to_speech(self, text: str, options: TTSOptions):
+    def text_to_speech(self, text: str, options: TTSOptions, keys_override: Keys | None = None):
         # TODO: Tiro's API supports a subset of SSML tags
         # See https://tts.tiro.is/#tag/speech/paths/~1v0~1speech/post