Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update google-cloud-texttospeech to 2.10.0 (#66726)

pull/66736/head
Franck Nijhof 2022-02-17 12:06:49 +01:00 committed by GitHub
parent a1b81b2de4
commit 72fad87aef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/google_cloud/manifest.json
View File

@ -2,7 +2,7 @@
"domain": "google_cloud", "domain": "google_cloud",
"name": "Google Cloud Platform", "name": "Google Cloud Platform",
"documentation": "https://www.home-assistant.io/integrations/google_cloud", "documentation": "https://www.home-assistant.io/integrations/google_cloud",
"requirements": ["google-cloud-texttospeech==0.4.0"], "requirements": ["google-cloud-texttospeech==2.10.0"],
"codeowners": ["@lufton"], "codeowners": ["@lufton"],
"iot_class": "cloud_push" "iot_class": "cloud_push"
} }

29
homeassistant/components/google_cloud/tts.py
View File

@ -122,13 +122,9 @@ SUPPORTED_OPTIONS = [
CONF_TEXT_TYPE, CONF_TEXT_TYPE,
] ]
GENDER_SCHEMA = vol.All( GENDER_SCHEMA = vol.All(vol.Upper, vol.In(texttospeech.SsmlVoiceGender.__members__))
vol.Upper, vol.In(texttospeech.enums.SsmlVoiceGender.__members__)
)
VOICE_SCHEMA = cv.matches_regex(VOICE_REGEX) VOICE_SCHEMA = cv.matches_regex(VOICE_REGEX)
SCHEMA_ENCODING = vol.All( SCHEMA_ENCODING = vol.All(vol.Upper, vol.In(texttospeech.AudioEncoding.__members__))
vol.Upper, vol.In(texttospeech.enums.AudioEncoding.__members__)
)
SPEED_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_SPEED, max=MAX_SPEED)) SPEED_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_SPEED, max=MAX_SPEED))
PITCH_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_PITCH, max=MAX_PITCH)) PITCH_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_PITCH, max=MAX_PITCH))
GAIN_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_GAIN, max=MAX_GAIN)) GAIN_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_GAIN, max=MAX_GAIN))
@ -263,27 +259,32 @@ class GoogleCloudTTSProvider(Provider):
try: try:
params = {options[CONF_TEXT_TYPE]: message} params = {options[CONF_TEXT_TYPE]: message}
# pylint: disable=no-member synthesis_input = texttospeech.SynthesisInput(**params)
synthesis_input = texttospeech.types.SynthesisInput(**params)
voice = texttospeech.types.VoiceSelectionParams( voice = texttospeech.VoiceSelectionParams(
language_code=language, language_code=language,
ssml_gender=texttospeech.enums.SsmlVoiceGender[options[CONF_GENDER]], ssml_gender=texttospeech.SsmlVoiceGender[options[CONF_GENDER]],
name=_voice, name=_voice,
) )
audio_config = texttospeech.types.AudioConfig( audio_config = texttospeech.AudioConfig(
audio_encoding=texttospeech.enums.AudioEncoding[_encoding], audio_encoding=texttospeech.AudioEncoding[_encoding],
speaking_rate=options[CONF_SPEED], speaking_rate=options[CONF_SPEED],
pitch=options[CONF_PITCH], pitch=options[CONF_PITCH],
volume_gain_db=options[CONF_GAIN], volume_gain_db=options[CONF_GAIN],
effects_profile_id=options[CONF_PROFILES], effects_profile_id=options[CONF_PROFILES],
) )
# pylint: enable=no-member
request = {
"voice": voice,
"audio_config": audio_config,
"input": synthesis_input,
}
async with async_timeout.timeout(10): async with async_timeout.timeout(10):
assert self.hass
response = await self.hass.async_add_executor_job( response = await self.hass.async_add_executor_job(
self._client.synthesize_speech, synthesis_input, voice, audio_config self._client.synthesize_speech, request
) )
return _encoding, response.audio_content return _encoding, response.audio_content

2
requirements_all.txt
View File

@ -758,7 +758,7 @@ google-api-python-client==1.6.4
google-cloud-pubsub==2.9.0 google-cloud-pubsub==2.9.0
# homeassistant.components.google_cloud # homeassistant.components.google_cloud
google-cloud-texttospeech==0.4.0 google-cloud-texttospeech==2.10.0
# homeassistant.components.nest # homeassistant.components.nest
google-nest-sdm==1.7.1 google-nest-sdm==1.7.1

2
script/pip_check
View File

@ -3,7 +3,7 @@ PIP_CACHE=$1
# Number of existing dependency conflicts # Number of existing dependency conflicts
# Update if a PR resolve one! # Update if a PR resolve one!
DEPENDENCY_CONFLICTS=10 DEPENDENCY_CONFLICTS=9
PIP_CHECK=$(pip check --cache-dir=$PIP_CACHE) PIP_CHECK=$(pip check --cache-dir=$PIP_CACHE)
LINE_COUNT=$(echo "$PIP_CHECK" | wc -l) LINE_COUNT=$(echo "$PIP_CHECK" | wc -l)