chore: use gapic-generator-python 0.53.4 (pylint-dev#486)

- [ ] 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: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9

google/cloud/firestore_admin_v1/services/firestore_admin/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 as gac_operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
@@ -181,11 +183,11 @@ def __init__(
 
     async def create_index(
         self,
-        request: firestore_admin.CreateIndexRequest = None,
+        request: Union[firestore_admin.CreateIndexRequest, dict] = None,
         *,
         parent: str = None,
         index: gfa_index.Index = 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:
@@ -196,7 +198,7 @@ async def create_index(
         [IndexOperationMetadata][google.firestore.admin.v1.IndexOperationMetadata].
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.CreateIndexRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.CreateIndexRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.CreateIndex][google.firestore.admin.v1.FirestoreAdmin.CreateIndex].
             parent (:class:`str`):
@@ -276,17 +278,17 @@ async def create_index(
 
     async def list_indexes(
         self,
-        request: firestore_admin.ListIndexesRequest = None,
+        request: Union[firestore_admin.ListIndexesRequest, 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.ListIndexesAsyncPager:
         r"""Lists composite indexes.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.ListIndexesRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.ListIndexesRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.ListIndexes][google.firestore.admin.v1.FirestoreAdmin.ListIndexes].
             parent (:class:`str`):
@@ -367,17 +369,17 @@ async def list_indexes(
 
     async def get_index(
         self,
-        request: firestore_admin.GetIndexRequest = None,
+        request: Union[firestore_admin.GetIndexRequest, 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]] = (),
     ) -> index.Index:
         r"""Gets a composite index.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.GetIndexRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.GetIndexRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.GetIndex][google.firestore.admin.v1.FirestoreAdmin.GetIndex].
             name (:class:`str`):
@@ -450,17 +452,17 @@ async def get_index(
 
     async def delete_index(
         self,
-        request: firestore_admin.DeleteIndexRequest = None,
+        request: Union[firestore_admin.DeleteIndexRequest, 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]] = (),
     ) -> None:
         r"""Deletes a composite index.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.DeleteIndexRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.DeleteIndexRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.DeleteIndex][google.firestore.admin.v1.FirestoreAdmin.DeleteIndex].
             name (:class:`str`):
@@ -525,17 +527,17 @@ async def delete_index(
 
     async def get_field(
         self,
-        request: firestore_admin.GetFieldRequest = None,
+        request: Union[firestore_admin.GetFieldRequest, 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]] = (),
     ) -> field.Field:
         r"""Gets the metadata and configuration for a Field.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.GetFieldRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.GetFieldRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.GetField][google.firestore.admin.v1.FirestoreAdmin.GetField].
             name (:class:`str`):
@@ -610,10 +612,10 @@ async def get_field(
 
     async def update_field(
         self,
-        request: firestore_admin.UpdateFieldRequest = None,
+        request: Union[firestore_admin.UpdateFieldRequest, dict] = None,
         *,
         field: gfa_field.Field = 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:
@@ -635,7 +637,7 @@ async def update_field(
         ``projects/{project_id}/databases/{database_id}/collectionGroups/__default__/fields/*``.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.UpdateFieldRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.UpdateFieldRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.UpdateField][google.firestore.admin.v1.FirestoreAdmin.UpdateField].
             field (:class:`google.cloud.firestore_admin_v1.types.Field`):
@@ -711,10 +713,10 @@ async def update_field(
 
     async def list_fields(
         self,
-        request: firestore_admin.ListFieldsRequest = None,
+        request: Union[firestore_admin.ListFieldsRequest, 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.ListFieldsAsyncPager:
@@ -728,7 +730,7 @@ async def list_fields(
         with the filter set to ``indexConfig.usesAncestorConfig:false``.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.ListFieldsRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.ListFieldsRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.ListFields][google.firestore.admin.v1.FirestoreAdmin.ListFields].
             parent (:class:`str`):
@@ -809,10 +811,10 @@ async def list_fields(
 
     async def export_documents(
         self,
-        request: firestore_admin.ExportDocumentsRequest = None,
+        request: Union[firestore_admin.ExportDocumentsRequest, 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:
@@ -828,7 +830,7 @@ async def export_documents(
         Google Cloud Storage.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.ExportDocumentsRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.ExportDocumentsRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.ExportDocuments][google.firestore.admin.v1.FirestoreAdmin.ExportDocuments].
             name (:class:`str`):
@@ -902,10 +904,10 @@ async def export_documents(
 
     async def import_documents(
         self,
-        request: firestore_admin.ImportDocumentsRequest = None,
+        request: Union[firestore_admin.ImportDocumentsRequest, 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:
@@ -918,7 +920,7 @@ async def import_documents(
         already been imported to Cloud Firestore.
 
         Args:
-            request (:class:`google.cloud.firestore_admin_v1.types.ImportDocumentsRequest`):
+            request (Union[google.cloud.firestore_admin_v1.types.ImportDocumentsRequest, dict]):
                 The request object. The request for
                 [FirestoreAdmin.ImportDocuments][google.firestore.admin.v1.FirestoreAdmin.ImportDocuments].
             name (:class:`str`):

google/cloud/firestore_admin_v1/services/firestore_admin/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 as gac_operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
 from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
@@ -408,7 +410,7 @@ def create_index(
         *,
         parent: str = None,
         index: gfa_index.Index = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> gac_operation.Operation:
@@ -502,7 +504,7 @@ def list_indexes(
         request: Union[firestore_admin.ListIndexesRequest, 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.ListIndexesPager:
@@ -582,7 +584,7 @@ def get_index(
         request: Union[firestore_admin.GetIndexRequest, 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]] = (),
     ) -> index.Index:
@@ -654,7 +656,7 @@ def delete_index(
         request: Union[firestore_admin.DeleteIndexRequest, 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]] = (),
     ) -> None:
@@ -718,7 +720,7 @@ def get_field(
         request: Union[firestore_admin.GetFieldRequest, 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]] = (),
     ) -> field.Field:
@@ -792,7 +794,7 @@ def update_field(
         request: Union[firestore_admin.UpdateFieldRequest, dict] = None,
         *,
         field: gfa_field.Field = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> gac_operation.Operation:
@@ -893,7 +895,7 @@ def list_fields(
         request: Union[firestore_admin.ListFieldsRequest, 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.ListFieldsPager:
@@ -980,7 +982,7 @@ def export_documents(
         request: Union[firestore_admin.ExportDocumentsRequest, 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]] = (),
     ) -> gac_operation.Operation:
@@ -1073,7 +1075,7 @@ def import_documents(
         request: Union[firestore_admin.ImportDocumentsRequest, 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]] = (),
     ) -> gac_operation.Operation:

google/cloud/firestore_admin_v1/services/firestore_admin/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
@@ -42,15 +41,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 FirestoreAdminTransport(abc.ABC):
     """Abstract transport class for FirestoreAdmin."""
@@ -103,7 +93,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
@@ -136,29 +126,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 = {
@@ -266,7 +233,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/firestore_admin_v1/services/firestore_admin/transports/grpc.py

@@ -116,7 +116,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/firestore_admin_v1/services/firestore_admin/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
@@ -163,7 +162,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)