chore: use gapic-generator-python 0.56.2 (#213)

* chore: update Java and Python dependencies PiperOrigin-RevId: 408420890 Source-Link: googleapis/googleapis@2921f9f Source-Link: googleapis/googleapis-gen@6598ca8 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjU5OGNhOGNiYmY1MjI2NzMzYTA5OWM0NTA2NTE4YTVhZjZmZjc0YyJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Nov 9, 2021 · 6b5b751 · 6b5b751
1 parent e8980fc
commit 6b5b751
Show file tree

Hide file tree

Showing 14 changed files with 118 additions and 66 deletions.
diff --git a/...e-cloud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/async_client.py b/...e-cloud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/async_client.py
@@ -19,14 +19,17 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-from google.api_core.client_options import ClientOptions  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+from google.api_core.client_options import ClientOptions
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-OptionalRetry = Union[retries.Retry, object]
+try:
+    OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError:  # pragma: NO COVER
+    OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
 from google.cloud.texttospeech_v1.types import cloud_tts
 from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO

diff --git a/.../google-cloud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/client.py b/.../google-cloud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/client.py
@@ -14,23 +14,25 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-from distutils import util
 import os
 import re
 from typing import Dict, Optional, Sequence, Tuple, Type, Union
 import pkg_resources
 
-from google.api_core import client_options as client_options_lib  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+from google.api_core import client_options as client_options_lib
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-OptionalRetry = Union[retries.Retry, object]
+try:
+    OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError:  # pragma: NO COVER
+    OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
 from google.cloud.texttospeech_v1.types import cloud_tts
 from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO
@@ -264,8 +266,15 @@ def __init__(
             client_options = client_options_lib.ClientOptions()
 
         # Create SSL credentials for mutual TLS if needed.
-        use_client_cert = bool(
-            util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
+        if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
+            "true",
+            "false",
+        ):
+            raise ValueError(
+                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
+            )
+        use_client_cert = (
+            os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
         )
 
         client_cert_source_func = None

diff --git a/...loud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/transports/base.py b/...loud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/transports/base.py
@@ -18,10 +18,10 @@
 import pkg_resources
 
 import google.auth  # type: ignore
-import google.api_core  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+import google.api_core
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 

diff --git a/...loud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc.py b/...loud-texttospeech/google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc.py
@@ -16,8 +16,8 @@
 import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import grpc_helpers  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
+from google.api_core import grpc_helpers
+from google.api_core import gapic_v1
 import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore

diff --git a/...ttospeech/google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc_asyncio.py b/...ttospeech/google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc_asyncio.py
@@ -16,8 +16,8 @@
 import warnings
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import grpc_helpers_async  # type: ignore
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers_async
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 

diff --git a/packages/google-cloud-texttospeech/google/cloud/texttospeech_v1/types/cloud_tts.py b/packages/google-cloud-texttospeech/google/cloud/texttospeech_v1/types/cloud_tts.py
@@ -146,13 +146,15 @@ class SynthesisInput(proto.Message):
     Attributes:
         text (str):
             The raw text to be synthesized.
+
             This field is a member of `oneof`_ ``input_source``.
         ssml (str):
             The SSML document to be synthesized. The SSML document must
             be valid and well-formed. Otherwise the RPC will fail and
             return [google.rpc.Code.INVALID_ARGUMENT][]. For more
             information, see
             `SSML <https://cloud.google.com/text-to-speech/docs/ssml>`__.
+
             This field is a member of `oneof`_ ``input_source``.
     """
 

diff --git a/...ud-texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/async_client.py b/...ud-texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/async_client.py
@@ -19,14 +19,17 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-from google.api_core.client_options import ClientOptions  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+from google.api_core.client_options import ClientOptions
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-OptionalRetry = Union[retries.Retry, object]
+try:
+    OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError:  # pragma: NO COVER
+    OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
 from google.cloud.texttospeech_v1beta1.types import cloud_tts
 from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO

diff --git a/...le-cloud-texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/client.py b/...le-cloud-texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/client.py
@@ -14,23 +14,25 @@
 # limitations under the License.
 #
 from collections import OrderedDict
-from distutils import util
 import os
 import re
 from typing import Dict, Optional, Sequence, Tuple, Type, Union
 import pkg_resources
 
-from google.api_core import client_options as client_options_lib  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+from google.api_core import client_options as client_options_lib
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
-OptionalRetry = Union[retries.Retry, object]
+try:
+    OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
+except AttributeError:  # pragma: NO COVER
+    OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
 from google.cloud.texttospeech_v1beta1.types import cloud_tts
 from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO
@@ -264,8 +266,15 @@ def __init__(
             client_options = client_options_lib.ClientOptions()
 
         # Create SSL credentials for mutual TLS if needed.
-        use_client_cert = bool(
-            util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
+        if os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") not in (
+            "true",
+            "false",
+        ):
+            raise ValueError(
+                "Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
+            )
+        use_client_cert = (
+            os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") == "true"
         )
 
         client_cert_source_func = None

diff --git a/...texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/base.py b/...texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/base.py
@@ -18,10 +18,10 @@
 import pkg_resources
 
 import google.auth  # type: ignore
-import google.api_core  # type: ignore
-from google.api_core import exceptions as core_exceptions  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import retry as retries  # type: ignore
+import google.api_core
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 

diff --git a/...texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc.py b/...texttospeech/google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc.py
@@ -16,8 +16,8 @@
 import warnings
 from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import grpc_helpers  # type: ignore
-from google.api_core import gapic_v1  # type: ignore
+from google.api_core import grpc_helpers
+from google.api_core import gapic_v1
 import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore

diff --git a/...eech/google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc_asyncio.py b/...eech/google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc_asyncio.py
@@ -16,8 +16,8 @@
 import warnings
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import gapic_v1  # type: ignore
-from google.api_core import grpc_helpers_async  # type: ignore
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers_async
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
 

diff --git a/packages/google-cloud-texttospeech/google/cloud/texttospeech_v1beta1/types/cloud_tts.py b/packages/google-cloud-texttospeech/google/cloud/texttospeech_v1beta1/types/cloud_tts.py
@@ -164,13 +164,15 @@ class SynthesisInput(proto.Message):
     Attributes:
         text (str):
             The raw text to be synthesized.
+
             This field is a member of `oneof`_ ``input_source``.
         ssml (str):
             The SSML document to be synthesized. The SSML document must
             be valid and well-formed. Otherwise the RPC will fail and
             return [google.rpc.Code.INVALID_ARGUMENT][]. For more
             information, see
             `SSML <https://cloud.google.com/text-to-speech/docs/ssml>`__.
+
             This field is a member of `oneof`_ ``input_source``.
     """
 

diff --git a/packages/google-cloud-texttospeech/tests/unit/gapic/texttospeech_v1/test_text_to_speech.py b/packages/google-cloud-texttospeech/tests/unit/gapic/texttospeech_v1/test_text_to_speech.py
@@ -555,7 +555,9 @@ def test_list_voices_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].language_code == "language_code_value"
+        arg = args[0].language_code
+        mock_val = "language_code_value"
+        assert arg == mock_val
 
 
 def test_list_voices_flattened_error():
@@ -589,7 +591,9 @@ async def test_list_voices_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].language_code == "language_code_value"
+        arg = args[0].language_code
+        mock_val = "language_code_value"
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio
@@ -716,13 +720,17 @@ def test_synthesize_speech_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].input == cloud_tts.SynthesisInput(text="text_value")
-        assert args[0].voice == cloud_tts.VoiceSelectionParams(
-            language_code="language_code_value"
-        )
-        assert args[0].audio_config == cloud_tts.AudioConfig(
+        arg = args[0].input
+        mock_val = cloud_tts.SynthesisInput(text="text_value")
+        assert arg == mock_val
+        arg = args[0].voice
+        mock_val = cloud_tts.VoiceSelectionParams(language_code="language_code_value")
+        assert arg == mock_val
+        arg = args[0].audio_config
+        mock_val = cloud_tts.AudioConfig(
             audio_encoding=cloud_tts.AudioEncoding.LINEAR16
         )
+        assert arg == mock_val
 
 
 def test_synthesize_speech_flattened_error():
@@ -769,13 +777,17 @@ async def test_synthesize_speech_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].input == cloud_tts.SynthesisInput(text="text_value")
-        assert args[0].voice == cloud_tts.VoiceSelectionParams(
-            language_code="language_code_value"
-        )
-        assert args[0].audio_config == cloud_tts.AudioConfig(
+        arg = args[0].input
+        mock_val = cloud_tts.SynthesisInput(text="text_value")
+        assert arg == mock_val
+        arg = args[0].voice
+        mock_val = cloud_tts.VoiceSelectionParams(language_code="language_code_value")
+        assert arg == mock_val
+        arg = args[0].audio_config
+        mock_val = cloud_tts.AudioConfig(
             audio_encoding=cloud_tts.AudioEncoding.LINEAR16
         )
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio

diff --git a/...es/google-cloud-texttospeech/tests/unit/gapic/texttospeech_v1beta1/test_text_to_speech.py b/...es/google-cloud-texttospeech/tests/unit/gapic/texttospeech_v1beta1/test_text_to_speech.py
@@ -557,7 +557,9 @@ def test_list_voices_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].language_code == "language_code_value"
+        arg = args[0].language_code
+        mock_val = "language_code_value"
+        assert arg == mock_val
 
 
 def test_list_voices_flattened_error():
