Added language filtering to get_available_voices()

Author: pawelad

ivona_api/ivona_api.py

@@ -76,15 +76,27 @@ def set_voice(self, voice_name, language):
         self._voice_name = voice_name
         self._language = language
 
-    def get_available_voices(self):
+    def get_available_voices(self, filter_language=None):
         """
         Returns a list of available voices, via 'ListVoices' endpoint
             http://developer.ivona.com/en/speechcloud/actions.html#ListVoices
         """
         endpoint = urljoin(
             IVONA_REGION_ENDPOINTS[self.region], 'ListVoices',
         )
-        r = requests.get(endpoint, auth=self._aws4auth)
+        if filter_language:
+            if not any([v['Language'] == filter_language
+                        for v in self.available_voices]):
+                raise ValueError("Incorrect language.")
+
+            data = {
+                'Voice': {
+                    'Language': filter_language,
+                },
+            }
+            r = requests.post(endpoint, auth=self._aws4auth, json=data)
+        else:
+            r = requests.get(endpoint, auth=self._aws4auth)
 
         if 'x-amzn-ErrorType' in r.headers:
             raise IvonaAPIException(r.headers['x-amzn-ErrorType'])

ivona_api/test/test_ivona_api.py

@@ -48,25 +48,29 @@ def test_init(auth_keys):
 def test_available_voices(auth_keys):
     """Test getting available voices"""
     ivona_api = IvonaAPI(auth_keys[0], auth_keys[1])
-    voices = ivona_api.available_voices
 
+    voices = ivona_api.available_voices
     assert len(voices) > 1
 
     # Make sure that default voice is available
     assert any([v['Name'] == 'Salli' and v['Language'] == 'en-US'
                 for v in voices])
 
 
-def test_text_to_speech_custom_voice(auth_keys):
-    """Test setting custom voice"""
+@flaky
+def test_available_voices_with_filter(auth_keys):
+    """Test getting available voices with filtering"""
     ivona_api = IvonaAPI(auth_keys[0], auth_keys[1])
 
     with pytest.raises(ValueError):
-        with tempfile.NamedTemporaryFile() as temp_file:
-            ivona_api.text_to_speech(
-                str(uuid4()), temp_file,
-                voice_name=str(uuid4()),
-            )
+        ivona_api.get_available_voices(str(uuid4()))
+
+    voices = ivona_api.get_available_voices('en-US')
+    assert len(voices) > 1
+
+    # Make sure that default voice is available
+    assert any([v['Name'] == 'Salli' and v['Language'] == 'en-US'
+                for v in voices])
 
 
 @flaky
@@ -86,3 +90,15 @@ def test_text_to_speech(auth_keys, voice_name, voice_language, content,
         ivona_api.text_to_speech(content, temp_file)
 
         assert filecmp.cmp(org_file, temp_file.name)
+
+
+def test_text_to_speech_custom_voice(auth_keys):
+    """Test setting custom voice"""
+    ivona_api = IvonaAPI(auth_keys[0], auth_keys[1])
+
+    with pytest.raises(ValueError):
+        with tempfile.NamedTemporaryFile() as temp_file:
+            ivona_api.text_to_speech(
+                str(uuid4()), temp_file,
+                voice_name=str(uuid4()),
+            )