Skip to content

Commit 6b5a779

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#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: googleapis/googleapis-gen@2ff001f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent 2f11ca9 commit 6b5a779

File tree

20 files changed

+313
-350
lines changed

20 files changed

+313
-350
lines changed

‎google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.api_core import operation as gac_operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
@@ -181,11 +183,11 @@ def __init__(
181183

182184
async def create_index(
183185
self,
184-
request: firestore_admin.CreateIndexRequest = None,
186+
request: Union[firestore_admin.CreateIndexRequest, dict] = None,
185187
*,
186188
parent: str = None,
187189
index: gfa_index.Index = None,
188-
retry: retries.Retry = gapic_v1.method.DEFAULT,
190+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
189191
timeout: float = None,
190192
metadata: Sequence[Tuple[str, str]] = (),
191193
) -> operation_async.AsyncOperation:
@@ -196,7 +198,7 @@ async def create_index(
196198
[IndexOperationMetadata][google.firestore.admin.v1.IndexOperationMetadata].
197199
198200
Args:
199-
request (:class:`google.cloud.firestore_admin_v1.types.CreateIndexRequest`):
201+
request (Union[google.cloud.firestore_admin_v1.types.CreateIndexRequest, dict]):
200202
The request object. The request for
201203
[FirestoreAdmin.CreateIndex][google.firestore.admin.v1.FirestoreAdmin.CreateIndex].
202204
parent (:class:`str`):
@@ -276,17 +278,17 @@ async def create_index(
276278

277279
async def list_indexes(
278280
self,
279-
request: firestore_admin.ListIndexesRequest = None,
281+
request: Union[firestore_admin.ListIndexesRequest, dict] = None,
280282
*,
281283
parent: str = None,
282-
retry: retries.Retry = gapic_v1.method.DEFAULT,
284+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
283285
timeout: float = None,
284286
metadata: Sequence[Tuple[str, str]] = (),
285287
) -> pagers.ListIndexesAsyncPager:
286288
r"""Lists composite indexes.
287289
288290
Args:
289-
request (:class:`google.cloud.firestore_admin_v1.types.ListIndexesRequest`):
291+
request (Union[google.cloud.firestore_admin_v1.types.ListIndexesRequest, dict]):
290292
The request object. The request for
291293
[FirestoreAdmin.ListIndexes][google.firestore.admin.v1.FirestoreAdmin.ListIndexes].
292294
parent (:class:`str`):
@@ -367,17 +369,17 @@ async def list_indexes(
367369

368370
async def get_index(
369371
self,
370-
request: firestore_admin.GetIndexRequest = None,
372+
request: Union[firestore_admin.GetIndexRequest, dict] = None,
371373
*,
372374
name: str = None,
373-
retry: retries.Retry = gapic_v1.method.DEFAULT,
375+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
374376
timeout: float = None,
375377
metadata: Sequence[Tuple[str, str]] = (),
376378
) -> index.Index:
377379
r"""Gets a composite index.
378380
379381
Args:
380-
request (:class:`google.cloud.firestore_admin_v1.types.GetIndexRequest`):
382+
request (Union[google.cloud.firestore_admin_v1.types.GetIndexRequest, dict]):
381383
The request object. The request for
382384
[FirestoreAdmin.GetIndex][google.firestore.admin.v1.FirestoreAdmin.GetIndex].
383385
name (:class:`str`):
@@ -450,17 +452,17 @@ async def get_index(
450452

451453
async def delete_index(
452454
self,
453-
request: firestore_admin.DeleteIndexRequest = None,
455+
request: Union[firestore_admin.DeleteIndexRequest, dict] = None,
454456
*,
455457
name: str = None,
456-
retry: retries.Retry = gapic_v1.method.DEFAULT,
458+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
457459
timeout: float = None,
458460
metadata: Sequence[Tuple[str, str]] = (),
459461
) -> None:
460462
r"""Deletes a composite index.
461463
462464
Args:
463-
request (:class:`google.cloud.firestore_admin_v1.types.DeleteIndexRequest`):
465+
request (Union[google.cloud.firestore_admin_v1.types.DeleteIndexRequest, dict]):
464466
The request object. The request for
465467
[FirestoreAdmin.DeleteIndex][google.firestore.admin.v1.FirestoreAdmin.DeleteIndex].
466468
name (:class:`str`):
@@ -525,17 +527,17 @@ async def delete_index(
525527

526528
async def get_field(
527529
self,
528-
request: firestore_admin.GetFieldRequest = None,
530+
request: Union[firestore_admin.GetFieldRequest, dict] = None,
529531
*,
530532
name: str = None,
531-
retry: retries.Retry = gapic_v1.method.DEFAULT,
533+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
532534
timeout: float = None,
533535
metadata: Sequence[Tuple[str, str]] = (),
534536
) -> field.Field:
535537
r"""Gets the metadata and configuration for a Field.
536538
537539
Args:
538-
request (:class:`google.cloud.firestore_admin_v1.types.GetFieldRequest`):
540+
request (Union[google.cloud.firestore_admin_v1.types.GetFieldRequest, dict]):
539541
The request object. The request for
540542
[FirestoreAdmin.GetField][google.firestore.admin.v1.FirestoreAdmin.GetField].
541543
name (:class:`str`):
@@ -610,10 +612,10 @@ async def get_field(
610612

611613
async def update_field(
612614
self,
613-
request: firestore_admin.UpdateFieldRequest = None,
615+
request: Union[firestore_admin.UpdateFieldRequest, dict] = None,
614616
*,
615617
field: gfa_field.Field = None,
616-
retry: retries.Retry = gapic_v1.method.DEFAULT,
618+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
617619
timeout: float = None,
618620
metadata: Sequence[Tuple[str, str]] = (),
619621
) -> operation_async.AsyncOperation:
@@ -635,7 +637,7 @@ async def update_field(
635637
``projects/{project_id}/databases/{database_id}/collectionGroups/__default__/fields/*``.
636638
637639
Args:
638-
request (:class:`google.cloud.firestore_admin_v1.types.UpdateFieldRequest`):
640+
request (Union[google.cloud.firestore_admin_v1.types.UpdateFieldRequest, dict]):
639641
The request object. The request for
640642
[FirestoreAdmin.UpdateField][google.firestore.admin.v1.FirestoreAdmin.UpdateField].
641643
field (:class:`google.cloud.firestore_admin_v1.types.Field`):
@@ -711,10 +713,10 @@ async def update_field(
711713

712714
async def list_fields(
713715
self,
714-
request: firestore_admin.ListFieldsRequest = None,
716+
request: Union[firestore_admin.ListFieldsRequest, dict] = None,
715717
*,
716718
parent: str = None,
717-
retry: retries.Retry = gapic_v1.method.DEFAULT,
719+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
718720
timeout: float = None,
719721
metadata: Sequence[Tuple[str, str]] = (),
720722
) -> pagers.ListFieldsAsyncPager:
@@ -728,7 +730,7 @@ async def list_fields(
728730
with the filter set to ``indexConfig.usesAncestorConfig:false``.
729731
730732
Args:
731-
request (:class:`google.cloud.firestore_admin_v1.types.ListFieldsRequest`):
733+
request (Union[google.cloud.firestore_admin_v1.types.ListFieldsRequest, dict]):
732734
The request object. The request for
733735
[FirestoreAdmin.ListFields][google.firestore.admin.v1.FirestoreAdmin.ListFields].
734736
parent (:class:`str`):
@@ -809,10 +811,10 @@ async def list_fields(
809811

810812
async def export_documents(
811813
self,
812-
request: firestore_admin.ExportDocumentsRequest = None,
814+
request: Union[firestore_admin.ExportDocumentsRequest, dict] = None,
813815
*,
814816
name: str = None,
815-
retry: retries.Retry = gapic_v1.method.DEFAULT,
817+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
816818
timeout: float = None,
817819
metadata: Sequence[Tuple[str, str]] = (),
818820
) -> operation_async.AsyncOperation:
@@ -828,7 +830,7 @@ async def export_documents(
828830
Google Cloud Storage.
829831
830832
Args:
831-
request (:class:`google.cloud.firestore_admin_v1.types.ExportDocumentsRequest`):
833+
request (Union[google.cloud.firestore_admin_v1.types.ExportDocumentsRequest, dict]):
832834
The request object. The request for
833835
[FirestoreAdmin.ExportDocuments][google.firestore.admin.v1.FirestoreAdmin.ExportDocuments].
834836
name (:class:`str`):
@@ -902,10 +904,10 @@ async def export_documents(
902904

903905
async def import_documents(
904906
self,
905-
request: firestore_admin.ImportDocumentsRequest = None,
907+
request: Union[firestore_admin.ImportDocumentsRequest, dict] = None,
906908
*,
907909
name: str = None,
908-
retry: retries.Retry = gapic_v1.method.DEFAULT,
910+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
909911
timeout: float = None,
910912
metadata: Sequence[Tuple[str, str]] = (),
911913
) -> operation_async.AsyncOperation:
@@ -918,7 +920,7 @@ async def import_documents(
918920
already been imported to Cloud Firestore.
919921
920922
Args:
921-
request (:class:`google.cloud.firestore_admin_v1.types.ImportDocumentsRequest`):
923+
request (Union[google.cloud.firestore_admin_v1.types.ImportDocumentsRequest, dict]):
922924
The request object. The request for
923925
[FirestoreAdmin.ImportDocuments][google.firestore.admin.v1.FirestoreAdmin.ImportDocuments].
924926
name (:class:`str`):

‎google/cloud/firestore_admin_v1/services/firestore_admin/client.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.api_core import operation as gac_operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
@@ -408,7 +410,7 @@ def create_index(
408410
*,
409411
parent: str = None,
410412
index: gfa_index.Index = None,
411-
retry: retries.Retry = gapic_v1.method.DEFAULT,
413+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
412414
timeout: float = None,
413415
metadata: Sequence[Tuple[str, str]] = (),
414416
) -> gac_operation.Operation:
@@ -502,7 +504,7 @@ def list_indexes(
502504
request: Union[firestore_admin.ListIndexesRequest, dict] = None,
503505
*,
504506
parent: str = None,
505-
retry: retries.Retry = gapic_v1.method.DEFAULT,
507+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
506508
timeout: float = None,
507509
metadata: Sequence[Tuple[str, str]] = (),
508510
) -> pagers.ListIndexesPager:
@@ -582,7 +584,7 @@ def get_index(
582584
request: Union[firestore_admin.GetIndexRequest, dict] = None,
583585
*,
584586
name: str = None,
585-
retry: retries.Retry = gapic_v1.method.DEFAULT,
587+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
586588
timeout: float = None,
587589
metadata: Sequence[Tuple[str, str]] = (),
588590
) -> index.Index:
@@ -654,7 +656,7 @@ def delete_index(
654656
request: Union[firestore_admin.DeleteIndexRequest, dict] = None,
655657
*,
656658
name: str = None,
657-
retry: retries.Retry = gapic_v1.method.DEFAULT,
659+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
658660
timeout: float = None,
659661
metadata: Sequence[Tuple[str, str]] = (),
660662
) -> None:
@@ -718,7 +720,7 @@ def get_field(
718720
request: Union[firestore_admin.GetFieldRequest, dict] = None,
719721
*,
720722
name: str = None,
721-
retry: retries.Retry = gapic_v1.method.DEFAULT,
723+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
722724
timeout: float = None,
723725
metadata: Sequence[Tuple[str, str]] = (),
724726
) -> field.Field:
@@ -792,7 +794,7 @@ def update_field(
792794
request: Union[firestore_admin.UpdateFieldRequest, dict] = None,
793795
*,
794796
field: gfa_field.Field = None,
795-
retry: retries.Retry = gapic_v1.method.DEFAULT,
797+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
796798
timeout: float = None,
797799
metadata: Sequence[Tuple[str, str]] = (),
798800
) -> gac_operation.Operation:
@@ -893,7 +895,7 @@ def list_fields(
893895
request: Union[firestore_admin.ListFieldsRequest, dict] = None,
894896
*,
895897
parent: str = None,
896-
retry: retries.Retry = gapic_v1.method.DEFAULT,
898+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
897899
timeout: float = None,
898900
metadata: Sequence[Tuple[str, str]] = (),
899901
) -> pagers.ListFieldsPager:
@@ -980,7 +982,7 @@ def export_documents(
980982
request: Union[firestore_admin.ExportDocumentsRequest, dict] = None,
981983
*,
982984
name: str = None,
983-
retry: retries.Retry = gapic_v1.method.DEFAULT,
985+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
984986
timeout: float = None,
985987
metadata: Sequence[Tuple[str, str]] = (),
986988
) -> gac_operation.Operation:
@@ -1073,7 +1075,7 @@ def import_documents(
10731075
request: Union[firestore_admin.ImportDocumentsRequest, dict] = None,
10741076
*,
10751077
name: str = None,
1076-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1078+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10771079
timeout: float = None,
10781080
metadata: Sequence[Tuple[str, str]] = (),
10791081
) -> gac_operation.Operation:

‎google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -42,15 +41,6 @@
4241
except pkg_resources.DistributionNotFound:
4342
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4443

45-
try:
46-
# google.auth.__version__ was added in 1.26.0
47-
_GOOGLE_AUTH_VERSION = google.auth.__version__
48-
except AttributeError:
49-
try: # try pkg_resources if it is available
50-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
51-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
52-
_GOOGLE_AUTH_VERSION = None
53-
5444

5545
class FirestoreAdminTransport(abc.ABC):
5646
"""Abstract transport class for FirestoreAdmin."""
@@ -103,7 +93,7 @@ def __init__(
10393
host += ":443"
10494
self._host = host
10595

106-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
96+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10797

10898
# Save the scopes.
10999
self._scopes = scopes
@@ -136,29 +126,6 @@ def __init__(
136126
# Save the credentials.
137127
self._credentials = credentials
138128

139-
# TODO(busunkim): This method is in the base transport
140-
# to avoid duplicating code across the transport classes. These functions
141-
# should be deleted once the minimum required versions of google-auth is increased.
142-
143-
# TODO: Remove this function once google-auth >= 1.25.0 is required
144-
@classmethod
145-
def _get_scopes_kwargs(
146-
cls, host: str, scopes: Optional[Sequence[str]]
147-
) -> Dict[str, Optional[Sequence[str]]]:
148-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
149-
150-
scopes_kwargs = {}
151-
152-
if _GOOGLE_AUTH_VERSION and (
153-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
154-
>= packaging.version.parse("1.25.0")
155-
):
156-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
157-
else:
158-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
159-
160-
return scopes_kwargs
161-
162129
def _prep_wrapped_messages(self, client_info):
163130
# Precompute the wrapped methods.
164131
self._wrapped_methods = {
@@ -266,7 +233,7 @@ def close(self):
266233
raise NotImplementedError()
267234

268235
@property
269-
def operations_client(self) -> operations_v1.OperationsClient:
236+
def operations_client(self):
270237
"""Return the client designed to process long-running operations."""
271238
raise NotImplementedError()
272239

‎google/cloud/firestore_admin_v1/services/firestore_admin/transports/grpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def __init__(
116116
self._grpc_channel = None
117117
self._ssl_channel_credentials = ssl_channel_credentials
118118
self._stubs: Dict[str, Callable] = {}
119-
self._operations_client = None
119+
self._operations_client: Optional[operations_v1.OperationsClient] = None
120120

121121
if api_mtls_endpoint:
122122
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/firestore_admin_v1/services/firestore_admin/transports/grpc_asyncio.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -163,7 +162,7 @@ def __init__(
163162
self._grpc_channel = None
164163
self._ssl_channel_credentials = ssl_channel_credentials
165164
self._stubs: Dict[str, Callable] = {}
166-
self._operations_client = None
165+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
167166

168167
if api_mtls_endpoint:
169168
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)