Commit e167398
authored
chore: librarian update image pull request: 20260213T151402Z (#668)
feat: update image to
us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:a38add811f7f139d6a385b22d283ad09ef305b8cf50382ef62f0ce690787f021
Fixes b/4830547261 parent 400f511 commit e167398
15 files changed
Lines changed: 48 additions & 34 deletions
File tree
- packages/google-cloud-datastore
- .librarian
- google/cloud
- datastore_admin_v1
- services/datastore_admin
- transports
- types
- datastore_v1
- services/datastore
- types
- tests/unit/gapic
- datastore_admin_v1
- datastore_v1
| Original file line number | Diff line number | Diff 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 | ||
| 2 | 2 | libraries: | |
| 3 | 3 | - id: google-cloud-datastore | |
| 4 | 4 | version: 2.23.0 | |
Lines changed: 11 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,13 +45,13 @@ | |||
| 45 | 45 | except AttributeError: # pragma: NO COVER | |
| 46 | 46 | OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore | |
| 47 | 47 | ||
| 48 | - from google.api_core import operation # type: ignore | ||
| 49 | - from google.api_core import operation_async # type: ignore | ||
| 50 | 48 | from google.cloud.datastore_admin_v1.services.datastore_admin import pagers | |
| 51 | 49 | from google.cloud.datastore_admin_v1.types import datastore_admin | |
| 52 | 50 | from google.cloud.datastore_admin_v1.types import index | |
| 53 | 51 | 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 | ||
| 55 | 55 | from .transports.base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO | |
| 56 | 56 | from .transports.grpc_asyncio import DatastoreAdminGrpcAsyncIOTransport | |
| 57 | 57 | from .client import DatastoreAdminClient | |
@@ -170,7 +170,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): | |||
| 170 | 170 | Returns: | |
| 171 | 171 | DatastoreAdminAsyncClient: The constructed client. | |
| 172 | 172 | """ | |
| 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) | ||
| 174 | 177 | ||
| 175 | 178 | @classmethod | |
| 176 | 179 | def from_service_account_file(cls, filename: str, *args, **kwargs): | |
@@ -186,7 +189,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): | |||
| 186 | 189 | Returns: | |
| 187 | 190 | DatastoreAdminAsyncClient: The constructed client. | |
| 188 | 191 | """ | |
| 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) | ||
| 190 | 196 | ||
| 191 | 197 | from_service_account_json = from_service_account_file | |
| 192 | 198 | ||
packages/google-cloud-datastore/google/cloud/datastore_admin_v1/services/datastore_admin/client.py
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -61,13 +61,13 @@ | |||
| 61 | 61 | ||
| 62 | 62 | _LOGGER = std_logging.getLogger(__name__) | |
| 63 | 63 | ||
| 64 | - from google.api_core import operation # type: ignore | ||
| 65 | - from google.api_core import operation_async # type: ignore | ||
| 66 | 64 | from google.cloud.datastore_admin_v1.services.datastore_admin import pagers | |
| 67 | 65 | from google.cloud.datastore_admin_v1.types import datastore_admin | |
| 68 | 66 | from google.cloud.datastore_admin_v1.types import index | |
| 69 | 67 | 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 | ||
| 71 | 71 | from .transports.base import DatastoreAdminTransport, DEFAULT_CLIENT_INFO | |
| 72 | 72 | from .transports.grpc import DatastoreAdminGrpcTransport | |
| 73 | 73 | from .transports.grpc_asyncio import DatastoreAdminGrpcAsyncIOTransport | |
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -796,7 +796,7 @@ def __call__( | |||
| 796 | 796 | ) | |
| 797 | 797 | method = transcoded_request["method"] | |
| 798 | 798 | try: | |
| 799 | - request_payload = json_format.MessageToJson(request) | ||
| 799 | + request_payload = type(request).to_json(request) | ||
| 800 | 800 | except: | |
| 801 | 801 | request_payload = None | |
| 802 | 802 | http_request = { | |
@@ -943,7 +943,7 @@ def __call__( | |||
| 943 | 943 | ) | |
| 944 | 944 | method = transcoded_request["method"] | |
| 945 | 945 | try: | |
| 946 | - request_payload = json_format.MessageToJson(request) | ||
| 946 | + request_payload = type(request).to_json(request) | ||
| 947 | 947 | except: | |
| 948 | 948 | request_payload = None | |
| 949 | 949 | http_request = { | |
@@ -1094,7 +1094,7 @@ def __call__( | |||
| 1094 | 1094 | ) | |
| 1095 | 1095 | method = transcoded_request["method"] | |
| 1096 | 1096 | try: | |
| 1097 | - request_payload = json_format.MessageToJson(request) | ||
| 1097 | + request_payload = type(request).to_json(request) | ||
| 1098 | 1098 | except: | |
| 1099 | 1099 | request_payload = None | |
| 1100 | 1100 | http_request = { | |
@@ -1395,7 +1395,7 @@ def __call__( | |||
| 1395 | 1395 | ) | |
| 1396 | 1396 | method = transcoded_request["method"] | |
| 1397 | 1397 | try: | |
| 1398 | - request_payload = json_format.MessageToJson(request) | ||
| 1398 | + request_payload = type(request).to_json(request) | ||
| 1399 | 1399 | except: | |
| 1400 | 1400 | request_payload = None | |
| 1401 | 1401 | http_request = { | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | 22 | from google.cloud.datastore_admin_v1.types import index as gda_index | |
| 23 | 23 | 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 | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | 27 | __protobuf__ = proto.module( | |
Lines changed: 9 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -51,7 +51,7 @@ | |||
| 51 | 51 | from google.cloud.datastore_v1.types import query | |
| 52 | 52 | from google.cloud.datastore_v1.types import query_profile | |
| 53 | 53 | 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 | ||
| 55 | 55 | from .transports.base import DatastoreTransport, DEFAULT_CLIENT_INFO | |
| 56 | 56 | from .transports.grpc_asyncio import DatastoreGrpcAsyncIOTransport | |
| 57 | 57 | from .client import DatastoreClient | |
@@ -117,7 +117,10 @@ def from_service_account_info(cls, info: dict, *args, **kwargs): | |||
| 117 | 117 | Returns: | |
| 118 | 118 | DatastoreAsyncClient: The constructed client. | |
| 119 | 119 | """ | |
| 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) | ||
| 121 | 124 | ||
| 122 | 125 | @classmethod | |
| 123 | 126 | def from_service_account_file(cls, filename: str, *args, **kwargs): | |
@@ -133,7 +136,10 @@ def from_service_account_file(cls, filename: str, *args, **kwargs): | |||
| 133 | 136 | Returns: | |
| 134 | 137 | DatastoreAsyncClient: The constructed client. | |
| 135 | 138 | """ | |
| 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) | ||
| 137 | 143 | ||
| 138 | 144 | from_service_account_json = from_service_account_file | |
| 139 | 145 | ||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -67,7 +67,7 @@ | |||
| 67 | 67 | from google.cloud.datastore_v1.types import query | |
| 68 | 68 | from google.cloud.datastore_v1.types import query_profile | |
| 69 | 69 | 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 | ||
| 71 | 71 | from .transports.base import DatastoreTransport, DEFAULT_CLIENT_INFO | |
| 72 | 72 | from .transports.grpc import DatastoreGrpcTransport | |
| 73 | 73 | from .transports.grpc_asyncio import DatastoreGrpcAsyncIOTransport | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | 22 | from google.cloud.datastore_v1.types import entity | |
| 23 | 23 | 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 | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | 27 | __protobuf__ = proto.module( | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,7 +23,7 @@ | |||
| 23 | 23 | from google.cloud.datastore_v1.types import entity | |
| 24 | 24 | from google.cloud.datastore_v1.types import query as gd_query | |
| 25 | 25 | 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 | ||
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | 29 | __protobuf__ = proto.module( | |
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,9 +19,9 @@ | |||
| 19 | 19 | ||
| 20 | 20 | import proto # type: ignore | |
| 21 | 21 | ||
| 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 | ||
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | 27 | __protobuf__ = proto.module( | |
0 commit comments