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

Commit 25ee50c

Browse files
partheaparthea
authored
Merge branch 'main' into renovate/all
2 parents 74bbd7b + d718104 commit 25ee50c

File tree

14 files changed

+47
-33
lines changed

14 files changed

+47
-33
lines changed

‎.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:51d42b9060365aa10d21e64a370b82bf1e07ed7f1e46062dcb3ad10632b0acc8
1+
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021
22
libraries:
33
- id: google-cloud-datastore
44
version: 2.23.0

‎google/cloud/datastore_admin_v1/services/datastore_admin/async_client.py‎

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

48-
from google.api_core import operation # type: ignore
49-
from google.api_core import operation_async # type: ignore
5048
from google.cloud.datastore_admin_v1.services.datastore_admin import pagers
5149
from google.cloud.datastore_admin_v1.types import datastore_admin
5250
from google.cloud.datastore_admin_v1.types import index
5351
from google.longrunning import operations_pb2 # type: ignore
54-
from google.protobuf import empty_pb2 # type: ignore
52+
import google.api_core.operation as operation # type: ignore
53+
import google.api_core.operation_async as operation_async # type: ignore
54+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
5555
from .transports.base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO
5656
from .transports.grpc_asyncio import DatastoreAdminGrpcAsyncIOTransport
5757
from .client import DatastoreAdminClient
@@ -170,7 +170,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
170170
Returns:
171171
DatastoreAdminAsyncClient: The constructed client.
172172
"""
173-
return DatastoreAdminClient.from_service_account_info.__func__(DatastoreAdminAsyncClient, info, *args, **kwargs) # type: ignore
173+
sa_info_func = (
174+
DatastoreAdminClient.from_service_account_info.__func__ # type: ignore
175+
)
176+
return sa_info_func(DatastoreAdminAsyncClient, info, *args, **kwargs)
174177

175178
@classmethod
176179
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -186,7 +189,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
186189
Returns:
187190
DatastoreAdminAsyncClient: The constructed client.
188191
"""
189-
return DatastoreAdminClient.from_service_account_file.__func__(DatastoreAdminAsyncClient, filename, *args, **kwargs) # type: ignore
192+
sa_file_func = (
193+
DatastoreAdminClient.from_service_account_file.__func__ # type: ignore
194+
)
195+
return sa_file_func(DatastoreAdminAsyncClient, filename, *args, **kwargs)
190196

191197
from_service_account_json = from_service_account_file
192198

‎google/cloud/datastore_admin_v1/services/datastore_admin/client.py‎

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

6262
_LOGGER = std_logging.getLogger(__name__)
6363

64-
from google.api_core import operation # type: ignore
65-
from google.api_core import operation_async # type: ignore
6664
from google.cloud.datastore_admin_v1.services.datastore_admin import pagers
6765
from google.cloud.datastore_admin_v1.types import datastore_admin
6866
from google.cloud.datastore_admin_v1.types import index
6967
from google.longrunning import operations_pb2 # type: ignore
70-
from google.protobuf import empty_pb2 # type: ignore
68+
import google.api_core.operation as operation # type: ignore
69+
import google.api_core.operation_async as operation_async # type: ignore
70+
import google.protobuf.empty_pb2 as empty_pb2 # type: ignore
7171
from .transports.base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO
7272
from .transports.grpc import DatastoreAdminGrpcTransport
7373
from .transports.grpc_asyncio import DatastoreAdminGrpcAsyncIOTransport

