chore: use gapic-generator-python 0.62.1 (#246)

- [ ] Regenerate this pull request now.

fix: resolve DuplicateCredentialArgs error when using credentials_file

committer: parthea
PiperOrigin-RevId: 425964861

Source-Link: googleapis/googleapis@84b1a5a

Source-Link: googleapis/googleapis-gen@4fb761b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9

google/cloud/texttospeech_v1/services/text_to_speech/async_client.py

@@ -237,7 +237,7 @@ async def list_voices(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([language_code])
  if request is not None and has_flattened_params:
@@ -319,7 +319,7 @@ async def synthesize_speech(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([input, voice, audio_config])
  if request is not None and has_flattened_params:

google/cloud/texttospeech_v1/services/text_to_speech/client.py

@@ -422,7 +422,7 @@ def list_voices(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([language_code])
  if request is not None and has_flattened_params:
@@ -504,7 +504,7 @@ def synthesize_speech(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([input, voice, audio_config])
  if request is not None and has_flattened_params:

google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc.py

@@ -158,8 +158,11 @@ def __init__(
  if not self._grpc_channel:
  self._grpc_channel = type(self).create_channel(
  self._host,
+ # use the credentials which are saved
  credentials=self._credentials,
- credentials_file=credentials_file,
+ # Set ``credentials_file`` to ``None`` here as
+ # the credentials that we saved earlier should be used.
+ credentials_file=None,
  scopes=self._scopes,
  ssl_credentials=self._ssl_channel_credentials,
  quota_project_id=quota_project_id,

google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc_asyncio.py

@@ -203,8 +203,11 @@ def __init__(
  if not self._grpc_channel:
  self._grpc_channel = type(self).create_channel(
  self._host,
+ # use the credentials which are saved
  credentials=self._credentials,
- credentials_file=credentials_file,
+ # Set ``credentials_file`` to ``None`` here as
+ # the credentials that we saved earlier should be used.
+ credentials_file=None,
  scopes=self._scopes,
  ssl_credentials=self._ssl_channel_credentials,
  quota_project_id=quota_project_id,

google/cloud/texttospeech_v1beta1/services/text_to_speech/async_client.py

@@ -239,7 +239,7 @@ async def list_voices(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([language_code])
  if request is not None and has_flattened_params:
@@ -321,7 +321,7 @@ async def synthesize_speech(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([input, voice, audio_config])
  if request is not None and has_flattened_params:

google/cloud/texttospeech_v1beta1/services/text_to_speech/client.py

@@ -438,7 +438,7 @@ def list_voices(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([language_code])
  if request is not None and has_flattened_params:
@@ -520,7 +520,7 @@ def synthesize_speech(
 
  """
  # Create or coerce a protobuf request object.
- # Sanity check: If we got a request object, we should *not* have
+ # Quick check: If we got a request object, we should *not* have
  # gotten any keyword arguments that map to the request.
  has_flattened_params = any([input, voice, audio_config])
  if request is not None and has_flattened_params:

google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc.py

@@ -158,8 +158,11 @@ def __init__(
  if not self._grpc_channel:
  self._grpc_channel = type(self).create_channel(
  self._host,
+ # use the credentials which are saved
  credentials=self._credentials,
- credentials_file=credentials_file,
+ # Set ``credentials_file`` to ``None`` here as
+ # the credentials that we saved earlier should be used.
+ credentials_file=None,
  scopes=self._scopes,
  ssl_credentials=self._ssl_channel_credentials,
  quota_project_id=quota_project_id,

google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc_asyncio.py

@@ -203,8 +203,11 @@ def __init__(
  if not self._grpc_channel:
  self._grpc_channel = type(self).create_channel(
  self._host,
+ # use the credentials which are saved
  credentials=self._credentials,
- credentials_file=credentials_file,
+ # Set ``credentials_file`` to ``None`` here as
+ # the credentials that we saved earlier should be used.
+ credentials_file=None,
  scopes=self._scopes,
  ssl_credentials=self._ssl_channel_credentials,
  quota_project_id=quota_project_id,

tests/unit/gapic/texttospeech_v1/test_text_to_speech.py

@@ -492,21 +492,28 @@ def test_text_to_speech_client_client_options_scopes(
 
 
 @pytest.mark.parametrize(
- "client_class,transport_class,transport_name",
+ "client_class,transport_class,transport_name,grpc_helpers",
  [
- (TextToSpeechClient, transports.TextToSpeechGrpcTransport, "grpc"),
+ (
+ TextToSpeechClient,
+ transports.TextToSpeechGrpcTransport,
+ "grpc",
+ grpc_helpers,
+ ),
  (
  TextToSpeechAsyncClient,
  transports.TextToSpeechGrpcAsyncIOTransport,
  "grpc_asyncio",
+ grpc_helpers_async,
  ),
  ],
 )
 def test_text_to_speech_client_client_options_credentials_file(
- client_class, transport_class, transport_name
+ client_class, transport_class, transport_name, grpc_helpers
 ):
  # Check the case credentials file is provided.
  options = client_options.ClientOptions(credentials_file="credentials.json")
+
  with mock.patch.object(transport_class, "__init__") as patched:
  patched.return_value = None
  client = client_class(client_options=options, transport=transport_name)
@@ -540,6 +547,72 @@ def test_text_to_speech_client_client_options_from_dict():
  )
 
 
+@pytest.mark.parametrize(
+ "client_class,transport_class,transport_name,grpc_helpers",
+ [
+ (
+ TextToSpeechClient,
+ transports.TextToSpeechGrpcTransport,
+ "grpc",
+ grpc_helpers,
+ ),
+ (
+ TextToSpeechAsyncClient,
+ transports.TextToSpeechGrpcAsyncIOTransport,
+ "grpc_asyncio",
+ grpc_helpers_async,
+ ),
+ ],
+)
+def test_text_to_speech_client_create_channel_credentials_file(
+ client_class, transport_class, transport_name, grpc_helpers
+):
+ # Check the case credentials file is provided.
+ options = client_options.ClientOptions(credentials_file="credentials.json")
+
+ with mock.patch.object(transport_class, "__init__") as patched:
+ patched.return_value = None
+ client = client_class(client_options=options, transport=transport_name)
+ patched.assert_called_once_with(
+ credentials=None,
+ credentials_file="credentials.json",
+ host=client.DEFAULT_ENDPOINT,
+ scopes=None,
+ client_cert_source_for_mtls=None,
+ quota_project_id=None,
+ client_info=transports.base.DEFAULT_CLIENT_INFO,
+ always_use_jwt_access=True,
+ )
+
+ # test that the credentials from file are saved and used as the credentials.
+ with mock.patch.object(
+ google.auth, "load_credentials_from_file", autospec=True
+ ) as load_creds, mock.patch.object(
+ google.auth, "default", autospec=True
+ ) as adc, mock.patch.object(
+ grpc_helpers, "create_channel"
+ ) as create_channel:
+ creds = ga_credentials.AnonymousCredentials()
+ file_creds = ga_credentials.AnonymousCredentials()
+ load_creds.return_value = (file_creds, None)
+ adc.return_value = (creds, None)
+ client = client_class(client_options=options, transport=transport_name)
+ create_channel.assert_called_with(
+ "texttospeech.googleapis.com:443",
+ credentials=file_creds,
+ credentials_file=None,
+ quota_project_id=None,
+ default_scopes=("https://www.googleapis.com/auth/cloud-platform",),
+ scopes=None,
+ default_host="texttospeech.googleapis.com",
+ ssl_credentials=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
+ )
+
+
 @pytest.mark.parametrize("request_type", [cloud_tts.ListVoicesRequest, dict,])
 def test_list_voices(request_type, transport: str = "grpc"):
  client = TextToSpeechClient(

tests/unit/gapic/texttospeech_v1beta1/test_text_to_speech.py

@@ -494,21 +494,28 @@ def test_text_to_speech_client_client_options_scopes(
 
 
 @pytest.mark.parametrize(
- "client_class,transport_class,transport_name",
+ "client_class,transport_class,transport_name,grpc_helpers",
  [
- (TextToSpeechClient, transports.TextToSpeechGrpcTransport, "grpc"),
+ (
+ TextToSpeechClient,
+ transports.TextToSpeechGrpcTransport,
+ "grpc",
+ grpc_helpers,
+ ),
  (
  TextToSpeechAsyncClient,
  transports.TextToSpeechGrpcAsyncIOTransport,
  "grpc_asyncio",
+ grpc_helpers_async,
  ),
  ],
 )
 def test_text_to_speech_client_client_options_credentials_file(
- client_class, transport_class, transport_name
+ client_class, transport_class, transport_name, grpc_helpers
 ):
  # Check the case credentials file is provided.
  options = client_options.ClientOptions(credentials_file="credentials.json")
+
  with mock.patch.object(transport_class, "__init__") as patched:
  patched.return_value = None
  client = client_class(client_options=options, transport=transport_name)
@@ -542,6 +549,72 @@ def test_text_to_speech_client_client_options_from_dict():
  )
 
 
+@pytest.mark.parametrize(
+ "client_class,transport_class,transport_name,grpc_helpers",
+ [
+ (
+ TextToSpeechClient,
+ transports.TextToSpeechGrpcTransport,
+ "grpc",
+ grpc_helpers,
+ ),
+ (
+ TextToSpeechAsyncClient,
+ transports.TextToSpeechGrpcAsyncIOTransport,
+ "grpc_asyncio",
+ grpc_helpers_async,
+ ),
+ ],
+)
+def test_text_to_speech_client_create_channel_credentials_file(
+ client_class, transport_class, transport_name, grpc_helpers
+):
+ # Check the case credentials file is provided.
+ options = client_options.ClientOptions(credentials_file="credentials.json")
+
+ with mock.patch.object(transport_class, "__init__") as patched:
+ patched.return_value = None
+ client = client_class(client_options=options, transport=transport_name)
+ patched.assert_called_once_with(
+ credentials=None,
+ credentials_file="credentials.json",
+ host=client.DEFAULT_ENDPOINT,
+ scopes=None,
+ client_cert_source_for_mtls=None,
+ quota_project_id=None,
+ client_info=transports.base.DEFAULT_CLIENT_INFO,
+ always_use_jwt_access=True,
+ )
+
+ # test that the credentials from file are saved and used as the credentials.
+ with mock.patch.object(
+ google.auth, "load_credentials_from_file", autospec=True
+ ) as load_creds, mock.patch.object(
+ google.auth, "default", autospec=True
+ ) as adc, mock.patch.object(
+ grpc_helpers, "create_channel"
+ ) as create_channel:
+ creds = ga_credentials.AnonymousCredentials()
+ file_creds = ga_credentials.AnonymousCredentials()
+ load_creds.return_value = (file_creds, None)
+ adc.return_value = (creds, None)
+ client = client_class(client_options=options, transport=transport_name)
+ create_channel.assert_called_with(
+ "texttospeech.googleapis.com:443",
+ credentials=file_creds,
+ credentials_file=None,
+ quota_project_id=None,
+ default_scopes=("https://www.googleapis.com/auth/cloud-platform",),
+ scopes=None,
+ default_host="texttospeech.googleapis.com",
+ ssl_credentials=None,
+ options=[
+ ("grpc.max_send_message_length", -1),
+ ("grpc.max_receive_message_length", -1),
+ ],
+ )
+
+
 @pytest.mark.parametrize("request_type", [cloud_tts.ListVoicesRequest, dict,])
 def test_list_voices(request_type, transport: str = "grpc"):
  client = TextToSpeechClient(