Skip to content

Commit fde9109

Browse files
lukesneeringerlukesneeringer
authored
New Datastore auto-gen. (googleapis#4348)
1 parent 6c60282 commit fde9109

29 files changed

Lines changed: 4703 additions & 144 deletions

‎datastore/google/cloud/datastore/_gax.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
import contextlib
1919
import sys
2020

21-
from google.cloud.gapic.datastore.v1 import datastore_client
21+
from google.api_core.gapic_v1 import client_info
22+
from google.cloud.datastore_v1.gapic import datastore_client
2223
from google.gax.errors import GaxError
2324
from google.gax.grpc import exc_to_code
2425
from google.gax.utils import metrics
@@ -231,4 +232,9 @@ def make_datastore_api(client):
231232
channel = insecure_channel(host)
232233

233234
return GAPICDatastoreAPI(
234-
channel=channel, lib_name='gccl', lib_version=__version__)
235+
channel=channel,
236+
client_info=client_info.ClientInfo(
237+
client_library_version=__version__,
238+
gapic_version=__version__,
239+
),
240+
)

‎datastore/google/cloud/datastore/_http.py‎

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

1919
from google.cloud import _http as connection_module
2020
from google.cloud import exceptions
21-
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
21+
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2
2222

2323
from google.cloud.datastore import __version__
2424

‎datastore/google/cloud/datastore/batch.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"""
2323

2424
from google.cloud.datastore import helpers
25-
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
25+
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2
2626

2727

2828
class Batch(object):

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import os
1717

18-
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
18+
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2
1919

2020
from google.cloud._helpers import _LocalStack
2121
from google.cloud._helpers import (
@@ -135,7 +135,10 @@ def _extended_lookup(datastore_api, project, key_pbs,
135135
while loop_num < _MAX_LOOPS: # loop against possible deferred.
136136
loop_num += 1
137137
lookup_response = datastore_api.lookup(
138-
project, read_options, key_pbs)
138+
project_id=project,
139+
read_options=read_options,
140+
keys=key_pbs,
141+
)
139142

140143
# Accumulate the new results.
141144
results.extend(result.entity for result in lookup_response.found)

‎datastore/google/cloud/datastore/helpers.py‎

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

2727
from google.cloud._helpers import _datetime_to_pb_timestamp
2828
from google.cloud._helpers import _pb_timestamp_to_datetime
29-
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
29+
from google.cloud.datastore_v1.proto import entity_pb2 as _entity_pb2
3030
from google.cloud.datastore.entity import Entity
3131
from google.cloud.datastore.key import Key
3232

‎datastore/google/cloud/datastore/key.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import copy
1919
import six
2020

21-
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
21+
from google.cloud.datastore_v1.proto import entity_pb2 as _entity_pb2
2222

2323
from google.cloud._helpers import _to_bytes
2424
from google.cloud.datastore import _app_engine_key_pb2

‎datastore/google/cloud/datastore/query.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from google.api_core import page_iterator
2020
from google.cloud._helpers import _ensure_tuple_or_list
2121

22-
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
23-
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
24-
from google.cloud.proto.datastore.v1 import query_pb2 as _query_pb2
22+
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2
23+
from google.cloud.datastore_v1.proto import entity_pb2 as _entity_pb2
24+
from google.cloud.datastore_v1.proto import query_pb2 as _query_pb2
2525
from google.cloud.datastore import helpers
2626
from google.cloud.datastore.key import Key
2727

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2017, Google LLC All rights reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
from __future__ import absolute_import
16+
17+
from google.cloud.datastore_v1 import types
18+
from google.cloud.datastore_v1.gapic import datastore_client
19+
from google.cloud.datastore_v1.gapic import enums
20+
21+
22+
class DatastoreClient(datastore_client.DatastoreClient):
23+
__doc__ = datastore_client.DatastoreClient.__doc__
24+
enums = enums
25+
26+
27+
__all__ = (
28+
'enums',
29+
'types',
30+
'DatastoreClient', )

‎datastore/google/cloud/datastore_v1/gapic/__init__.py‎

Whitespace-only changes.

0 commit comments

Comments
 (0)