Skip to content
This repository has been archived by the owner on Nov 29, 2023. It is now read-only.

Commit

Permalink
chore: use gapic-generator-python 0.53.4 (#209)
Browse files Browse the repository at this point in the history 
- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: googleapis/googleapis-gen@2ff001f
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] committed Nov 1, 2021
1 parent 448a33d commit 99ac70b
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 257 deletions.
16 changes: 9 additions & 7 deletions google/cloud/texttospeech_v1/services/text_to_speech/async_client.py
View file
Expand Up @@ -19,13 +19,15 @@
from typing import Dict, Sequence, Tuple, Type, Union
import pkg_resources

import google.api_core.client_options as ClientOptions # type: ignore
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.auth import credentials as ga_credentials # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.texttospeech_v1.types import cloud_tts
from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO
from .transports.grpc_asyncio import TextToSpeechGrpcAsyncIOTransport
Expand Down Expand Up @@ -156,17 +158,17 @@ def __init__(

async def list_voices(
self,
request: cloud_tts.ListVoicesRequest = None,
request: Union[cloud_tts.ListVoicesRequest, dict] = None,
*,
language_code: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.ListVoicesResponse:
r"""Returns a list of Voice supported for synthesis.
Args:
request (:class:`google.cloud.texttospeech_v1.types.ListVoicesRequest`):
request (Union[google.cloud.texttospeech_v1.types.ListVoicesRequest, dict]):
The request object. The top-level message sent by the
client for the `ListVoices` method.
language_code (:class:`str`):
Expand Down Expand Up @@ -239,20 +241,20 @@ async def list_voices(

async def synthesize_speech(
self,
request: cloud_tts.SynthesizeSpeechRequest = None,
request: Union[cloud_tts.SynthesizeSpeechRequest, dict] = None,
*,
input: cloud_tts.SynthesisInput = None,
voice: cloud_tts.VoiceSelectionParams = None,
audio_config: cloud_tts.AudioConfig = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.SynthesizeSpeechResponse:
r"""Synthesizes speech synchronously: receive results
after all text input has been processed.
Args:
request (:class:`google.cloud.texttospeech_v1.types.SynthesizeSpeechRequest`):
request (Union[google.cloud.texttospeech_v1.types.SynthesizeSpeechRequest, dict]):
The request object. The top-level message sent by the
client for the `SynthesizeSpeech` method.
input (:class:`google.cloud.texttospeech_v1.types.SynthesisInput`):
Expand Down
6 changes: 4 additions & 2 deletions google/cloud/texttospeech_v1/services/text_to_speech/client.py
View file
Expand Up @@ -30,6 +30,8 @@
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.texttospeech_v1.types import cloud_tts
from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO
from .transports.grpc import TextToSpeechGrpcTransport
Expand Down Expand Up @@ -333,7 +335,7 @@ def list_voices(
request: Union[cloud_tts.ListVoicesRequest, dict] = None,
*,
language_code: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.ListVoicesResponse:
Expand Down Expand Up @@ -408,7 +410,7 @@ def synthesize_speech(
input: cloud_tts.SynthesisInput = None,
voice: cloud_tts.VoiceSelectionParams = None,
audio_config: cloud_tts.AudioConfig = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.SynthesizeSpeechResponse:
Expand Down
35 changes: 1 addition & 34 deletions google/cloud/texttospeech_v1/services/text_to_speech/transports/base.py
View file
Expand Up @@ -15,7 +15,6 @@
#
import abc
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
import packaging.version
import pkg_resources

import google.auth # type: ignore
Expand All @@ -37,15 +36,6 @@
except pkg_resources.DistributionNotFound:
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()

try:
# google.auth.__version__ was added in 1.26.0
_GOOGLE_AUTH_VERSION = google.auth.__version__
except AttributeError:
try: # try pkg_resources if it is available
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
except pkg_resources.DistributionNotFound: # pragma: NO COVER
_GOOGLE_AUTH_VERSION = None


class TextToSpeechTransport(abc.ABC):
"""Abstract transport class for TextToSpeech."""
Expand Down Expand Up @@ -95,7 +85,7 @@ def __init__(
host += ":443"
self._host = host

scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}

# Save the scopes.
self._scopes = scopes
Expand Down Expand Up @@ -128,29 +118,6 @@ def __init__(
# Save the credentials.
self._credentials = credentials

# TODO(busunkim): This method is in the base transport
# to avoid duplicating code across the transport classes. These functions
# should be deleted once the minimum required versions of google-auth is increased.

# TODO: Remove this function once google-auth >= 1.25.0 is required
@classmethod
def _get_scopes_kwargs(
cls, host: str, scopes: Optional[Sequence[str]]
) -> Dict[str, Optional[Sequence[str]]]:
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""

scopes_kwargs = {}

if _GOOGLE_AUTH_VERSION and (
packaging.version.parse(_GOOGLE_AUTH_VERSION)
>= packaging.version.parse("1.25.0")
):
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
else:
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}

return scopes_kwargs

def _prep_wrapped_messages(self, client_info):
# Precompute the wrapped methods.
self._wrapped_methods = {
Expand Down
1 change: 0 additions & 1 deletion google/cloud/texttospeech_v1/services/text_to_speech/transports/grpc_asyncio.py
View file
Expand Up @@ -20,7 +20,6 @@
from google.api_core import grpc_helpers_async # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
import packaging.version

import grpc # type: ignore
from grpc.experimental import aio # type: ignore
Expand Down
9 changes: 9 additions & 0 deletions google/cloud/texttospeech_v1/types/cloud_tts.py
View file
Expand Up @@ -136,15 +136,24 @@ class SynthesisInput(proto.Message):
[google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to
5000 characters.
This message has `oneof`_ fields (mutually exclusive fields).
For each oneof, at most one member field can be set at the same time.
Setting any member of the oneof automatically clears all other
members.
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
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``.
"""

text = proto.Field(proto.STRING, number=1, oneof="input_source",)
Expand Down
16 changes: 9 additions & 7 deletions google/cloud/texttospeech_v1beta1/services/text_to_speech/async_client.py
View file
Expand Up @@ -19,13 +19,15 @@
from typing import Dict, Sequence, Tuple, Type, Union
import pkg_resources

import google.api_core.client_options as ClientOptions # type: ignore
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.auth import credentials as ga_credentials # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.texttospeech_v1beta1.types import cloud_tts
from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO
from .transports.grpc_asyncio import TextToSpeechGrpcAsyncIOTransport
Expand Down Expand Up @@ -156,17 +158,17 @@ def __init__(

async def list_voices(
self,
request: cloud_tts.ListVoicesRequest = None,
request: Union[cloud_tts.ListVoicesRequest, dict] = None,
*,
language_code: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.ListVoicesResponse:
r"""Returns a list of Voice supported for synthesis.
Args:
request (:class:`google.cloud.texttospeech_v1beta1.types.ListVoicesRequest`):
request (Union[google.cloud.texttospeech_v1beta1.types.ListVoicesRequest, dict]):
The request object. The top-level message sent by the
client for the `ListVoices` method.
language_code (:class:`str`):
Expand Down Expand Up @@ -230,20 +232,20 @@ async def list_voices(

async def synthesize_speech(
self,
request: cloud_tts.SynthesizeSpeechRequest = None,
request: Union[cloud_tts.SynthesizeSpeechRequest, dict] = None,
*,
input: cloud_tts.SynthesisInput = None,
voice: cloud_tts.VoiceSelectionParams = None,
audio_config: cloud_tts.AudioConfig = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.SynthesizeSpeechResponse:
r"""Synthesizes speech synchronously: receive results
after all text input has been processed.
Args:
request (:class:`google.cloud.texttospeech_v1beta1.types.SynthesizeSpeechRequest`):
request (Union[google.cloud.texttospeech_v1beta1.types.SynthesizeSpeechRequest, dict]):
The request object. The top-level message sent by the
client for the `SynthesizeSpeech` method.
input (:class:`google.cloud.texttospeech_v1beta1.types.SynthesisInput`):
Expand Down
6 changes: 4 additions & 2 deletions google/cloud/texttospeech_v1beta1/services/text_to_speech/client.py
View file
Expand Up @@ -30,6 +30,8 @@
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.oauth2 import service_account # type: ignore

OptionalRetry = Union[retries.Retry, object]

from google.cloud.texttospeech_v1beta1.types import cloud_tts
from .transports.base import TextToSpeechTransport, DEFAULT_CLIENT_INFO
from .transports.grpc import TextToSpeechGrpcTransport
Expand Down Expand Up @@ -333,7 +335,7 @@ def list_voices(
request: Union[cloud_tts.ListVoicesRequest, dict] = None,
*,
language_code: str = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.ListVoicesResponse:
Expand Down Expand Up @@ -409,7 +411,7 @@ def synthesize_speech(
input: cloud_tts.SynthesisInput = None,
voice: cloud_tts.VoiceSelectionParams = None,
audio_config: cloud_tts.AudioConfig = None,
retry: retries.Retry = gapic_v1.method.DEFAULT,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> cloud_tts.SynthesizeSpeechResponse:
Expand Down
35 changes: 1 addition & 34 deletions google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/base.py
View file
Expand Up @@ -15,7 +15,6 @@
#
import abc
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
import packaging.version
import pkg_resources

import google.auth # type: ignore
Expand All @@ -37,15 +36,6 @@
except pkg_resources.DistributionNotFound:
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()

try:
# google.auth.__version__ was added in 1.26.0
_GOOGLE_AUTH_VERSION = google.auth.__version__
except AttributeError:
try: # try pkg_resources if it is available
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
except pkg_resources.DistributionNotFound: # pragma: NO COVER
_GOOGLE_AUTH_VERSION = None


class TextToSpeechTransport(abc.ABC):
"""Abstract transport class for TextToSpeech."""
Expand Down Expand Up @@ -95,7 +85,7 @@ def __init__(
host += ":443"
self._host = host

scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}

# Save the scopes.
self._scopes = scopes
Expand Down Expand Up @@ -128,29 +118,6 @@ def __init__(
# Save the credentials.
self._credentials = credentials

# TODO(busunkim): This method is in the base transport
# to avoid duplicating code across the transport classes. These functions
# should be deleted once the minimum required versions of google-auth is increased.

# TODO: Remove this function once google-auth >= 1.25.0 is required
@classmethod
def _get_scopes_kwargs(
cls, host: str, scopes: Optional[Sequence[str]]
) -> Dict[str, Optional[Sequence[str]]]:
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""

scopes_kwargs = {}

if _GOOGLE_AUTH_VERSION and (
packaging.version.parse(_GOOGLE_AUTH_VERSION)
>= packaging.version.parse("1.25.0")
):
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
else:
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}

return scopes_kwargs

def _prep_wrapped_messages(self, client_info):
# Precompute the wrapped methods.
self._wrapped_methods = {
Expand Down
1 change: 0 additions & 1 deletion google/cloud/texttospeech_v1beta1/services/text_to_speech/transports/grpc_asyncio.py
View file
Expand Up @@ -20,7 +20,6 @@
from google.api_core import grpc_helpers_async # type: ignore
from google.auth import credentials as ga_credentials # type: ignore
from google.auth.transport.grpc import SslCredentials # type: ignore
import packaging.version

import grpc # type: ignore
from grpc.experimental import aio # type: ignore
Expand Down
9 changes: 9 additions & 0 deletions google/cloud/texttospeech_v1beta1/types/cloud_tts.py
View file
Expand Up @@ -154,15 +154,24 @@ class SynthesisInput(proto.Message):
[google.rpc.Code.INVALID_ARGUMENT][]. The input size is limited to
5000 characters.
This message has `oneof`_ fields (mutually exclusive fields).
For each oneof, at most one member field can be set at the same time.
Setting any member of the oneof automatically clears all other
members.
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
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``.
"""

text = proto.Field(proto.STRING, number=1, oneof="input_source",)
Expand Down
3 changes: 1 addition & 2 deletions setup.py
View file
Expand Up @@ -45,9 +45,8 @@
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
# Until this issue is closed
# https://github.com/googleapis/google-cloud-python/issues/10566
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
"proto-plus >= 1.4.0",
"packaging >= 14.3",
]
extras = {}

Expand Down
4 changes: 1 addition & 3 deletions testing/constraints-3.6.txt
View file
Expand Up @@ -5,7 +5,5 @@
#
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
# Then this file should have foo==1.14.0
google-api-core==1.26.0
google-api-core==1.28.0
proto-plus==1.4.0
packaging==14.3
google-auth==1.24.0 # TODO: remove when google-auth>=1.25.0 is transitively required through google-api-core

0 comments on commit 99ac70b

Please sign in to comment.