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

- [ ] 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/memcache_v1/services/cloud_memcache/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.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.memcache_v1.services.cloud_memcache import pagers
@@ -187,17 +189,17 @@ def __init__(
 
     async def list_instances(
         self,
-        request: cloud_memcache.ListInstancesRequest = None,
+        request: Union[cloud_memcache.ListInstancesRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListInstancesAsyncPager:
         r"""Lists Instances in a given location.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.ListInstancesRequest`):
+            request (Union[google.cloud.memcache_v1.types.ListInstancesRequest, dict]):
                 The request object. Request for
                 [ListInstances][google.cloud.memcache.v1.CloudMemcache.ListInstances].
             parent (:class:`str`):
@@ -269,17 +271,17 @@ async def list_instances(
 
     async def get_instance(
         self,
-        request: cloud_memcache.GetInstanceRequest = None,
+        request: Union[cloud_memcache.GetInstanceRequest, 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]] = (),
     ) -> cloud_memcache.Instance:
         r"""Gets details of a single Instance.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.GetInstanceRequest`):
+            request (Union[google.cloud.memcache_v1.types.GetInstanceRequest, dict]):
                 The request object. Request for
                 [GetInstance][google.cloud.memcache.v1.CloudMemcache.GetInstance].
             name (:class:`str`):
@@ -340,19 +342,19 @@ async def get_instance(
 
     async def create_instance(
         self,
-        request: cloud_memcache.CreateInstanceRequest = None,
+        request: Union[cloud_memcache.CreateInstanceRequest, dict] = None,
         *,
         parent: str = None,
         instance: cloud_memcache.Instance = None,
         instance_id: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Creates a new Instance in a given location.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.CreateInstanceRequest`):
+            request (Union[google.cloud.memcache_v1.types.CreateInstanceRequest, dict]):
                 The request object. Request for
                 [CreateInstance][google.cloud.memcache.v1.CloudMemcache.CreateInstance].
             parent (:class:`str`):
@@ -451,19 +453,19 @@ async def create_instance(
 
     async def update_instance(
         self,
-        request: cloud_memcache.UpdateInstanceRequest = None,
+        request: Union[cloud_memcache.UpdateInstanceRequest, dict] = None,
         *,
         instance: cloud_memcache.Instance = None,
         update_mask: field_mask_pb2.FieldMask = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Updates an existing Instance in a given project and
         location.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.UpdateInstanceRequest`):
+            request (Union[google.cloud.memcache_v1.types.UpdateInstanceRequest, dict]):
                 The request object. Request for
                 [UpdateInstance][google.cloud.memcache.v1.CloudMemcache.UpdateInstance].
             instance (:class:`google.cloud.memcache_v1.types.Instance`):
@@ -546,12 +548,12 @@ async def update_instance(
 
     async def update_parameters(
         self,
-        request: cloud_memcache.UpdateParametersRequest = None,
+        request: Union[cloud_memcache.UpdateParametersRequest, dict] = None,
         *,
         name: str = None,
         update_mask: field_mask_pb2.FieldMask = None,
         parameters: cloud_memcache.MemcacheParameters = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
@@ -561,7 +563,7 @@ async def update_parameters(
         apply the parameters to nodes of the Memcached Instance.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.UpdateParametersRequest`):
+            request (Union[google.cloud.memcache_v1.types.UpdateParametersRequest, dict]):
                 The request object. Request for
                 [UpdateParameters][google.cloud.memcache.v1.CloudMemcache.UpdateParameters].
             name (:class:`str`):
@@ -649,17 +651,17 @@ async def update_parameters(
 
     async def delete_instance(
         self,
-        request: cloud_memcache.DeleteInstanceRequest = None,
+        request: Union[cloud_memcache.DeleteInstanceRequest, 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]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Deletes a single Instance.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.DeleteInstanceRequest`):
+            request (Union[google.cloud.memcache_v1.types.DeleteInstanceRequest, dict]):
                 The request object. Request for
                 [DeleteInstance][google.cloud.memcache.v1.CloudMemcache.DeleteInstance].
             name (:class:`str`):
@@ -743,12 +745,12 @@ async def delete_instance(
 
     async def apply_parameters(
         self,
-        request: cloud_memcache.ApplyParametersRequest = None,
+        request: Union[cloud_memcache.ApplyParametersRequest, dict] = None,
         *,
         name: str = None,
         node_ids: Sequence[str] = None,
         apply_all: bool = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
@@ -757,7 +759,7 @@ async def apply_parameters(
         parameters for the Memcached Instance.
 
         Args:
-            request (:class:`google.cloud.memcache_v1.types.ApplyParametersRequest`):
+            request (Union[google.cloud.memcache_v1.types.ApplyParametersRequest, dict]):
                 The request object. Request for
                 [ApplyParameters][google.cloud.memcache.v1.CloudMemcache.ApplyParameters].
             name (:class:`str`):

google/cloud/memcache_v1/services/cloud_memcache/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.api_core import operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.memcache_v1.services.cloud_memcache import pagers
@@ -374,7 +376,7 @@ def list_instances(
         request: Union[cloud_memcache.ListInstancesRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListInstancesPager:
@@ -456,7 +458,7 @@ def get_instance(
         request: Union[cloud_memcache.GetInstanceRequest, 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]] = (),
     ) -> cloud_memcache.Instance:
@@ -529,7 +531,7 @@ def create_instance(
         parent: str = None,
         instance: cloud_memcache.Instance = None,
         instance_id: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -639,7 +641,7 @@ def update_instance(
         *,
         instance: cloud_memcache.Instance = None,
         update_mask: field_mask_pb2.FieldMask = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -735,7 +737,7 @@ def update_parameters(
         name: str = None,
         update_mask: field_mask_pb2.FieldMask = None,
         parameters: cloud_memcache.MemcacheParameters = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
@@ -836,7 +838,7 @@ def delete_instance(
         request: Union[cloud_memcache.DeleteInstanceRequest, 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]] = (),
     ) -> operation.Operation:
@@ -932,7 +934,7 @@ def apply_parameters(
         name: str = None,
         node_ids: Sequence[str] = None,
         apply_all: bool = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:

google/cloud/memcache_v1/services/cloud_memcache/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
@@ -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 CloudMemcacheTransport(abc.ABC):
     """Abstract transport class for CloudMemcache."""
@@ -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
@@ -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 = {
@@ -187,7 +154,7 @@ def close(self):
         raise NotImplementedError()
 
     @property
-    def operations_client(self) -> operations_v1.OperationsClient:
+    def operations_client(self):
         """Return the client designed to process long-running operations."""
         raise NotImplementedError()
 

google/cloud/memcache_v1/services/cloud_memcache/transports/grpc.py

@@ -130,7 +130,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

google/cloud/memcache_v1/services/cloud_memcache/transports/grpc_asyncio.py

@@ -21,7 +21,6 @@
 from google.api_core import operations_v1  # 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
@@ -177,7 +176,7 @@ def __init__(
         self._grpc_channel = None
         self._ssl_channel_credentials = ssl_channel_credentials
         self._stubs: Dict[str, Callable] = {}
-        self._operations_client = None
+        self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
 
         if api_mtls_endpoint:
             warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)