chore: update gapic generated code

.librarian/generator-input/setup.py

@@ -90,10 +90,6 @@
     install_requires=dependencies,
     extras_require=extras,
     python_requires=">=3.7",
-    scripts=[
-        "scripts/fixup_firestore_v1_keywords.py",
-        "scripts/fixup_firestore_admin_v1_keywords.py",
-    ],
     include_package_data=True,
     zip_safe=False,
 )

.librarian/state.yaml

@@ -1,8 +1,8 @@
-image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:eec191fc4904c204cd717c79812cd66997b5559776483ee223f69c8f43e99224
+image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:b8058df4c45e9a6e07f6b4d65b458d0d059241dd34c814f151c8bf6b89211209
 libraries:
   - id: google-cloud-firestore
     version: 2.21.0
-    last_generated_commit: 659ea6e98acc7d58661ce2aa7b4cf76a7ef3fd42
+    last_generated_commit: 1a9d00bed77e6db82ff67764ffe14e3b5209f5cd
     apis:
       - path: google/firestore/v1
         service_config: firestore_v1.yaml

google/cloud/firestore_admin_v1/services/__init__.py

@@ -13,6 +13,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`

google/cloud/firestore_admin_v1/services/firestore_admin/__init__.py

@@ -13,12 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
-from .async_client import FirestoreAdminAsyncClient
 from .client import FirestoreAdminClient
+from .async_client import FirestoreAdminAsyncClient
 
 __all__ = (
     "FirestoreAdminClient",

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

@@ -13,16 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
-from collections import OrderedDict
 import logging as std_logging
+from collections import OrderedDict
 import re
 from typing import (
-    Callable,
     Dict,
+    Callable,
     Mapping,
     MutableMapping,
     MutableSequence,
@@ -33,15 +29,16 @@
     Union,
 )
 
+from google.cloud.firestore_admin_v1 import gapic_version as package_version
+
+from google.api_core.client_options import ClientOptions
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry_async as retries
-from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 import google.protobuf
 
-from google.cloud.firestore_admin_v1 import gapic_version as package_version
 
 try:
     OptionalRetry = Union[retries.AsyncRetry, gapic_v1.method._MethodDefault, None]
@@ -50,13 +47,6 @@
 
 from google.api_core import operation as gac_operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.cloud.location import locations_pb2  # type: ignore
-from google.longrunning import operations_pb2  # type: ignore
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
-
 from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
 from google.cloud.firestore_admin_v1.types import backup
 from google.cloud.firestore_admin_v1.types import database
@@ -70,10 +60,15 @@
 from google.cloud.firestore_admin_v1.types import schedule
 from google.cloud.firestore_admin_v1.types import user_creds
 from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
-
-from .client import FirestoreAdminClient
-from .transports.base import DEFAULT_CLIENT_INFO, FirestoreAdminTransport
+from google.cloud.location import locations_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
+from google.protobuf import duration_pb2  # type: ignore
+from google.protobuf import empty_pb2  # type: ignore
+from google.protobuf import field_mask_pb2  # type: ignore
+from google.protobuf import timestamp_pb2  # type: ignore
+from .transports.base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc_asyncio import FirestoreAdminGrpcAsyncIOTransport
+from .client import FirestoreAdminClient
 
 try:
     from google.api_core import client_logging  # type: ignore

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

@@ -13,19 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
 from collections import OrderedDict
 from http import HTTPStatus
 import json
 import logging as std_logging
 import os
 import re
 from typing import (
-    Callable,
     Dict,
+    Callable,
     Mapping,
     MutableMapping,
     MutableSequence,
@@ -38,19 +34,19 @@
 )
 import warnings
 
+from google.cloud.firestore_admin_v1 import gapic_version as package_version
+
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials  # type: ignore
-from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.auth.transport import mtls  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
+from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 import google.protobuf
 
-from google.cloud.firestore_admin_v1 import gapic_version as package_version
-
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
 except AttributeError:  # pragma: NO COVER
@@ -67,13 +63,6 @@
 
 from google.api_core import operation as gac_operation  # type: ignore
 from google.api_core import operation_async  # type: ignore
-from google.cloud.location import locations_pb2  # type: ignore
-from google.longrunning import operations_pb2  # type: ignore
-from google.protobuf import duration_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
-from google.protobuf import field_mask_pb2  # type: ignore
-from google.protobuf import timestamp_pb2  # type: ignore
-
 from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
 from google.cloud.firestore_admin_v1.types import backup
 from google.cloud.firestore_admin_v1.types import database
@@ -87,8 +76,13 @@
 from google.cloud.firestore_admin_v1.types import schedule
 from google.cloud.firestore_admin_v1.types import user_creds
 from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
-
-from .transports.base import DEFAULT_CLIENT_INFO, FirestoreAdminTransport
+from google.cloud.location import locations_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
+from google.protobuf import duration_pb2  # type: ignore
+from google.protobuf import empty_pb2  # type: ignore
+from google.protobuf import field_mask_pb2  # type: ignore
+from google.protobuf import timestamp_pb2  # type: ignore
+from .transports.base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
 from .transports.grpc import FirestoreAdminGrpcTransport
 from .transports.grpc_asyncio import FirestoreAdminGrpcAsyncIOTransport
 from .transports.rest import FirestoreAdminRestTransport

google/cloud/firestore_admin_v1/services/firestore_admin/pagers.py

@@ -13,26 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
+from google.api_core import gapic_v1
+from google.api_core import retry as retries
+from google.api_core import retry_async as retries_async
 from typing import (
     Any,
     AsyncIterator,
     Awaitable,
     Callable,
-    Iterator,
-    Optional,
     Sequence,
     Tuple,
+    Optional,
+    Iterator,
     Union,
 )
 
-from google.api_core import gapic_v1
-from google.api_core import retry as retries
-from google.api_core import retry_async as retries_async
-
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault, None]
     OptionalAsyncRetry = Union[
@@ -42,7 +37,9 @@
     OptionalRetry = Union[retries.Retry, object, None]  # type: ignore
     OptionalAsyncRetry = Union[retries_async.AsyncRetry, object, None]  # type: ignore
 
-from google.cloud.firestore_admin_v1.types import field, firestore_admin, index
+from google.cloud.firestore_admin_v1.types import field
+from google.cloud.firestore_admin_v1.types import firestore_admin
+from google.cloud.firestore_admin_v1.types import index
 
 
 class ListIndexesPager:

google/cloud/firestore_admin_v1/services/firestore_admin/transports/README.rst

@@ -1,6 +1,3 @@
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
 
 transport inheritance structure
 _______________________________

google/cloud/firestore_admin_v1/services/firestore_admin/transports/__init__.py

@@ -13,17 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
 from collections import OrderedDict
 from typing import Dict, Type
 
 from .base import FirestoreAdminTransport
 from .grpc import FirestoreAdminGrpcTransport
 from .grpc_asyncio import FirestoreAdminGrpcAsyncIOTransport
-from .rest import FirestoreAdminRestInterceptor, FirestoreAdminRestTransport
+from .rest import FirestoreAdminRestTransport
+from .rest import FirestoreAdminRestInterceptor
+
 
 # Compile a registry of transports.
 _transport_registry = OrderedDict()  # type: Dict[str, Type[FirestoreAdminTransport]]

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

@@ -13,36 +13,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
 
+from google.cloud.firestore_admin_v1 import gapic_version as package_version
+
+import google.auth  # type: ignore
 import google.api_core
 from google.api_core import exceptions as core_exceptions
-from google.api_core import gapic_v1, operations_v1
+from google.api_core import gapic_v1
 from google.api_core import retry as retries
-import google.auth  # type: ignore
+from google.api_core import operations_v1
 from google.auth import credentials as ga_credentials  # type: ignore
-from google.cloud.location import locations_pb2  # type: ignore
-from google.longrunning import operations_pb2  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 import google.protobuf
-from google.protobuf import empty_pb2  # type: ignore
 
-from google.cloud.firestore_admin_v1 import gapic_version as package_version
-from google.cloud.firestore_admin_v1.types import (
-    backup,
-    database,
-    field,
-    firestore_admin,
-    index,
-    schedule,
-)
+from google.cloud.firestore_admin_v1.types import backup
+from google.cloud.firestore_admin_v1.types import database
+from google.cloud.firestore_admin_v1.types import field
+from google.cloud.firestore_admin_v1.types import firestore_admin
+from google.cloud.firestore_admin_v1.types import index
+from google.cloud.firestore_admin_v1.types import schedule
 from google.cloud.firestore_admin_v1.types import user_creds
 from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
+from google.cloud.location import locations_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
+from google.protobuf import empty_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
     gapic_version=package_version.__version__

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

@@ -13,40 +13,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# DO NOT EDIT THIS FILE OUTSIDE OF `.librarian/generator-input`
-# The source of truth for this file is `.librarian/generator-input`
-
 import json
 import logging as std_logging
 import pickle
-from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 import warnings
+from typing import Callable, Dict, Optional, Sequence, Tuple, Union
 
-from google.api_core import gapic_v1, grpc_helpers, operations_v1
+from google.api_core import grpc_helpers
+from google.api_core import operations_v1
+from google.api_core import gapic_v1
 import google.auth  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-from google.cloud.location import locations_pb2  # type: ignore
-from google.longrunning import operations_pb2  # type: ignore
-from google.protobuf import empty_pb2  # type: ignore
 from google.protobuf.json_format import MessageToJson
 import google.protobuf.message
+
 import grpc  # type: ignore
 import proto  # type: ignore
 
-from google.cloud.firestore_admin_v1.types import (
-    backup,
-    database,
-    field,
-    firestore_admin,
-    index,
-    schedule,
-)
+from google.cloud.firestore_admin_v1.types import backup
+from google.cloud.firestore_admin_v1.types import database
+from google.cloud.firestore_admin_v1.types import field
+from google.cloud.firestore_admin_v1.types import firestore_admin
+from google.cloud.firestore_admin_v1.types import index
+from google.cloud.firestore_admin_v1.types import schedule
 from google.cloud.firestore_admin_v1.types import user_creds
 from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
-
-from .base import DEFAULT_CLIENT_INFO, FirestoreAdminTransport
+from google.cloud.location import locations_pb2  # type: ignore
+from google.longrunning import operations_pb2  # type: ignore
+from google.protobuf import empty_pb2  # type: ignore
+from .base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
 
 try:
     from google.api_core import client_logging  # type: ignore