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

homeassistant/components/google_cloud/manifest.json

@@ -2,7 +2,7 @@
   "domain": "google_cloud",
   "name": "Google Cloud Platform",
   "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"],
   "iot_class": "cloud_push"
 }

homeassistant/components/google_cloud/tts.py

@@ -122,13 +122,9 @@ SUPPORTED_OPTIONS = [
     CONF_TEXT_TYPE,
 ]
 
-GENDER_SCHEMA = vol.All(
-    vol.Upper, vol.In(texttospeech.enums.SsmlVoiceGender.__members__)
-)
+GENDER_SCHEMA = vol.All(vol.Upper, vol.In(texttospeech.SsmlVoiceGender.__members__))
 VOICE_SCHEMA = cv.matches_regex(VOICE_REGEX)
-SCHEMA_ENCODING = vol.All(
-    vol.Upper, vol.In(texttospeech.enums.AudioEncoding.__members__)
-)
+SCHEMA_ENCODING = vol.All(vol.Upper, vol.In(texttospeech.AudioEncoding.__members__))
 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))
 GAIN_SCHEMA = vol.All(vol.Coerce(float), vol.Clamp(min=MIN_GAIN, max=MAX_GAIN))
@@ -263,27 +259,32 @@ class GoogleCloudTTSProvider(Provider):
 
         try:
             params = {options[CONF_TEXT_TYPE]: message}
-            # pylint: disable=no-member
-            synthesis_input = texttospeech.types.SynthesisInput(**params)
+            synthesis_input = texttospeech.SynthesisInput(**params)
 
-            voice = texttospeech.types.VoiceSelectionParams(
+            voice = texttospeech.VoiceSelectionParams(
                 language_code=language,
-                ssml_gender=texttospeech.enums.SsmlVoiceGender[options[CONF_GENDER]],
+                ssml_gender=texttospeech.SsmlVoiceGender[options[CONF_GENDER]],
                 name=_voice,
             )
 
-            audio_config = texttospeech.types.AudioConfig(
-                audio_encoding=texttospeech.enums.AudioEncoding[_encoding],
+            audio_config = texttospeech.AudioConfig(
+                audio_encoding=texttospeech.AudioEncoding[_encoding],
                 speaking_rate=options[CONF_SPEED],
                 pitch=options[CONF_PITCH],
                 volume_gain_db=options[CONF_GAIN],
                 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):
+                assert self.hass
                 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
 

homeassistant/components/google_pubsub/__init__.py

@@ -6,7 +6,7 @@ import json
 import logging
 import os
 
-from google.cloud import pubsub_v1
+from google.cloud.pubsub_v1 import PublisherClient
 import voluptuous as vol
 
 from homeassistant.const import EVENT_STATE_CHANGED, STATE_UNAVAILABLE, STATE_UNKNOWN
@@ -52,9 +52,7 @@ def setup(hass: HomeAssistant, yaml_config: ConfigType) -> bool:
 
     entities_filter = config[CONF_FILTER]
 
-    publisher = pubsub_v1.PublisherClient.from_service_account_json(
-        service_principal_path
-    )
+    publisher = PublisherClient.from_service_account_json(service_principal_path)
 
     topic_path = publisher.topic_path(  # pylint: disable=no-member
         project_id, topic_name

requirements_all.txt

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

script/pip_check

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

tests/components/google_pubsub/test_init.py

@@ -42,10 +42,9 @@ async def test_nested():
 @pytest.fixture(autouse=True, name="mock_client")
 def mock_client_fixture():
     """Mock the pubsub client."""
-    with mock.patch(f"{GOOGLE_PUBSUB_PATH}.pubsub_v1") as client:
-        client.PublisherClient = mock.MagicMock()
+    with mock.patch(f"{GOOGLE_PUBSUB_PATH}.PublisherClient") as client:
         setattr(
-            client.PublisherClient,
+            client,
             "from_service_account_json",
             mock.MagicMock(return_value=mock.MagicMock()),
         )
@@ -83,10 +82,10 @@ async def test_minimal_config(hass, mock_client):
     await hass.async_block_till_done()
     assert hass.bus.listen.called
     assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
-    assert mock_client.PublisherClient.from_service_account_json.call_count == 1
-    assert mock_client.PublisherClient.from_service_account_json.call_args[0][
-        0
-    ] == os.path.join(hass.config.config_dir, "creds")
+    assert mock_client.from_service_account_json.call_count == 1
+    assert mock_client.from_service_account_json.call_args[0][0] == os.path.join(
+        hass.config.config_dir, "creds"
+    )
 
 
 async def test_full_config(hass, mock_client):
@@ -110,10 +109,10 @@ async def test_full_config(hass, mock_client):
     await hass.async_block_till_done()
     assert hass.bus.listen.called
     assert hass.bus.listen.call_args_list[0][0][0] == EVENT_STATE_CHANGED
-    assert mock_client.PublisherClient.from_service_account_json.call_count == 1
-    assert mock_client.PublisherClient.from_service_account_json.call_args[0][
-        0
-    ] == os.path.join(hass.config.config_dir, "creds")
+    assert mock_client.from_service_account_json.call_count == 1
+    assert mock_client.from_service_account_json.call_args[0][0] == os.path.join(
+        hass.config.config_dir, "creds"
+    )
 
 
 def make_event(entity_id):
@@ -154,7 +153,7 @@ async def test_allowlist(hass, mock_client):
             "include_entities": ["binary_sensor.included"],
         },
     )
-    publish_client = mock_client.PublisherClient.from_service_account_json("path")
+    publish_client = mock_client.from_service_account_json("path")
 
     tests = [
         FilterTest("climate.excluded", False),
@@ -184,7 +183,7 @@ async def test_denylist(hass, mock_client):
             "exclude_entities": ["binary_sensor.excluded"],
         },
     )
-    publish_client = mock_client.PublisherClient.from_service_account_json("path")
+    publish_client = mock_client.from_service_account_json("path")
 
     tests = [
         FilterTest("climate.excluded", False),
@@ -216,7 +215,7 @@ async def test_filtered_allowlist(hass, mock_client):
             "exclude_entities": ["light.excluded"],
         },
     )
-    publish_client = mock_client.PublisherClient.from_service_account_json("path")
+    publish_client = mock_client.from_service_account_json("path")
 
     tests = [
         FilterTest("light.included", True),
@@ -246,7 +245,7 @@ async def test_filtered_denylist(hass, mock_client):
             "exclude_entities": ["light.excluded"],
         },
     )
-    publish_client = mock_client.PublisherClient.from_service_account_json("path")
+    publish_client = mock_client.from_service_account_json("path")
 
     tests = [
         FilterTest("climate.excluded", False),