From 1eebd02c89708d428e4339d4cebe66bc698da612 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:46:42 -0700 Subject: [PATCH 01/14] changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- .../services/firestore_admin/async_client.py | 14 ++++----- .../services/firestore_admin/client.py | 30 +++++++++---------- .../firestore_admin/transports/base.py | 10 +++---- .../services/firestore/async_client.py | 18 +++++------ .../firestore_v1/services/firestore/client.py | 28 ++++++----------- .../services/firestore/transports/base.py | 18 +++++------ synth.metadata | 4 +-- .../test_firestore_admin.py | 2 +- 8 files changed, 57 insertions(+), 67 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 38e6406eb5..027c26590b 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -28,8 +28,8 @@ from google.auth import credentials # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation # type: ignore -from google.api_core import operation_async # type: ignore +from google.api_core import operation as ga_operation +from google.api_core import operation_async from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py index f721cee47d..a2ee377754 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py @@ -19,10 +19,10 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Callable, Dict, Sequence, Tuple, Type, Union import pkg_resources -from google.api_core import client_options as client_options_lib # type: ignore +import google.api_core.client_options as ClientOptions # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -32,8 +32,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation # type: ignore -from google.api_core import operation_async # type: ignore +from google.api_core import operation as ga_operation +from google.api_core import operation_async from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -175,9 +175,9 @@ def parse_index_path(path: str) -> Dict[str, str]: def __init__( self, *, - credentials: Optional[credentials.Credentials] = None, - transport: Union[str, FirestoreAdminTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + credentials: credentials.Credentials = None, + transport: Union[str, FirestoreAdminTransport] = None, + client_options: ClientOptions = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore admin client. @@ -191,8 +191,8 @@ def __init__( transport (Union[str, ~.FirestoreAdminTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (client_options_lib.ClientOptions): Custom options for the - client. It won't take effect if a ``transport`` instance is provided. + client_options (ClientOptions): Custom options for the client. It + won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -218,9 +218,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = client_options_lib.from_dict(client_options) + client_options = ClientOptions.from_dict(client_options) if client_options is None: - client_options = client_options_lib.ClientOptions() + client_options = ClientOptions.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( @@ -377,7 +377,7 @@ def create_index( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, gfa_index.Index, @@ -779,7 +779,7 @@ def update_field( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, gfa_field.Field, @@ -963,7 +963,7 @@ def export_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, gfa_operation.ExportDocumentsResponse, @@ -1065,7 +1065,7 @@ def import_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, empty.Empty, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index ac4c4475f5..fe0dbaed78 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index d775a877cf..dd2efb1d01 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/client.py b/google/cloud/firestore_v1/services/firestore/client.py index 527ba3c6ad..e6fd7913d3 100644 --- a/google/cloud/firestore_v1/services/firestore/client.py +++ b/google/cloud/firestore_v1/services/firestore/client.py @@ -19,20 +19,10 @@ from distutils import util import os import re -from typing import ( - Callable, - Dict, - Optional, - Iterable, - Iterator, - Sequence, - Tuple, - Type, - Union, -) +from typing import Callable, Dict, Iterable, Iterator, Sequence, Tuple, Type, Union import pkg_resources -from google.api_core import client_options as client_options_lib # type: ignore +import google.api_core.client_options as ClientOptions # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -156,9 +146,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): def __init__( self, *, - credentials: Optional[credentials.Credentials] = None, - transport: Union[str, FirestoreTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + credentials: credentials.Credentials = None, + transport: Union[str, FirestoreTransport] = None, + client_options: ClientOptions = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore client. @@ -172,8 +162,8 @@ def __init__( transport (Union[str, ~.FirestoreTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (client_options_lib.ClientOptions): Custom options for the - client. It won't take effect if a ``transport`` instance is provided. + client_options (ClientOptions): Custom options for the client. It + won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -199,9 +189,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = client_options_lib.from_dict(client_options) + client_options = ClientOptions.from_dict(client_options) if client_options is None: - client_options = client_options_lib.ClientOptions() + client_options = ClientOptions.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 12c96dfb31..416bb3f723 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 61a3eb95b1..0e57949c0d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,8 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-firestore.git", - "sha": "2021f38bb6f016c13bc43d59730c77b57ae5c352" - + "sha": "8e53a2c3aef160c4090241f5260686aee03323d2" } }, { @@ -45,6 +44,7 @@ } ], "generatedFiles": [ + ".coveragerc", ".flake8", ".github/CONTRIBUTING.md", ".github/ISSUE_TEMPLATE/bug_report.md", diff --git a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py index 6773457e91..866badfa33 100644 --- a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py +++ b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py @@ -31,7 +31,7 @@ from google.api_core import gapic_v1 from google.api_core import grpc_helpers from google.api_core import grpc_helpers_async -from google.api_core import operation_async # type: ignore +from google.api_core import operation_async from google.api_core import operations_v1 from google.auth import credentials from google.auth.exceptions import MutualTLSChannelError From 9342f55926d4b8bfd7021fc6df222b7a1368d576 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:47:28 -0700 Subject: [PATCH 02/14] feat: Add Java microgen rules to imports Source-Author: Mira Leung Source-Date: Mon Sep 21 18:04:02 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: aaac658367398e478d650768344b88acebad50d9 Source-Link: https://github.com/googleapis/googleapis/commit/aaac658367398e478d650768344b88acebad50d9 --- .../services/firestore_admin/async_client.py | 14 ++++----- .../services/firestore_admin/client.py | 30 +++++++++---------- .../firestore_admin/transports/base.py | 10 +++---- .../services/firestore/async_client.py | 18 +++++------ .../firestore_v1/services/firestore/client.py | 28 +++++++++++------ .../services/firestore/transports/base.py | 18 +++++------ synth.metadata | 4 +-- .../test_firestore_admin.py | 2 +- 8 files changed, 67 insertions(+), 57 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 027c26590b..38e6406eb5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -28,8 +28,8 @@ from google.auth import credentials # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation -from google.api_core import operation_async +from google.api_core import operation as ga_operation # type: ignore +from google.api_core import operation_async # type: ignore from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py index a2ee377754..f721cee47d 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py @@ -19,10 +19,10 @@ from distutils import util import os import re -from typing import Callable, Dict, Sequence, Tuple, Type, Union +from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core import client_options as client_options_lib # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -32,8 +32,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation -from google.api_core import operation_async +from google.api_core import operation as ga_operation # type: ignore +from google.api_core import operation_async # type: ignore from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -175,9 +175,9 @@ def parse_index_path(path: str) -> Dict[str, str]: def __init__( self, *, - credentials: credentials.Credentials = None, - transport: Union[str, FirestoreAdminTransport] = None, - client_options: ClientOptions = None, + credentials: Optional[credentials.Credentials] = None, + transport: Union[str, FirestoreAdminTransport, None] = None, + client_options: Optional[client_options_lib.ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore admin client. @@ -191,8 +191,8 @@ def __init__( transport (Union[str, ~.FirestoreAdminTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (ClientOptions): Custom options for the client. It - won't take effect if a ``transport`` instance is provided. + client_options (client_options_lib.ClientOptions): Custom options for the + client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -218,9 +218,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = ClientOptions.from_dict(client_options) + client_options = client_options_lib.from_dict(client_options) if client_options is None: - client_options = ClientOptions.ClientOptions() + client_options = client_options_lib.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( @@ -377,7 +377,7 @@ def create_index( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, gfa_index.Index, @@ -779,7 +779,7 @@ def update_field( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, gfa_field.Field, @@ -963,7 +963,7 @@ def export_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, gfa_operation.ExportDocumentsResponse, @@ -1065,7 +1065,7 @@ def import_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, empty.Empty, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index fe0dbaed78..ac4c4475f5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index dd2efb1d01..d775a877cf 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/client.py b/google/cloud/firestore_v1/services/firestore/client.py index e6fd7913d3..527ba3c6ad 100644 --- a/google/cloud/firestore_v1/services/firestore/client.py +++ b/google/cloud/firestore_v1/services/firestore/client.py @@ -19,10 +19,20 @@ from distutils import util import os import re -from typing import Callable, Dict, Iterable, Iterator, Sequence, Tuple, Type, Union +from typing import ( + Callable, + Dict, + Optional, + Iterable, + Iterator, + Sequence, + Tuple, + Type, + Union, +) import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core import client_options as client_options_lib # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -146,9 +156,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): def __init__( self, *, - credentials: credentials.Credentials = None, - transport: Union[str, FirestoreTransport] = None, - client_options: ClientOptions = None, + credentials: Optional[credentials.Credentials] = None, + transport: Union[str, FirestoreTransport, None] = None, + client_options: Optional[client_options_lib.ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore client. @@ -162,8 +172,8 @@ def __init__( transport (Union[str, ~.FirestoreTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (ClientOptions): Custom options for the client. It - won't take effect if a ``transport`` instance is provided. + client_options (client_options_lib.ClientOptions): Custom options for the + client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -189,9 +199,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = ClientOptions.from_dict(client_options) + client_options = client_options_lib.from_dict(client_options) if client_options is None: - client_options = ClientOptions.ClientOptions() + client_options = client_options_lib.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 416bb3f723..12c96dfb31 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 0e57949c0d..61a3eb95b1 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,8 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-firestore.git", - "sha": "8e53a2c3aef160c4090241f5260686aee03323d2" + "sha": "2021f38bb6f016c13bc43d59730c77b57ae5c352" + } }, { @@ -44,7 +45,6 @@ } ], "generatedFiles": [ - ".coveragerc", ".flake8", ".github/CONTRIBUTING.md", ".github/ISSUE_TEMPLATE/bug_report.md", diff --git a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py index 866badfa33..6773457e91 100644 --- a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py +++ b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py @@ -31,7 +31,7 @@ from google.api_core import gapic_v1 from google.api_core import grpc_helpers from google.api_core import grpc_helpers_async -from google.api_core import operation_async +from google.api_core import operation_async # type: ignore from google.api_core import operations_v1 from google.auth import credentials from google.auth.exceptions import MutualTLSChannelError From ba995aa03df25bb68021447c35c55ba591214732 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:47:50 -0700 Subject: [PATCH 03/14] docs: update OPTIONAL annotations for some fields. PiperOrigin-RevId: 333132625 Source-Author: Google APIs Source-Date: Tue Sep 22 12:14:18 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 470d84e263c833af5280753b8e4188432b8d5b06 Source-Link: https://github.com/googleapis/googleapis/commit/470d84e263c833af5280753b8e4188432b8d5b06 --- .../services/firestore_admin/async_client.py | 14 ++++----- .../services/firestore_admin/client.py | 30 +++++++++---------- .../firestore_admin/transports/base.py | 10 +++---- .../services/firestore/async_client.py | 18 +++++------ .../firestore_v1/services/firestore/client.py | 28 ++++++----------- .../services/firestore/transports/base.py | 18 +++++------ synth.metadata | 4 +-- .../test_firestore_admin.py | 2 +- 8 files changed, 57 insertions(+), 67 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 38e6406eb5..c1f3dbe9b4 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -28,8 +28,8 @@ from google.auth import credentials # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation # type: ignore -from google.api_core import operation_async # type: ignore +from google.api_core import operation as ga_operation +from google.api_core import operation_async from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -274,8 +274,8 @@ async def list_indexes( multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -362,8 +362,8 @@ async def get_index( multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -437,8 +437,8 @@ async def delete_index( multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -520,8 +520,8 @@ async def get_field( multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -713,8 +713,8 @@ async def list_fields( multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py index f721cee47d..a2ee377754 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py @@ -19,10 +19,10 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Callable, Dict, Sequence, Tuple, Type, Union import pkg_resources -from google.api_core import client_options as client_options_lib # type: ignore +import google.api_core.client_options as ClientOptions # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -32,8 +32,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation # type: ignore -from google.api_core import operation_async # type: ignore +from google.api_core import operation as ga_operation +from google.api_core import operation_async from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -175,9 +175,9 @@ def parse_index_path(path: str) -> Dict[str, str]: def __init__( self, *, - credentials: Optional[credentials.Credentials] = None, - transport: Union[str, FirestoreAdminTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + credentials: credentials.Credentials = None, + transport: Union[str, FirestoreAdminTransport] = None, + client_options: ClientOptions = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore admin client. @@ -191,8 +191,8 @@ def __init__( transport (Union[str, ~.FirestoreAdminTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (client_options_lib.ClientOptions): Custom options for the - client. It won't take effect if a ``transport`` instance is provided. + client_options (ClientOptions): Custom options for the client. It + won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -218,9 +218,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = client_options_lib.from_dict(client_options) + client_options = ClientOptions.from_dict(client_options) if client_options is None: - client_options = client_options_lib.ClientOptions() + client_options = ClientOptions.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( @@ -377,7 +377,7 @@ def create_index( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, gfa_index.Index, @@ -779,7 +779,7 @@ def update_field( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, gfa_field.Field, @@ -963,7 +963,7 @@ def export_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, gfa_operation.ExportDocumentsResponse, @@ -1065,7 +1065,7 @@ def import_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = ga_operation.from_gapic( + response = operation.from_gapic( response, self._transport.operations_client, empty.Empty, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index ac4c4475f5..d668818891 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -125,8 +125,8 @@ def _prep_wrapped_messages(self, client_info): multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -140,8 +140,8 @@ def _prep_wrapped_messages(self, client_info): multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -155,8 +155,8 @@ def _prep_wrapped_messages(self, client_info): multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -170,8 +170,8 @@ def _prep_wrapped_messages(self, client_info): multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -188,8 +188,8 @@ def _prep_wrapped_messages(self, client_info): multiplier=1.3, predicate=retries.if_exception_type( exceptions.DeadlineExceeded, - exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index d775a877cf..dd2efb1d01 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/client.py b/google/cloud/firestore_v1/services/firestore/client.py index 527ba3c6ad..e6fd7913d3 100644 --- a/google/cloud/firestore_v1/services/firestore/client.py +++ b/google/cloud/firestore_v1/services/firestore/client.py @@ -19,20 +19,10 @@ from distutils import util import os import re -from typing import ( - Callable, - Dict, - Optional, - Iterable, - Iterator, - Sequence, - Tuple, - Type, - Union, -) +from typing import Callable, Dict, Iterable, Iterator, Sequence, Tuple, Type, Union import pkg_resources -from google.api_core import client_options as client_options_lib # type: ignore +import google.api_core.client_options as ClientOptions # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -156,9 +146,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): def __init__( self, *, - credentials: Optional[credentials.Credentials] = None, - transport: Union[str, FirestoreTransport, None] = None, - client_options: Optional[client_options_lib.ClientOptions] = None, + credentials: credentials.Credentials = None, + transport: Union[str, FirestoreTransport] = None, + client_options: ClientOptions = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore client. @@ -172,8 +162,8 @@ def __init__( transport (Union[str, ~.FirestoreTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (client_options_lib.ClientOptions): Custom options for the - client. It won't take effect if a ``transport`` instance is provided. + client_options (ClientOptions): Custom options for the client. It + won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -199,9 +189,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = client_options_lib.from_dict(client_options) + client_options = ClientOptions.from_dict(client_options) if client_options is None: - client_options = client_options_lib.ClientOptions() + client_options = ClientOptions.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 12c96dfb31..416bb3f723 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 61a3eb95b1..0e57949c0d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,8 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-firestore.git", - "sha": "2021f38bb6f016c13bc43d59730c77b57ae5c352" - + "sha": "8e53a2c3aef160c4090241f5260686aee03323d2" } }, { @@ -45,6 +44,7 @@ } ], "generatedFiles": [ + ".coveragerc", ".flake8", ".github/CONTRIBUTING.md", ".github/ISSUE_TEMPLATE/bug_report.md", diff --git a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py index 6773457e91..866badfa33 100644 --- a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py +++ b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py @@ -31,7 +31,7 @@ from google.api_core import gapic_v1 from google.api_core import grpc_helpers from google.api_core import grpc_helpers_async -from google.api_core import operation_async # type: ignore +from google.api_core import operation_async from google.api_core import operations_v1 from google.auth import credentials from google.auth.exceptions import MutualTLSChannelError From 01c07a14c9a45c95d8d81262d03234a03e3d674f Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:47:50 -0700 Subject: [PATCH 04/14] Update gapic-generator-python pin to 0.33.4 PiperOrigin-RevId: 333159182 Source-Author: Google APIs Source-Date: Tue Sep 22 14:22:59 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 3dbeac0d54125b123c8dfd39c774b37473c36944 Source-Link: https://github.com/googleapis/googleapis/commit/3dbeac0d54125b123c8dfd39c774b37473c36944 --- .../services/firestore_admin/async_client.py | 24 ++++++++-------- .../services/firestore_admin/client.py | 22 +++++++-------- .../firestore_admin/transports/base.py | 20 ++++++------- .../firestore_v1/services/firestore/client.py | 28 +++++++++++++------ synth.metadata | 4 +-- .../test_firestore_admin.py | 2 +- 6 files changed, 55 insertions(+), 45 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index c1f3dbe9b4..492c73e60f 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -28,8 +28,8 @@ from google.auth import credentials # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation -from google.api_core import operation_async +from google.api_core import operation as ga_operation # type: ignore +from google.api_core import operation_async # type: ignore from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py index a2ee377754..15498a6624 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py @@ -19,10 +19,10 @@ from distutils import util import os import re -from typing import Callable, Dict, Sequence, Tuple, Type, Union +from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core import client_options as client_options_lib # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -32,8 +32,8 @@ from google.auth.exceptions import MutualTLSChannelError # type: ignore from google.oauth2 import service_account # type: ignore -from google.api_core import operation as ga_operation -from google.api_core import operation_async +from google.api_core import operation as ga_operation # type: ignore +from google.api_core import operation_async # type: ignore from google.cloud.firestore_admin_v1.services.firestore_admin import pagers from google.cloud.firestore_admin_v1.types import field from google.cloud.firestore_admin_v1.types import field as gfa_field @@ -175,9 +175,9 @@ def parse_index_path(path: str) -> Dict[str, str]: def __init__( self, *, - credentials: credentials.Credentials = None, - transport: Union[str, FirestoreAdminTransport] = None, - client_options: ClientOptions = None, + credentials: Optional[credentials.Credentials] = None, + transport: Union[str, FirestoreAdminTransport, None] = None, + client_options: Optional[client_options_lib.ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore admin client. @@ -191,8 +191,8 @@ def __init__( transport (Union[str, ~.FirestoreAdminTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (ClientOptions): Custom options for the client. It - won't take effect if a ``transport`` instance is provided. + client_options (client_options_lib.ClientOptions): Custom options for the + client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -218,9 +218,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = ClientOptions.from_dict(client_options) + client_options = client_options_lib.from_dict(client_options) if client_options is None: - client_options = ClientOptions.ClientOptions() + client_options = client_options_lib.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index d668818891..fe0dbaed78 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/client.py b/google/cloud/firestore_v1/services/firestore/client.py index e6fd7913d3..527ba3c6ad 100644 --- a/google/cloud/firestore_v1/services/firestore/client.py +++ b/google/cloud/firestore_v1/services/firestore/client.py @@ -19,10 +19,20 @@ from distutils import util import os import re -from typing import Callable, Dict, Iterable, Iterator, Sequence, Tuple, Type, Union +from typing import ( + Callable, + Dict, + Optional, + Iterable, + Iterator, + Sequence, + Tuple, + Type, + Union, +) import pkg_resources -import google.api_core.client_options as ClientOptions # type: ignore +from google.api_core import client_options as client_options_lib # type: ignore from google.api_core import exceptions # type: ignore from google.api_core import gapic_v1 # type: ignore from google.api_core import retry as retries # type: ignore @@ -146,9 +156,9 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): def __init__( self, *, - credentials: credentials.Credentials = None, - transport: Union[str, FirestoreTransport] = None, - client_options: ClientOptions = None, + credentials: Optional[credentials.Credentials] = None, + transport: Union[str, FirestoreTransport, None] = None, + client_options: Optional[client_options_lib.ClientOptions] = None, client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO, ) -> None: """Instantiate the firestore client. @@ -162,8 +172,8 @@ def __init__( transport (Union[str, ~.FirestoreTransport]): The transport to use. If set to None, a transport is chosen automatically. - client_options (ClientOptions): Custom options for the client. It - won't take effect if a ``transport`` instance is provided. + client_options (client_options_lib.ClientOptions): Custom options for the + client. It won't take effect if a ``transport`` instance is provided. (1) The ``api_endpoint`` property can be used to override the default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT environment variable can also be used to override the endpoint: @@ -189,9 +199,9 @@ def __init__( creation failed for any reason. """ if isinstance(client_options, dict): - client_options = ClientOptions.from_dict(client_options) + client_options = client_options_lib.from_dict(client_options) if client_options is None: - client_options = ClientOptions.ClientOptions() + client_options = client_options_lib.ClientOptions() # Create SSL credentials for mutual TLS if needed. use_client_cert = bool( diff --git a/synth.metadata b/synth.metadata index 0e57949c0d..bb0c44fcc6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "470d84e263c833af5280753b8e4188432b8d5b06", - "internalRef": "333132625" + "sha": "3dbeac0d54125b123c8dfd39c774b37473c36944", + "internalRef": "333159182" } }, { diff --git a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py index 866badfa33..6773457e91 100644 --- a/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py +++ b/tests/unit/gapic/firestore_admin_v1/test_firestore_admin.py @@ -31,7 +31,7 @@ from google.api_core import gapic_v1 from google.api_core import grpc_helpers from google.api_core import grpc_helpers_async -from google.api_core import operation_async +from google.api_core import operation_async # type: ignore from google.api_core import operations_v1 from google.auth import credentials from google.auth.exceptions import MutualTLSChannelError From e69955c3b8759653eca6dd1a5dc94f7301ce8e6b Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:48:34 -0700 Subject: [PATCH 05/14] chore: use Python microgenerator rules for aiplatform PiperOrigin-RevId: 333302099 Source-Author: Google APIs Source-Date: Wed Sep 23 08:58:22 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: acd4aabf1c1e3e5bf7db0e81f323003fb317fdaa Source-Link: https://github.com/googleapis/googleapis/commit/acd4aabf1c1e3e5bf7db0e81f323003fb317fdaa --- .../services/firestore_admin/async_client.py | 10 +++++----- .../services/firestore_admin/transports/base.py | 10 +++++----- synth.metadata | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 492c73e60f..38e6406eb5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index fe0dbaed78..ac4c4475f5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index bb0c44fcc6..78eb8880e6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "3dbeac0d54125b123c8dfd39c774b37473c36944", - "internalRef": "333159182" + "sha": "acd4aabf1c1e3e5bf7db0e81f323003fb317fdaa", + "internalRef": "333302099" } }, { From 61143fd611d3752bdab2fb1ebb3f6c551a869931 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:48:55 -0700 Subject: [PATCH 06/14] chore: use gapic-generator-python 0.33.6 PiperOrigin-RevId: 333323660 Source-Author: Google APIs Source-Date: Wed Sep 23 10:41:17 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 7e377ce8f06ced48a79b45d97eebccb8a51f1e28 Source-Link: https://github.com/googleapis/googleapis/commit/7e377ce8f06ced48a79b45d97eebccb8a51f1e28 --- .../firestore_admin_v1/services/firestore_admin/client.py | 8 ++++---- synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py index 15498a6624..f721cee47d 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/client.py @@ -377,7 +377,7 @@ def create_index( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, gfa_index.Index, @@ -779,7 +779,7 @@ def update_field( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, gfa_field.Field, @@ -963,7 +963,7 @@ def export_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, gfa_operation.ExportDocumentsResponse, @@ -1065,7 +1065,7 @@ def import_documents( response = rpc(request, retry=retry, timeout=timeout, metadata=metadata,) # Wrap the response in an operation future. - response = operation.from_gapic( + response = ga_operation.from_gapic( response, self._transport.operations_client, empty.Empty, diff --git a/synth.metadata b/synth.metadata index 78eb8880e6..c5c7003215 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "acd4aabf1c1e3e5bf7db0e81f323003fb317fdaa", - "internalRef": "333302099" + "sha": "7e377ce8f06ced48a79b45d97eebccb8a51f1e28", + "internalRef": "333323660" } }, { From 08a596dbb6313d23af8c66d8c07daa79cf363032 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:48:55 -0700 Subject: [PATCH 07/14] chore: move talent v4 to python microgenerator rules PiperOrigin-RevId: 333372432 Source-Author: Google APIs Source-Date: Wed Sep 23 14:23:38 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 0fd468f90d1236193ee4cbdfb22265b674de121f Source-Link: https://github.com/googleapis/googleapis/commit/0fd468f90d1236193ee4cbdfb22265b674de121f --- .../services/firestore_admin/async_client.py | 10 +++++----- .../services/firestore_admin/transports/base.py | 10 +++++----- synth.metadata | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 38e6406eb5..492c73e60f 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index ac4c4475f5..fe0dbaed78 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index c5c7003215..1b421e70e9 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "7e377ce8f06ced48a79b45d97eebccb8a51f1e28", - "internalRef": "333323660" + "sha": "0fd468f90d1236193ee4cbdfb22265b674de121f", + "internalRef": "333372432" } }, { From 438b8f4c664dcf26c7b2d74c9070597a456f6df5 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:49:08 -0700 Subject: [PATCH 08/14] feat: update third party protos with URLs and latest fields PiperOrigin-RevId: 333377977 Source-Author: Google APIs Source-Date: Wed Sep 23 14:49:46 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 989670e868daaad6ce0306e6ec1b9ff40659c19e Source-Link: https://github.com/googleapis/googleapis/commit/989670e868daaad6ce0306e6ec1b9ff40659c19e --- .../services/firestore_admin/async_client.py | 10 +++++----- .../services/firestore_admin/transports/base.py | 10 +++++----- synth.metadata | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 492c73e60f..38e6406eb5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index fe0dbaed78..ac4c4475f5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 1b421e70e9..93a4169722 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0fd468f90d1236193ee4cbdfb22265b674de121f", - "internalRef": "333372432" + "sha": "989670e868daaad6ce0306e6ec1b9ff40659c19e", + "internalRef": "333377977" } }, { From 0b4a0cc590d59e2a452fd6a58fa4089f31925f53 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:49:21 -0700 Subject: [PATCH 09/14] fix: naming style updates Source-Author: Mira Leung Source-Date: Wed Sep 23 16:33:18 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 3737889dafd012d7f7f724fa04390d42db496e6c Source-Link: https://github.com/googleapis/googleapis/commit/3737889dafd012d7f7f724fa04390d42db496e6c --- .../services/firestore/async_client.py | 18 +++++++++--------- .../services/firestore/transports/base.py | 18 +++++++++--------- synth.metadata | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index dd2efb1d01..d775a877cf 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 416bb3f723..12c96dfb31 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 93a4169722..61a3eb95b1 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,15 +4,16 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-firestore.git", - "sha": "8e53a2c3aef160c4090241f5260686aee03323d2" + "sha": "2021f38bb6f016c13bc43d59730c77b57ae5c352" + } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "989670e868daaad6ce0306e6ec1b9ff40659c19e", - "internalRef": "333377977" + "sha": "470d84e263c833af5280753b8e4188432b8d5b06", + "internalRef": "333132625" } }, { @@ -44,7 +45,6 @@ } ], "generatedFiles": [ - ".coveragerc", ".flake8", ".github/CONTRIBUTING.md", ".github/ISSUE_TEMPLATE/bug_report.md", From 574e5e9b899ae671a3a541308ab6f0aa747cf40a Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:49:51 -0700 Subject: [PATCH 10/14] Add Service Direcotry v1 protos and configs PiperOrigin-RevId: 333502684 Source-Author: Google APIs Source-Date: Thu Sep 24 06:33:53 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: d3697d47929f34c43bcc4de16c7c761a80e97cf1 Source-Link: https://github.com/googleapis/googleapis/commit/d3697d47929f34c43bcc4de16c7c761a80e97cf1 --- .../services/firestore/async_client.py | 18 +++++++++--------- .../services/firestore/transports/base.py | 18 +++++++++--------- synth.metadata | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index d775a877cf..dd2efb1d01 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 12c96dfb31..416bb3f723 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 61a3eb95b1..dc2a36d552 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,16 +4,15 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-firestore.git", - "sha": "2021f38bb6f016c13bc43d59730c77b57ae5c352" - + "sha": "8e53a2c3aef160c4090241f5260686aee03323d2" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "470d84e263c833af5280753b8e4188432b8d5b06", - "internalRef": "333132625" + "sha": "d3697d47929f34c43bcc4de16c7c761a80e97cf1", + "internalRef": "333502684" } }, { @@ -45,6 +44,7 @@ } ], "generatedFiles": [ + ".coveragerc", ".flake8", ".github/CONTRIBUTING.md", ".github/ISSUE_TEMPLATE/bug_report.md", From 8df7db85489b8951ad61fe0756c34795c4a7bef7 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:50:35 -0700 Subject: [PATCH 11/14] build: provide hint for package name on npm PiperOrigin-RevId: 334246086 Source-Author: Google APIs Source-Date: Mon Sep 28 15:04:53 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 95b995cdecaf9cee0b17c9b829e4049457fdb019 Source-Link: https://github.com/googleapis/googleapis/commit/95b995cdecaf9cee0b17c9b829e4049457fdb019 --- .../services/firestore_admin/async_client.py | 10 ++--- .../firestore_admin/transports/base.py | 10 ++--- .../services/firestore/async_client.py | 38 +++++++++---------- .../services/firestore/transports/base.py | 38 +++++++++---------- synth.metadata | 4 +- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 38e6406eb5..492c73e60f 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index ac4c4475f5..fe0dbaed78 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index dd2efb1d01..c8430e55b8 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -1108,7 +1108,7 @@ async def batch_write( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.Aborted, exceptions.ServiceUnavailable, + exceptions.ServiceUnavailable, exceptions.Aborted, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 416bb3f723..564c7c9dad 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -280,7 +280,7 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.Aborted, exceptions.ServiceUnavailable, + exceptions.ServiceUnavailable, exceptions.Aborted, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index dc2a36d552..2191782930 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "d3697d47929f34c43bcc4de16c7c761a80e97cf1", - "internalRef": "333502684" + "sha": "95b995cdecaf9cee0b17c9b829e4049457fdb019", + "internalRef": "334246086" } }, { From c4666acfe4257edece2bedb75f9336c5c04d00d6 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:51:31 -0700 Subject: [PATCH 12/14] feat: add Java microgen rules to imports Committer: @miraleung PiperOrigin-RevId: 334248254 Source-Author: Google APIs Source-Date: Mon Sep 28 15:15:56 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: f446e123bc04ee0ee0edfa112f4998182638322b Source-Link: https://github.com/googleapis/googleapis/commit/f446e123bc04ee0ee0edfa112f4998182638322b --- .../services/firestore_admin/async_client.py | 10 ++--- .../firestore_admin/transports/base.py | 10 ++--- .../services/firestore/async_client.py | 38 +++++++++---------- .../services/firestore/transports/base.py | 38 +++++++++---------- synth.metadata | 4 +- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 492c73e60f..38e6406eb5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index fe0dbaed78..ac4c4475f5 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( + exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, - exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index c8430e55b8..dd2efb1d01 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -947,9 +947,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -1031,9 +1031,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -1108,7 +1108,7 @@ async def batch_write( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.ServiceUnavailable, exceptions.Aborted, + exceptions.Aborted, exceptions.ServiceUnavailable, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 564c7c9dad..416bb3f723 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=300.0, @@ -250,9 +250,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=86400.0, @@ -265,9 +265,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, - exceptions.ServiceUnavailable, exceptions.InternalServerError, + exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -280,7 +280,7 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.ServiceUnavailable, exceptions.Aborted, + exceptions.Aborted, exceptions.ServiceUnavailable, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 2191782930..65928612b2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "95b995cdecaf9cee0b17c9b829e4049457fdb019", - "internalRef": "334246086" + "sha": "f446e123bc04ee0ee0edfa112f4998182638322b", + "internalRef": "334248254" } }, { From ae44c4c30915a224b9a17938f3aba463c8e69a45 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:52:31 -0700 Subject: [PATCH 13/14] fix(firestore/v1): give PartitionQuery retry/timeout config PiperOrigin-RevId: 335655077 Source-Author: Google APIs Source-Date: Tue Oct 6 09:23:11 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 610bf8f0262846bd1bc045a2913631c00e5e0199 Source-Link: https://github.com/googleapis/googleapis/commit/610bf8f0262846bd1bc045a2913631c00e5e0199 --- .../firestore_v1/services/firestore/async_client.py | 8 +++++++- .../firestore_v1/services/firestore/transports/base.py | 10 +++++++++- synth.metadata | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index dd2efb1d01..9fe3bf8369 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -833,7 +833,13 @@ async def partition_query( # and friendly error handling. rpc = gapic_v1.method_async.wrap_method( self._client._transport.partition_query, - default_timeout=None, + default_retry=retries.Retry( + initial=0.1, + maximum=60.0, + multiplier=1.3, + predicate=retries.if_exception_type(exceptions.ServiceUnavailable,), + ), + default_timeout=60.0, client_info=DEFAULT_CLIENT_INFO, ) diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index 416bb3f723..e6368d89f7 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -238,7 +238,15 @@ def _prep_wrapped_messages(self, client_info): client_info=client_info, ), self.partition_query: gapic_v1.method.wrap_method( - self.partition_query, default_timeout=None, client_info=client_info, + self.partition_query, + default_retry=retries.Retry( + initial=0.1, + maximum=60.0, + multiplier=1.3, + predicate=retries.if_exception_type(exceptions.ServiceUnavailable,), + ), + default_timeout=60.0, + client_info=client_info, ), self.write: gapic_v1.method.wrap_method( self.write, default_timeout=86400.0, client_info=client_info, diff --git a/synth.metadata b/synth.metadata index 65928612b2..958da910a2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "f446e123bc04ee0ee0edfa112f4998182638322b", - "internalRef": "334248254" + "sha": "610bf8f0262846bd1bc045a2913631c00e5e0199", + "internalRef": "335655077" } }, { From 9b640d6dd803fde840800c71c8e3be6ecb751be3 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 7 Oct 2020 05:52:31 -0700 Subject: [PATCH 14/14] feat: Add Dataproc Logging protos Document Dataproc Logging protos. autoscaler_log.proto contains protos for Dataproc Autoscaler logs (dataproc.googleapis.com/autoscaler). PiperOrigin-RevId: 335745163 Source-Author: Google APIs Source-Date: Tue Oct 6 16:27:27 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: 80eada6dbc452b58b4663fa3ab4f0b6746f49f80 Source-Link: https://github.com/googleapis/googleapis/commit/80eada6dbc452b58b4663fa3ab4f0b6746f49f80 --- .../services/firestore_admin/async_client.py | 10 ++--- .../firestore_admin/transports/base.py | 10 ++--- .../services/firestore/async_client.py | 38 +++++++++---------- .../services/firestore/transports/base.py | 38 +++++++++---------- synth.metadata | 4 +- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py index 38e6406eb5..492c73e60f 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/async_client.py @@ -273,9 +273,9 @@ async def list_indexes( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -361,9 +361,9 @@ async def get_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -436,9 +436,9 @@ async def delete_index( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -519,9 +519,9 @@ async def get_field( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -712,9 +712,9 @@ async def list_fields( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py index ac4c4475f5..fe0dbaed78 100644 --- a/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py +++ b/google/cloud/firestore_admin_v1/services/firestore_admin/transports/base.py @@ -124,9 +124,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -139,9 +139,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -154,9 +154,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -169,9 +169,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, @@ -187,9 +187,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.DeadlineExceeded, exceptions.InternalServerError, exceptions.ServiceUnavailable, + exceptions.DeadlineExceeded, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/async_client.py b/google/cloud/firestore_v1/services/firestore/async_client.py index 9fe3bf8369..b7f7e8547a 100644 --- a/google/cloud/firestore_v1/services/firestore/async_client.py +++ b/google/cloud/firestore_v1/services/firestore/async_client.py @@ -154,9 +154,9 @@ async def get_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -218,9 +218,9 @@ async def list_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -396,9 +396,9 @@ async def delete_document( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -458,9 +458,9 @@ def batch_get_documents( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -539,9 +539,9 @@ async def begin_transaction( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -710,9 +710,9 @@ async def rollback( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -770,9 +770,9 @@ def run_query( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -953,9 +953,9 @@ def listen( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=86400.0, @@ -1037,9 +1037,9 @@ async def list_collection_ids( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -1114,7 +1114,7 @@ async def batch_write( maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.Aborted, exceptions.ServiceUnavailable, + exceptions.ServiceUnavailable, exceptions.Aborted, ), ), default_timeout=60.0, diff --git a/google/cloud/firestore_v1/services/firestore/transports/base.py b/google/cloud/firestore_v1/services/firestore/transports/base.py index e6368d89f7..0a0f2bae68 100644 --- a/google/cloud/firestore_v1/services/firestore/transports/base.py +++ b/google/cloud/firestore_v1/services/firestore/transports/base.py @@ -117,9 +117,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -132,9 +132,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -158,9 +158,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -173,9 +173,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -188,9 +188,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -214,9 +214,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -229,9 +229,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=300.0, @@ -258,9 +258,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=86400.0, @@ -273,9 +273,9 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.InternalServerError, - exceptions.ServiceUnavailable, exceptions.DeadlineExceeded, + exceptions.ServiceUnavailable, + exceptions.InternalServerError, ), ), default_timeout=60.0, @@ -288,7 +288,7 @@ def _prep_wrapped_messages(self, client_info): maximum=60.0, multiplier=1.3, predicate=retries.if_exception_type( - exceptions.Aborted, exceptions.ServiceUnavailable, + exceptions.ServiceUnavailable, exceptions.Aborted, ), ), default_timeout=60.0, diff --git a/synth.metadata b/synth.metadata index 958da910a2..1b4bad6ad3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "610bf8f0262846bd1bc045a2913631c00e5e0199", - "internalRef": "335655077" + "sha": "80eada6dbc452b58b4663fa3ab4f0b6746f49f80", + "internalRef": "335745163" } }, {