Pick up fixes to GAPIC generator. (#6510)

packages/google-cloud-texttospeech/google/cloud/texttospeech_v1/gapic/text_to_speech_client.py

@@ -70,7 +70,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=text_to_speech_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -103,13 +103,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = text_to_speech_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

packages/google-cloud-texttospeech/google/cloud/texttospeech_v1/gapic/transports/text_to_speech_grpc_transport.py

@@ -62,6 +62,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -92,6 +94,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def list_voices(self):
         """Return the gRPC stub for {$apiMethod.name}.

packages/google-cloud-texttospeech/google/cloud/texttospeech_v1beta1/gapic/text_to_speech_client.py

@@ -70,7 +70,7 @@ def __init__(self,
                  transport=None,
                  channel=None,
                  credentials=None,
-                 client_config=text_to_speech_client_config.config,
+                 client_config=None,
                  client_info=None):
         """Constructor.
 
@@ -103,13 +103,20 @@ def __init__(self,
                 your own client library.
         """
         # Raise deprecation warnings for things we want to go away.
-        if client_config:
-            warnings.warn('The `client_config` argument is deprecated.',
-                          PendingDeprecationWarning)
+        if client_config is not None:
+            warnings.warn(
+                'The `client_config` argument is deprecated.',
+                PendingDeprecationWarning,
+                stacklevel=2)
+        else:
+            client_config = text_to_speech_client_config.config
+
         if channel:
             warnings.warn(
                 'The `channel` argument is deprecated; use '
-                '`transport` instead.', PendingDeprecationWarning)
+                '`transport` instead.',
+                PendingDeprecationWarning,
+                stacklevel=2)
 
         # Instantiate the transport.
         # The transport is responsible for handling serialization and

packages/google-cloud-texttospeech/google/cloud/texttospeech_v1beta1/gapic/transports/text_to_speech_grpc_transport.py

@@ -62,6 +62,8 @@ def __init__(self,
                 credentials=credentials,
             )
 
+        self._channel = channel
+
         # gRPC uses objects called "stubs" that are bound to the
         # channel and provide a basic method for each RPC.
         self._stubs = {
@@ -92,6 +94,15 @@ def create_channel(cls,
             scopes=cls._OAUTH_SCOPES,
         )
 
+    @property
+    def channel(self):
+        """The gRPC channel used by the transport.
+
+        Returns:
+            grpc.Channel: A gRPC channel object.
+        """
+        return self._channel
+
     @property
     def list_voices(self):
         """Return the gRPC stub for {$apiMethod.name}.

packages/google-cloud-texttospeech/tests/unit/gapic/v1/test_text_to_speech_client_v1.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 """Unit tests."""
 
+import mock
 import pytest
 
 from google.cloud import texttospeech_v1
@@ -69,7 +70,10 @@ def test_list_voices(self):
 
         # Mock the API response
         channel = ChannelStub(responses=[expected_response])
-        client = texttospeech_v1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1.TextToSpeechClient()
 
         response = client.list_voices()
         assert expected_response == response
@@ -82,7 +86,10 @@ def test_list_voices(self):
     def test_list_voices_exception(self):
         # Mock the API response
         channel = ChannelStub(responses=[CustomException()])
-        client = texttospeech_v1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1.TextToSpeechClient()
 
         with pytest.raises(CustomException):
             client.list_voices()
@@ -96,7 +103,10 @@ def test_synthesize_speech(self):
 
         # Mock the API response
         channel = ChannelStub(responses=[expected_response])
-        client = texttospeech_v1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1.TextToSpeechClient()
 
         # Setup Request
         input_ = {}
@@ -115,7 +125,10 @@ def test_synthesize_speech(self):
     def test_synthesize_speech_exception(self):
         # Mock the API response
         channel = ChannelStub(responses=[CustomException()])
-        client = texttospeech_v1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1.TextToSpeechClient()
 
         # Setup request
         input_ = {}

packages/google-cloud-texttospeech/tests/unit/gapic/v1beta1/test_text_to_speech_client_v1beta1.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 """Unit tests."""
 
+import mock
 import pytest
 
 from google.cloud import texttospeech_v1beta1
@@ -69,7 +70,10 @@ def test_list_voices(self):
 
         # Mock the API response
         channel = ChannelStub(responses=[expected_response])
-        client = texttospeech_v1beta1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1beta1.TextToSpeechClient()
 
         response = client.list_voices()
         assert expected_response == response
@@ -82,7 +86,10 @@ def test_list_voices(self):
     def test_list_voices_exception(self):
         # Mock the API response
         channel = ChannelStub(responses=[CustomException()])
-        client = texttospeech_v1beta1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1beta1.TextToSpeechClient()
 
         with pytest.raises(CustomException):
             client.list_voices()
@@ -96,7 +103,10 @@ def test_synthesize_speech(self):
 
         # Mock the API response
         channel = ChannelStub(responses=[expected_response])
-        client = texttospeech_v1beta1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1beta1.TextToSpeechClient()
 
         # Setup Request
         input_ = {}
@@ -115,7 +125,10 @@ def test_synthesize_speech(self):
     def test_synthesize_speech_exception(self):
         # Mock the API response
         channel = ChannelStub(responses=[CustomException()])
-        client = texttospeech_v1beta1.TextToSpeechClient(channel=channel)
+        patch = mock.patch('google.api_core.grpc_helpers.create_channel')
+        with patch as create_channel:
+            create_channel.return_value = channel
+            client = texttospeech_v1beta1.TextToSpeechClient()
 
         # Setup request
         input_ = {}