chore: use gapic-generator-python 0.53.4 (#143)

- [ ] 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

google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/async_client.py

@@ -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.recaptchaenterprise_v1.services.recaptcha_enterprise_service import (
     pagers,
 )
@@ -181,19 +183,19 @@ def __init__(
 
     async def create_assessment(
         self,
-        request: recaptchaenterprise.CreateAssessmentRequest = None,
+        request: Union[recaptchaenterprise.CreateAssessmentRequest, dict] = None,
         *,
         parent: str = None,
         assessment: recaptchaenterprise.Assessment = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Assessment:
         r"""Creates an Assessment of the likelihood an event is
         legitimate.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.CreateAssessmentRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.CreateAssessmentRequest, dict]):
                 The request object. The create assessment request
                 message.
             parent (:class:`str`):
@@ -260,11 +262,11 @@ async def create_assessment(
 
     async def annotate_assessment(
         self,
-        request: recaptchaenterprise.AnnotateAssessmentRequest = None,
+        request: Union[recaptchaenterprise.AnnotateAssessmentRequest, dict] = None,
         *,
         name: str = None,
         annotation: recaptchaenterprise.AnnotateAssessmentRequest.Annotation = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.AnnotateAssessmentResponse:
@@ -273,7 +275,7 @@ async def annotate_assessment(
         to be authentic or fraudulent.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.AnnotateAssessmentRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.AnnotateAssessmentRequest, dict]):
                 The request object. The request message to annotate an
                 Assessment.
             name (:class:`str`):
@@ -347,16 +349,16 @@ async def annotate_assessment(
 
     async def create_key(
         self,
-        request: recaptchaenterprise.CreateKeyRequest = None,
+        request: Union[recaptchaenterprise.CreateKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
         r"""Creates a new reCAPTCHA Enterprise key.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.CreateKeyRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.CreateKeyRequest, dict]):
                 The request object. The create key request message.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -396,17 +398,17 @@ async def create_key(
 
     async def list_keys(
         self,
-        request: recaptchaenterprise.ListKeysRequest = None,
+        request: Union[recaptchaenterprise.ListKeysRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListKeysAsyncPager:
         r"""Returns the list of all keys that belong to a
         project.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.ListKeysRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.ListKeysRequest, dict]):
                 The request object. The list keys request message.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -454,16 +456,16 @@ async def list_keys(
 
     async def get_key(
         self,
-        request: recaptchaenterprise.GetKeyRequest = None,
+        request: Union[recaptchaenterprise.GetKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
         r"""Returns the specified key.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.GetKeyRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.GetKeyRequest, dict]):
                 The request object. The get key request message.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -503,16 +505,16 @@ async def get_key(
 
     async def update_key(
         self,
-        request: recaptchaenterprise.UpdateKeyRequest = None,
+        request: Union[recaptchaenterprise.UpdateKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
         r"""Updates the specified key.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.UpdateKeyRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.UpdateKeyRequest, dict]):
                 The request object. The update key request message.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -552,16 +554,16 @@ async def update_key(
 
     async def delete_key(
         self,
-        request: recaptchaenterprise.DeleteKeyRequest = None,
+        request: Union[recaptchaenterprise.DeleteKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
         r"""Deletes the specified key.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.DeleteKeyRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.DeleteKeyRequest, dict]):
                 The request object. The delete key request message.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -593,9 +595,9 @@ async def delete_key(
 
     async def migrate_key(
         self,
-        request: recaptchaenterprise.MigrateKeyRequest = None,
+        request: Union[recaptchaenterprise.MigrateKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
@@ -608,7 +610,7 @@ async def migrate_key(
         role in the destination project.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.MigrateKeyRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.MigrateKeyRequest, dict]):
                 The request object. The migrate key request message.
             retry (google.api_core.retry.Retry): Designation of what errors, if any,
                 should be retried.
@@ -648,18 +650,18 @@ async def migrate_key(
 
     async def get_metrics(
         self,
-        request: recaptchaenterprise.GetMetricsRequest = None,
+        request: Union[recaptchaenterprise.GetMetricsRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Metrics:
         r"""Get some aggregated metrics for a Key. This data can
         be used to build dashboards.
 
         Args:
-            request (:class:`google.cloud.recaptchaenterprise_v1.types.GetMetricsRequest`):
+            request (Union[google.cloud.recaptchaenterprise_v1.types.GetMetricsRequest, dict]):
                 The request object. The get metrics request message.
             name (:class:`str`):
                 Required. The name of the requested

google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/client.py

@@ -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.recaptchaenterprise_v1.services.recaptcha_enterprise_service import (
     pagers,
 )
@@ -379,7 +381,7 @@ def create_assessment(
         *,
         parent: str = None,
         assessment: recaptchaenterprise.Assessment = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Assessment:
@@ -458,7 +460,7 @@ def annotate_assessment(
         *,
         name: str = None,
         annotation: recaptchaenterprise.AnnotateAssessmentRequest.Annotation = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.AnnotateAssessmentResponse:
@@ -543,7 +545,7 @@ def create_key(
         self,
         request: Union[recaptchaenterprise.CreateKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
@@ -593,7 +595,7 @@ def list_keys(
         self,
         request: Union[recaptchaenterprise.ListKeysRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListKeysPager:
@@ -652,7 +654,7 @@ def get_key(
         self,
         request: Union[recaptchaenterprise.GetKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
@@ -702,7 +704,7 @@ def update_key(
         self,
         request: Union[recaptchaenterprise.UpdateKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
@@ -752,7 +754,7 @@ def delete_key(
         self,
         request: Union[recaptchaenterprise.DeleteKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> None:
@@ -794,7 +796,7 @@ def migrate_key(
         self,
         request: Union[recaptchaenterprise.MigrateKeyRequest, dict] = None,
         *,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Key:
@@ -851,7 +853,7 @@ def get_metrics(
         request: Union[recaptchaenterprise.GetMetricsRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recaptchaenterprise.Metrics:

google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/base.py

@@ -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
@@ -38,15 +37,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 RecaptchaEnterpriseServiceTransport(abc.ABC):
     """Abstract transport class for RecaptchaEnterpriseService."""
@@ -96,7 +86,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
@@ -129,29 +119,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 = {

google/cloud/recaptchaenterprise_v1/services/recaptcha_enterprise_service/transports/grpc_asyncio.py

@@ -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

google/cloud/recaptchaenterprise_v1/types/recaptchaenterprise.py

@@ -399,6 +399,13 @@ class Key(proto.Message):
     r"""A key used to identify and configure applications (web and/or
     mobile) that use reCAPTCHA Enterprise.
 
+    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:
         name (str):
             The resource name for the Key in the format
@@ -409,12 +416,15 @@ class Key(proto.Message):
         web_settings (google.cloud.recaptchaenterprise_v1.types.WebKeySettings):
             Settings for keys that can be used by
             websites.
+            This field is a member of `oneof`_ ``platform_settings``.
         android_settings (google.cloud.recaptchaenterprise_v1.types.AndroidKeySettings):
             Settings for keys that can be used by Android
             apps.
+            This field is a member of `oneof`_ ``platform_settings``.
         ios_settings (google.cloud.recaptchaenterprise_v1.types.IOSKeySettings):
             Settings for keys that can be used by iOS
             apps.
+            This field is a member of `oneof`_ ``platform_settings``.
         labels (Sequence[google.cloud.recaptchaenterprise_v1.types.Key.LabelsEntry]):
             See <a
             href="https://cloud.google.com/recaptcha-