refactor: use latest google-cloud-datastore in datastore_adapter

anom/adapters/datastore_adapter.py

@@ -1,7 +1,6 @@
 import logging
 
 from functools import partial
-from gcloud_requests import DatastoreRequestsProxy, enter_transaction, exit_transaction
 from google.cloud import datastore
 from threading import local
 
@@ -40,7 +39,6 @@ def begin(self):
         _logger.debug("Beginning transaction...")
         self.ds_transaction.begin()
         self.adapter.client._push_batch(self.ds_transaction)
-        enter_transaction()
 
     def commit(self):
         try:
@@ -56,7 +54,6 @@ def rollback(self):
 
     def end(self):
         _logger.debug("Ending transaction...")
-        exit_transaction()
         self.adapter.client._pop_batch()
         self.adapter._transactions.remove(self)
 
@@ -99,11 +96,9 @@ class DatastoreAdapter(Adapter):
     def __init__(self, *, project=None, credentials=None):
         self.project = project
         self.credentials = credentials
-        self.proxy = DatastoreRequestsProxy(credentials=credentials)
         self.client = datastore.Client(
             credentials=self.credentials,
             project=self.project,
-            _http=self.proxy,
             _use_grpc=False,
         )
 
@@ -171,12 +166,13 @@ def query(self, query, options):
 
         result_iterator = query.fetch(
             limit=options.batch_size,
-            offset=options.offset,
             start_cursor=options.cursor,
         )
 
         entities = []
-        for entity in result_iterator:
+        for i, entity in enumerate(result_iterator):
+            if i < options.offset:
+                continue
             key, data = self._convert_key_from_datastore(entity.key), None
             if not options.keys_only:
                 data = self._prepare_to_load(entity)

anom/properties.py

@@ -321,6 +321,8 @@ def prepare_to_load(self, entity, value):
         # loaded as ints in microseconds.
         if value is not None and isinstance(value, int):
             value = datetime.fromtimestamp(value / 1000000, tz.tzutc())
+        elif value is not None and isinstance(value, datetime):
+            value = value.replace(tzinfo=tz.tzutc())
 
         return super().prepare_to_load(entity, value)
 

requirements.txt

@@ -1,4 +1,3 @@
-google-cloud-datastore>=1.0,<1.1
-gcloud-requests==1.1.9
+google-cloud-datastore>=1.0,<2.0
 msgpack-python==0.4.8
 python-dateutil==2.6.0