Thanks to visit codestin.com
Credit goes to github.com

Skip to content

New Datastore auto-gen. #4348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukesneeringer merged 3 commits into from
Nov 8, 2017
Merged

New Datastore auto-gen. #4348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b1c15a
New Datastore GAPIC.
Nov 6, 2017
9246de7
Update manual layer to route arguments correctly.
Nov 8, 2017
28d60ad
Update unit tests to use keyword arguments also.
Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions datastore/google/cloud/datastore/_gax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
import contextlib
import sys

from google.cloud.gapic.datastore.v1 import datastore_client
from google.api_core.gapic_v1 import client_info
from google.cloud.datastore_v1.gapic import datastore_client
from google.gax.errors import GaxError
from google.gax.grpc import exc_to_code
from google.gax.utils import metrics
Expand Down Expand Up @@ -231,4 +232,9 @@ def make_datastore_api(client):
channel = insecure_channel(host)

return GAPICDatastoreAPI(
channel=channel, lib_name='gccl', lib_version=__version__)
channel=channel,
client_info=client_info.ClientInfo(
client_library_version=__version__,
gapic_version=__version__,
),
)
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

from google.cloud import _http as connection_module
from google.cloud import exceptions
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2

from google.cloud.datastore import __version__

Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"""

from google.cloud.datastore import helpers
from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2


class Batch(object):
Expand Down
7 changes: 5 additions & 2 deletions datastore/google/cloud/datastore/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import os

from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2

from google.cloud._helpers import _LocalStack
from google.cloud._helpers import (
Expand Down Expand Up @@ -135,7 +135,10 @@ def _extended_lookup(datastore_api, project, key_pbs,
while loop_num < _MAX_LOOPS: # loop against possible deferred.
loop_num += 1
lookup_response = datastore_api.lookup(
project, read_options, key_pbs)
project_id=project,
read_options=read_options,
keys=key_pbs,
)

# Accumulate the new results.
results.extend(result.entity for result in lookup_response.found)
Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from google.cloud._helpers import _datetime_to_pb_timestamp
from google.cloud._helpers import _pb_timestamp_to_datetime
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
from google.cloud.datastore_v1.proto import entity_pb2 as _entity_pb2
from google.cloud.datastore.entity import Entity
from google.cloud.datastore.key import Key

Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import copy
import six

from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
from google.cloud.datastore_v1.proto import entity_pb2 as _entity_pb2

from google.cloud._helpers import _to_bytes
from google.cloud.datastore import _app_engine_key_pb2
Expand Down
6 changes: 3 additions & 3 deletions datastore/google/cloud/datastore/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
from google.api_core import page_iterator
from google.cloud._helpers import _ensure_tuple_or_list

from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2
from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2
from google.cloud.proto.datastore.v1 import query_pb2 as _query_pb2
from google.cloud.datastore_v1.proto import datastore_pb2 as _datastore_pb2
from google.cloud.datastore_v1.proto import entity_pb2 as _entity_pb2
from google.cloud.datastore_v1.proto import query_pb2 as _query_pb2
from google.cloud.datastore import helpers
from google.cloud.datastore.key import Key

Expand Down
30 changes: 30 additions & 0 deletions datastore/google/cloud/datastore_v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Copyright 2017, Google LLC All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from __future__ import absolute_import

from google.cloud.datastore_v1 import types
from google.cloud.datastore_v1.gapic import datastore_client
from google.cloud.datastore_v1.gapic import enums


class DatastoreClient(datastore_client.DatastoreClient):
__doc__ = datastore_client.DatastoreClient.__doc__
enums = enums


__all__ = (
'enums',
'types',
'DatastoreClient', )
Empty file added datastore/google/cloud/datastore_v1/gapic/__init__.py
View file
Open in desktop
Empty file.
Loading