Cleanup language support on TTS #5255

pvizeli · 2017-01-10T10:26:37Z

Description:

After we support language also on service call, I make a small refactory of language support for future. Now it is also possible to check language on service call and protect cache System for produce not correct files.

If the code does not interact with devices:

Local tests with tox run successfully. Your PR cannot be merged unless tests pass
Tests have been added to verify that the new code works.

mention-bot · 2017-01-10T10:26:37Z

@pvizeli, thanks for your PR! By analyzing the history of the files in this pull request, we identified @andrey-git to be a potential reviewer.

andrey-git · 2017-01-10T10:58:08Z

homeassistant/components/tts/__init__.py

+    @property
+    def supported_languages(self):
+        """List of supported languages."""
+        return None


The return type must be iterable for if language_key not in provider.supported_languages.
Maybe return [] ?

Actually since all platforms must override both language and supported_languages maybe throw exception in both of them?

You are not wrong with it. I do that while the default handling on all base entities do that in this way. HomeAssistant set property to default None and function to raise a not implement exception.

balloob · 2017-01-10T13:05:28Z

homeassistant/components/tts/__init__.py

        key = KEY_PATTERN.format(msg_hash, language_key, engine).lower()
        use_cache = cache if cache is not None else self.use_cache

+        if language_key not in provider.supported_languages:


Add to your if to avoid blowing up: if language_key is None or …:

balloob · 2017-01-10T13:06:28Z

homeassistant/components/tts/demo.py

+        self._lang = lang
+
+    @property
+    def language(self):


I think that we should rename this to default_language ?

pvizeli · 2017-01-10T13:52:44Z

@balloob done

balloob · 2017-01-10T16:25:24Z

homeassistant/components/tts/google.py

@@ -70,7 +81,7 @@ def async_get_tts_audio(self, message, language=None):
        # If language is not specified or is not supported - use the language


We should not have these checks in platforms.

This check should be moved to the service, as every platform will need this check

We should not default to another language but instead log an error.

It was support on service too, I can remove this code.

balloob · 2017-01-10T16:25:43Z

homeassistant/components/tts/picotts.py

+    def supported_languages(self):
+        """List of supported languages."""
+        return SUPPORT_LANGUAGES
+
    def get_tts_audio(self, message, language=None):
        """Load TTS using pico2wave."""
        if language not in SUPPORT_LANGUAGES:


balloob · 2017-01-10T16:25:50Z

homeassistant/components/tts/voicerss.py


        form_data['src'] = message

        # If language is specified and supported - use it instead of the
        # language in the config.
-        if language in SUPPORT_LANGUAGES:
-            form_data['hl'] = language
+        if language not in SUPPORT_LANGUAGES:


pvizeli · 2017-01-10T17:03:09Z

@balloob done. I have remove this code while I had implement this check on service but I was blind to see that was not needed anymore.

This reverts commit 4b43537. Revert "Version bump for kodi dependency (home-assistant#5307)" This reverts commit 6abad6b. Revert "Add HMWIOSwitch to sensor, binary (home-assistant#5304)" This reverts commit 2c3f55a. Revert "Remove GTFS default name & string change" This reverts commit 6000c59. Revert "Update pyhomematic 1.19 & small cleanups (home-assistant#5299)" This reverts commit a30711f. Revert "[sensor] Add Dublin bus RTPI sensor (home-assistant#5257)" This reverts commit 1219ca3. Revert "Bugfix group reload (home-assistant#5292)" This reverts commit baa8e53. Revert "Support for TrackR device trackers (home-assistant#5010)" This reverts commit f7a1d63. Revert "Bump pywemo version." This reverts commit dc937cc. Revert "Upgrade to voluptuous to 0.9.3 (home-assistant#5288)" This reverts commit d12decc. Revert "Upgrade distro to 1.0.2 (home-assistant#5291)" This reverts commit 64800fd. Revert "Don't build Adafruit_BBIO - doesn't work on all platforms. (home-assistant#5281)" This reverts commit 9a3c0c8. Revert "Convert flic to synchronous platform. (home-assistant#5276)" This reverts commit eb9b95c. Revert "Upgrade to aiohttp 1.2 (home-assistant#4964)" This reverts commit e68e29e. Revert "Fix TCP sensor to correctly use value_template (home-assistant#5211)" This reverts commit 1cf9ae5. Revert "Cleanup language support on TTS (home-assistant#5255)" This reverts commit 3f3a3bc. Revert "Add last triggered to script (home-assistant#5261)" This reverts commit 467cb18. Revert "Bump flux_led version and make use of PyPi package (home-assistant#5267)" This reverts commit 34a9fb0. Revert "Add support for NAD receivers (home-assistant#5191)" This reverts commit 3b59e16. Revert "Bugfix async device_tracker see callback (home-assistant#5259)" This reverts commit 71fddd2. Revert "Use SHA hash to make token harder to guess (home-assistant#5258)" This reverts commit 922308b.