‎google/cloud/datastore_admin_v1/services/datastore_admin/transports/rest.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ def __call__(
796796
)
797797
method = transcoded_request["method"]
798798
try:
799-
request_payload = json_format.MessageToJson(request)
799+
request_payload = type(request).to_json(request)
800800
except:
801801
request_payload = None
802802
http_request = {
@@ -943,7 +943,7 @@ def __call__(
943943
)
944944
method = transcoded_request["method"]
945945
try:
946-
request_payload = json_format.MessageToJson(request)
946+
request_payload = type(request).to_json(request)
947947
except:
948948
request_payload = None
949949
http_request = {
@@ -1094,7 +1094,7 @@ def __call__(
10941094
)
10951095
method = transcoded_request["method"]
10961096
try:
1097-
request_payload = json_format.MessageToJson(request)
1097+
request_payload = type(request).to_json(request)
10981098
except:
10991099
request_payload = None
11001100
http_request = {
@@ -1395,7 +1395,7 @@ def __call__(
13951395
)
13961396
method = transcoded_request["method"]
13971397
try:
1398-
request_payload = json_format.MessageToJson(request)
1398+
request_payload = type(request).to_json(request)
13991399
except:
14001400
request_payload = None
14011401
http_request = {

‎google/cloud/datastore_admin_v1/types/datastore_admin.py‎

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

2222
from google.cloud.datastore_admin_v1.types import index as gda_index
2323
from google.cloud.datastore_admin_v1.types import migration
24-
from google.protobuf import timestamp_pb2 # type: ignore
24+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
2525

2626

2727
__protobuf__ = proto.module(

‎google/cloud/datastore_v1/services/datastore/async_client.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
from google.cloud.datastore_v1.types import query
5252
from google.cloud.datastore_v1.types import query_profile
5353
from google.longrunning import operations_pb2 # type: ignore
54-
from google.protobuf import timestamp_pb2 # type: ignore
54+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
5555
from .transports.base import DatastoreTransport, DEFAULT_CLIENT_INFO
5656
from .transports.grpc_asyncio import DatastoreGrpcAsyncIOTransport
5757
from .client import DatastoreClient
@@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs):
117117
Returns:
118118
DatastoreAsyncClient: The constructed client.
119119
"""
120-
return DatastoreClient.from_service_account_info.__func__(DatastoreAsyncClient, info, *args, **kwargs) # type: ignore
120+
sa_info_func = (
121+
DatastoreClient.from_service_account_info.__func__ # type: ignore
122+
)
123+
return sa_info_func(DatastoreAsyncClient, info, *args, **kwargs)
121124

122125
@classmethod
123126
def from_service_account_file(cls, filename: str, *args, **kwargs):
@@ -133,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs):
133136
Returns:
134137
DatastoreAsyncClient: The constructed client.
135138
"""
136-
return DatastoreClient.from_service_account_file.__func__(DatastoreAsyncClient, filename, *args, **kwargs) # type: ignore
139+
sa_file_func = (
140+
DatastoreClient.from_service_account_file.__func__ # type: ignore
141+
)
142+
return sa_file_func(DatastoreAsyncClient, filename, *args, **kwargs)
137143

138144
from_service_account_json = from_service_account_file
139145

‎google/cloud/datastore_v1/services/datastore/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
from google.cloud.datastore_v1.types import query
6868
from google.cloud.datastore_v1.types import query_profile
6969
from google.longrunning import operations_pb2 # type: ignore
70-
from google.protobuf import timestamp_pb2 # type: ignore
70+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
7171
from .transports.base import DatastoreTransport, DEFAULT_CLIENT_INFO
7272
from .transports.grpc import DatastoreGrpcTransport
7373
from .transports.grpc_asyncio import DatastoreGrpcAsyncIOTransport

‎google/cloud/datastore_v1/types/aggregation_result.py‎

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

2222
from google.cloud.datastore_v1.types import entity
2323
from google.cloud.datastore_v1.types import query
24-
from google.protobuf import timestamp_pb2 # type: ignore
24+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
2525

2626

2727
__protobuf__ = proto.module(

‎google/cloud/datastore_v1/types/datastore.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from google.cloud.datastore_v1.types import entity
2424
from google.cloud.datastore_v1.types import query as gd_query
2525
from google.cloud.datastore_v1.types import query_profile
26-
from google.protobuf import timestamp_pb2 # type: ignore
26+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
2727

2828

2929
__protobuf__ = proto.module(

‎google/cloud/datastore_v1/types/entity.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import proto # type: ignore
2121

22-
from google.protobuf import struct_pb2 # type: ignore
23-
from google.protobuf import timestamp_pb2 # type: ignore
24-
from google.type import latlng_pb2 # type: ignore
22+
import google.protobuf.struct_pb2 as struct_pb2 # type: ignore
23+
import google.protobuf.timestamp_pb2 as timestamp_pb2 # type: ignore
24+
import google.type.latlng_pb2 as latlng_pb2 # type: ignore
2525

2626

2727
__protobuf__ = proto.module(

0 commit comments

Comments
 (0)