Skip to content
This repository was archived by the owner on Mar 2, 2026. It is now read-only.

Commit 8cdb37d

Browse files
partheaparthea
authored
chore: librarian update image pull request: 20260219T183840Z (#1172)
feat: update image to us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021
1 parent e16f3be commit 8cdb37d

File tree

33 files changed

+112
-92
lines changed

33 files changed

+112
-92
lines changed

‎.librarian/generator-input/librarian.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def update_fixup_scripts(path):
5959
for library in s.get_staging_dirs():
6060
s.replace(
6161
library / "google/cloud/bundle/types/bundle.py",
62-
"from google.firestore.v1 import document_pb2 # type: ignore\n"
63-
"from google.firestore.v1 import query_pb2 # type: ignore",
62+
"import google.firestore.v1.document_pb2 as document_pb2 # type: ignore\n"
63+
"import google.firestore.v1.query_pb2 as query_pb2 # type: ignore",
6464
"from google.cloud.firestore_v1.types import document as document_pb2 # type: ignore\n"
6565
"from google.cloud.firestore_v1.types import query as query_pb2 # type: ignore"
6666
)

‎.librarian/state.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:b8058df4c45e9a6e07f6b4d65b458d0d059241dd34c814f151c8bf6b89211209
1+
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021
22
libraries:
33
- id: google-cloud-firestore
44
version: 2.23.0

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
except AttributeError: # pragma: NO COVER
4646
OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore
4747

48-
from google.api_core import operation as gac_operation # type: ignore
49-
from google.api_core import operation_async # type: ignore
5048
from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
5149
from google.cloud.firestore_admin_v1.types import backup
5250
from google.cloud.firestore_admin_v1.types import database
@@ -63,10 +61,12 @@
6361
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
6462
from google.cloud.location import locations_pb2 # type: ignore
6563
from google.longrunning import operations_pb2 # type: ignore
66-
from google.protobuf import duration_pb2 # type: ignore
67-
from google.protobuf import empty_pb2 # type: ignore
68-
from google.protobuf import field_mask_pb2 # type: ignore
69-
from google.protobuf import timestamp_pb2 # type: ignore
64+
import google.api_core.operation as gac_operation # type: ignore
65+
import google.api_core.operation_async as operation_async # type: ignore
66+
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
67+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
68+
import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore
69+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
7070
from .transports.base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
7171
from .transports.grpc_asyncio import FirestoreAdminGrpcAsyncIOTransport
7272
from .client import FirestoreAdminClient
@@ -184,7 +184,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
184184
Returns:
185185
FirestoreAdminAsyncClient: The constructed client.
186186
"""
187-
return FirestoreAdminClient.from_service_account_info.__func__(FirestoreAdminAsyncClient, info, *args, **kwargs) # type: ignore
187+
sa_info_func = (
188+
FirestoreAdminClient.from_service_account_info.__func__ # type: ignore
189+
)
190+
return sa_info_func(FirestoreAdminAsyncClient, info, *args, **kwargs)
188191

189192
@classmethod
190193
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -200,7 +203,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
200203
Returns:
201204
FirestoreAdminAsyncClient: The constructed client.
202205
"""
203-
return FirestoreAdminClient.from_service_account_file.__func__(FirestoreAdminAsyncClient, filename, *args, **kwargs) # type: ignore
206+
sa_file_func = (
207+
FirestoreAdminClient.from_service_account_file.__func__ # type: ignore
208+
)
209+
return sa_file_func(FirestoreAdminAsyncClient, filename, *args, **kwargs)
204210

205211
from_service_account_json = from_service_account_file
206212

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161

6262
_LOGGER = std_logging.getLogger(__name__)
6363

64-
from google.api_core import operation as gac_operation # type: ignore
65-
from google.api_core import operation_async # type: ignore
6664
from google.cloud.firestore_admin_v1.services.firestore_admin import pagers
6765
from google.cloud.firestore_admin_v1.types import backup
6866
from google.cloud.firestore_admin_v1.types import database
@@ -79,10 +77,12 @@
7977
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
8078
from google.cloud.location import locations_pb2 # type: ignore
8179
from google.longrunning import operations_pb2 # type: ignore
82-
from google.protobuf import duration_pb2 # type: ignore
83-
from google.protobuf import empty_pb2 # type: ignore
84-
from google.protobuf import field_mask_pb2 # type: ignore
85-
from google.protobuf import timestamp_pb2 # type: ignore
80+
import google.api_core.operation as gac_operation # type: ignore
81+
import google.api_core.operation_async as operation_async # type: ignore
82+
import google.protobuf.duration_pb2 as duration_pb2 # type: ignore
83+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
84+
import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore
85+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
8686
from .transports.base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
8787
from .transports.grpc import FirestoreAdminGrpcTransport
8888
from .transports.grpc_asyncio import FirestoreAdminGrpcAsyncIOTransport

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
3939
from google.cloud.location import locations_pb2 # type: ignore
4040
from google.longrunning import operations_pb2 # type: ignore
41-
from google.protobuf import empty_pb2 # type: ignore
41+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
4242

4343
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(
4444
gapic_version=package_version.__version__
@@ -97,8 +97,6 @@ def __init__(
9797
be used for service account credentials.
9898
"""
9999

100-
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
101-
102100
# Save the scopes.
103101
self._scopes = scopes
104102
if not hasattr(self, "_ignore_credentials"):
@@ -113,11 +111,16 @@ def __init__(
113111

114112
if credentials_file is not None:
115113
credentials, _ = google.auth.load_credentials_from_file(
116-
credentials_file, **scopes_kwargs, quota_project_id=quota_project_id
114+
credentials_file,
115+
scopes=scopes,
116+
quota_project_id=quota_project_id,
117+
default_scopes=self.AUTH_SCOPES,
117118
)
118119
elif credentials is None and not self._ignore_credentials:
119120
credentials, _ = google.auth.default(
120-
**scopes_kwargs, quota_project_id=quota_project_id
121+
scopes=scopes,
122+
quota_project_id=quota_project_id,
123+
default_scopes=self.AUTH_SCOPES,
121124
)
122125
# Don't apply audience if the credentials file passed from user.
123126
if hasattr(credentials, "with_gdch_audience"):

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
4242
from google.cloud.location import locations_pb2 # type: ignore
4343
from google.longrunning import operations_pb2 # type: ignore
44-
from google.protobuf import empty_pb2 # type: ignore
44+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
4545
from .base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
4646

4747
try:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
4545
from google.cloud.location import locations_pb2 # type: ignore
4646
from google.longrunning import operations_pb2 # type: ignore
47-
from google.protobuf import empty_pb2 # type: ignore
47+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
4848
from .base import FirestoreAdminTransport, DEFAULT_CLIENT_INFO
4949
from .grpc import FirestoreAdminGrpcTransport
5050

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from google.cloud.firestore_admin_v1.types import schedule
4444
from google.cloud.firestore_admin_v1.types import user_creds
4545
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
46-
from google.protobuf import empty_pb2 # type: ignore
46+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
4747
from google.longrunning import operations_pb2 # type: ignore
4848

4949

@@ -2105,7 +2105,7 @@ def __call__(
21052105
)
21062106
method = transcoded_request["method"]
21072107
try:
2108-
request_payload = json_format.MessageToJson(request)
2108+
request_payload = type(request).to_json(request)
21092109
except:
21102110
request_payload = None
21112111
http_request = {
@@ -2257,7 +2257,7 @@ def __call__(
22572257
)
22582258
method = transcoded_request["method"]
22592259
try:
2260-
request_payload = json_format.MessageToJson(request)
2260+
request_payload = type(request).to_json(request)
22612261
except:
22622262
request_payload = None
22632263
http_request = {
@@ -2569,7 +2569,7 @@ def __call__(
25692569
)
25702570
method = transcoded_request["method"]
25712571
try:
2572-
request_payload = json_format.MessageToJson(request)
2572+
request_payload = type(request).to_json(request)
25732573
except:
25742574
request_payload = None
25752575
http_request = {
@@ -2721,7 +2721,7 @@ def __call__(
27212721
)
27222722
method = transcoded_request["method"]
27232723
try:
2724-
request_payload = json_format.MessageToJson(request)
2724+
request_payload = type(request).to_json(request)
27252725
except:
27262726
request_payload = None
27272727
http_request = {
@@ -3014,7 +3014,7 @@ def __call__(
30143014
)
30153015
method = transcoded_request["method"]
30163016
try:
3017-
request_payload = json_format.MessageToJson(request)
3017+
request_payload = type(request).to_json(request)
30183018
except:
30193019
request_payload = None
30203020
http_request = {
@@ -3124,7 +3124,7 @@ def __call__(
31243124
)
31253125
method = transcoded_request["method"]
31263126
try:
3127-
request_payload = json_format.MessageToJson(request)
3127+
request_payload = type(request).to_json(request)
31283128
except:
31293129
request_payload = None
31303130
http_request = {
@@ -3238,7 +3238,7 @@ def __call__(
32383238
)
32393239
method = transcoded_request["method"]
32403240
try:
3241-
request_payload = json_format.MessageToJson(request)
3241+
request_payload = type(request).to_json(request)
32423242
except:
32433243
request_payload = None
32443244
http_request = {
@@ -3377,7 +3377,7 @@ def __call__(
33773377
)
33783378
method = transcoded_request["method"]
33793379
try:
3380-
request_payload = json_format.MessageToJson(request)
3380+
request_payload = type(request).to_json(request)
33813381
except:
33823382
request_payload = None
33833383
http_request = {
@@ -3486,7 +3486,7 @@ def __call__(
34863486
)
34873487
method = transcoded_request["method"]
34883488
try:
3489-
request_payload = json_format.MessageToJson(request)
3489+
request_payload = type(request).to_json(request)
34903490
except:
34913491
request_payload = None
34923492
http_request = {
@@ -3913,7 +3913,7 @@ def __call__(
39133913
)
39143914
method = transcoded_request["method"]
39153915
try:
3916-
request_payload = json_format.MessageToJson(request)
3916+
request_payload = type(request).to_json(request)
39173917
except:
39183918
request_payload = None
39193919
http_request = {
@@ -4970,7 +4970,7 @@ def __call__(
49704970
)
49714971
method = transcoded_request["method"]
49724972
try:
4973-
request_payload = json_format.MessageToJson(request)
4973+
request_payload = type(request).to_json(request)
49744974
except:
49754975
request_payload = None
49764976
http_request = {
@@ -6175,7 +6175,7 @@ def __call__(
61756175
)
61766176
method = transcoded_request["method"]
61776177
try:
6178-
request_payload = json_format.MessageToJson(request)
6178+
request_payload = type(request).to_json(request)
61796179
except:
61806180
request_payload = None
61816181
http_request = {
@@ -6487,7 +6487,7 @@ def __call__(
64876487
)
64886488
method = transcoded_request["method"]
64896489
try:
6490-
request_payload = json_format.MessageToJson(request)
6490+
request_payload = type(request).to_json(request)
64916491
except:
64926492
request_payload = None
64936493
http_request = {
@@ -6639,7 +6639,7 @@ def __call__(
66396639
)
66406640
method = transcoded_request["method"]
66416641
try:
6642-
request_payload = json_format.MessageToJson(request)
6642+
request_payload = type(request).to_json(request)
66436643
except:
66446644
request_payload = None
66456645
http_request = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from google.cloud.firestore_admin_v1.types import schedule
3434
from google.cloud.firestore_admin_v1.types import user_creds
3535
from google.cloud.firestore_admin_v1.types import user_creds as gfa_user_creds
36-
from google.protobuf import empty_pb2 # type: ignore
36+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
3737
from google.longrunning import operations_pb2 # type: ignore
3838

3939

‎google/cloud/firestore_admin_v1/types/backup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import proto # type: ignore
2121

22-
from google.protobuf import timestamp_pb2 # type: ignore
22+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
2323

2424

2525
__protobuf__ = proto.module(

0 commit comments

Comments
 (0)