* Added forecast support to DarkSky modified: homeassistant/components/sensor/darksky.py modified: tests/components/sensor/test_darksky.py * Fix async_volume_up / async_volume_down (#5249) async_volume_up / async_volume_down should be async versions of volume_up / volume_down, not a async version of the default variants of volume_up / volume_down. The previous code always called into the mediaplayers set_volume_level, and never into volume_up / volume_down. Signed-off-by: Anton Lundin <glance@acc.umu.se> * adding a default icon "blind" to a PowerView blinds scene. (#5210) * adding a default icon "blind" to a PowerView blinds scene. * Adding icon property to define blind icon. Removed it from the state attributes dict. * fixing lint error * Added forecast support to DarkSky modified: homeassistant/components/sensor/darksky.py modified: tests/components/sensor/test_darksky.py * Use SHA hash to make token harder to guess (#5258) * Use SHA hash to make token harder to guess Use hashlib SHA256 to encode object id instead of using it directly. * Cache access token Instead of generating a token on the fly cache it in the constructor. * Fix lint * Bugfix async device_tracker see callback (#5259) * Add support for NAD receivers (#5191) * Add support for NAD receivers * remove self.update() in various methods * remove setting attributes in various methods * Change import to hass style * Updated Config Validation, extended daily forecast to all supported types * Fix style errors from previous commit, fix test since adding daily for all supported types * Removed temperature from daily as it isn't supported * Added forecast support to DarkSky modified: homeassistant/components/sensor/darksky.py modified: tests/components/sensor/test_darksky.py * Updated Config Validation, extended daily forecast to all supported types * Fix style errors from previous commit, fix test since adding daily for all supported types * Removed temperature from daily as it isn't supported * Revert "Bugfix camera streams (#5306)" This reverts commit 4b43537. Revert "Version bump for kodi dependency (#5307)" This reverts commit 6abad6b. Revert "Add HMWIOSwitch to sensor, binary (#5304)" This reverts commit 2c3f55a. Revert "Remove GTFS default name & string change" This reverts commit 6000c59. Revert "Update pyhomematic 1.19 & small cleanups (#5299)" This reverts commit a30711f. Revert "[sensor] Add Dublin bus RTPI sensor (#5257)" This reverts commit 1219ca3. Revert "Bugfix group reload (#5292)" This reverts commit baa8e53. Revert "Support for TrackR device trackers (#5010)" This reverts commit f7a1d63. Revert "Bump pywemo version." This reverts commit dc937cc. Revert "Upgrade to voluptuous to 0.9.3 (#5288)" This reverts commit d12decc. Revert "Upgrade distro to 1.0.2 (#5291)" This reverts commit 64800fd. Revert "Don't build Adafruit_BBIO - doesn't work on all platforms. (#5281)" This reverts commit 9a3c0c8. Revert "Convert flic to synchronous platform. (#5276)" This reverts commit eb9b95c. Revert "Upgrade to aiohttp 1.2 (#4964)" This reverts commit e68e29e. Revert "Fix TCP sensor to correctly use value_template (#5211)" This reverts commit 1cf9ae5. Revert "Cleanup language support on TTS (#5255)" This reverts commit 3f3a3bc. Revert "Add last triggered to script (#5261)" This reverts commit 467cb18. Revert "Bump flux_led version and make use of PyPi package (#5267)" This reverts commit 34a9fb0. Revert "Add support for NAD receivers (#5191)" This reverts commit 3b59e16. Revert "Bugfix async device_tracker see callback (#5259)" This reverts commit 71fddd2. Revert "Use SHA hash to make token harder to guess (#5258)" This reverts commit 922308b. * Revert "Revert "Bugfix camera streams (#5306)"" This reverts commit 2ee8c44. * Update darksky.py

pvizeli added this to the 0.36 milestone Jan 10, 2017

balloobbot added component platform labels Jan 10, 2017

andrey-git reviewed Jan 10, 2017

View reviewed changes

andrey-git approved these changes Jan 10, 2017

View reviewed changes

balloob reviewed Jan 10, 2017

View reviewed changes

pvizeli force-pushed the fix_language_service_tts branch from 5653684 to 241821e Compare January 10, 2017 14:03

balloob reviewed Jan 10, 2017

View reviewed changes

pvizeli added 2 commits January 10, 2017 18:26

Cleanup language support on TTS

8d0f018

change to default_language & address comments

2cec914

pvizeli force-pushed the fix_language_service_tts branch from e75de94 to 81f641c Compare January 10, 2017 17:26

Cleanup not needed code / comment from paulus

4d9ba9f

pvizeli force-pushed the fix_language_service_tts branch from b49d0a3 to 4d9ba9f Compare January 10, 2017 19:42

balloob merged commit 3f3a3bc into home-assistant:dev Jan 11, 2017

home-assistant locked and limited conversation to collaborators Apr 30, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup language support on TTS #5255

Cleanup language support on TTS #5255

pvizeli commented Jan 10, 2017

mention-bot commented Jan 10, 2017

andrey-git Jan 10, 2017

andrey-git Jan 10, 2017

pvizeli Jan 10, 2017

balloob Jan 10, 2017

balloob Jan 10, 2017

pvizeli Jan 10, 2017

pvizeli commented Jan 10, 2017

balloob Jan 10, 2017 •

edited

pvizeli Jan 10, 2017

balloob Jan 10, 2017

balloob Jan 10, 2017

pvizeli commented Jan 10, 2017

		@@ -70,7 +81,7 @@ def async_get_tts_audio(self, message, language=None):
		# If language is not specified or is not supported - use the language

Cleanup language support on TTS #5255

Cleanup language support on TTS #5255

Conversation

pvizeli commented Jan 10, 2017

mention-bot commented Jan 10, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pvizeli commented Jan 10, 2017

balloob Jan 10, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pvizeli commented Jan 10, 2017

balloob Jan 10, 2017 •

edited