New Datastore GAPIC.

datastore/google/cloud/datastore/_gax.py

@@ -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
@@ -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__,
+ ),
+ )

datastore/google/cloud/datastore/_http.py

@@ -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__
 

datastore/google/cloud/datastore/batch.py

@@ -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):

datastore/google/cloud/datastore/client.py

@@ -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 (

datastore/google/cloud/datastore/helpers.py

@@ -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
 

datastore/google/cloud/datastore/key.py

@@ -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

datastore/google/cloud/datastore/query.py

@@ -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
 

datastore/google/cloud/datastore_v1/__init__.py

@@ -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', )