@@ -591,7 +593,9 @@ async def test_list_voices_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].language_code == "language_code_value"
+        arg = args[0].language_code
+        mock_val = "language_code_value"
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio
@@ -718,13 +722,17 @@ def test_synthesize_speech_flattened():
         # request object values.
         assert len(call.mock_calls) == 1
         _, args, _ = call.mock_calls[0]
-        assert args[0].input == cloud_tts.SynthesisInput(text="text_value")
-        assert args[0].voice == cloud_tts.VoiceSelectionParams(
-            language_code="language_code_value"
-        )
-        assert args[0].audio_config == cloud_tts.AudioConfig(
+        arg = args[0].input
+        mock_val = cloud_tts.SynthesisInput(text="text_value")
+        assert arg == mock_val
+        arg = args[0].voice
+        mock_val = cloud_tts.VoiceSelectionParams(language_code="language_code_value")
+        assert arg == mock_val
+        arg = args[0].audio_config
+        mock_val = cloud_tts.AudioConfig(
             audio_encoding=cloud_tts.AudioEncoding.LINEAR16
         )
+        assert arg == mock_val
 
 
 def test_synthesize_speech_flattened_error():
@@ -771,13 +779,17 @@ async def test_synthesize_speech_flattened_async():
         # request object values.
         assert len(call.mock_calls)
         _, args, _ = call.mock_calls[0]
-        assert args[0].input == cloud_tts.SynthesisInput(text="text_value")
-        assert args[0].voice == cloud_tts.VoiceSelectionParams(
-            language_code="language_code_value"
-        )
-        assert args[0].audio_config == cloud_tts.AudioConfig(
+        arg = args[0].input
+        mock_val = cloud_tts.SynthesisInput(text="text_value")
+        assert arg == mock_val
+        arg = args[0].voice
+        mock_val = cloud_tts.VoiceSelectionParams(language_code="language_code_value")
+        assert arg == mock_val
+        arg = args[0].audio_config
+        mock_val = cloud_tts.AudioConfig(
             audio_encoding=cloud_tts.AudioEncoding.LINEAR16
         )
+        assert arg == mock_val
 
 
 @pytest.mark.asyncio