CloudNdb Version 0.2.0 - query filter with key property is not working

[ekor15]

Environment details

google-cloud-ndb 0.2.0
OS mac 10.15.1 (19B88)
Python 3.7.5

Steps to reproduce

1. Do a filter with a property that is a key

Code example

 def get_folder_model_by_name(self, folder_name, site_id, parent_folder_id=None, namespace=None):
 folder_model_kind = models.SiteFolder
 ancestor = ndb.Key(models.Site, site_id)
 parent_folder_id = parent_folder_id or PredefinedFolderID.media_root
 parent_folder_key = ndb.Key(folder_model_kind, parent_folder_id, parent=ancestor)

 query = folder_model_kind.query(ancestor=ancestor)
 query = query.filter(folder_model_kind.folder_name == folder_name)
 query = query.filter(folder_model_kind.parent_folder_key == parent_folder_key)
 query = query.filter(folder_model_kind.state == FileState.media if
 parent_folder_id != PredefinedFolderID.visitor_uploads_root else FileState.visitor)

 return query.fetch(limit=1)

when using ndb-0.1.0 you can see each filter has the name of the property and the value we set

When using ndb-0.2.0 you can see the parent_folder_key filter does not exist instead we see a filter with the kind of the key that is the value for the filter

[chrisrossi]

Hi, I've spent some time attempting to reproduce this problem and so far haven't been able to. Here's a system test I'm writing in an attempt to reproduce this bug report:

@pytest.mark.usefixtures("client_context")
def test_key_property_query(dispose_of):
 class SomeKind(ndb.Model):
 foo = ndb.StringProperty()
 ref = ndb.KeyProperty()

 root_key = ndb.Key("Root", 1)
 other_key = ndb.Key("OtherKind", "other", parent=root_key)

 entity = SomeKind(foo="himom!", ref=other_key, parent=root_key)
 key = entity.put()
 dispose_of(key._key)

 eventually(SomeKind.query().fetch, _length_equals(1))

 query = SomeKind.query(ancestor=root_key)
 query = query.filter(SomeKind.foo == "himom!")
 query = query.filter(SomeKind.ref == other_key)
 fetched = query.get()

 assert fetched.foo == "himom!"
 assert fetched.ref == other_key

Do you see anything missing here? What am I missing?

[ekor15]

I made the code isolated so I can share it, with the models as well

 def test_site_folder(self):
 folder_key = self.ds_client.key("Site", self.site_id, "SiteFolder", self.file_name)
 parent_folder_key = self.ds_client.key("Site", self.site_id, "SiteFolder", "media-root")
 fields = {
 "folder_name": "folder-name",
 "site_id": self.site_id,
 "user_id": self.user_id,
 "parent_folder_key": parent_folder_key,
 "tags": ["one", "two"],
 "state": '',
 "ns": None
 }

 entity = datastore.Entity(key=folder_key)
 entity.update(fields)
 self.ds_client.put(entity)
 ancestor_key_ndb = ndb.Key(Site, self.site_id)

 # get by key
 model = ndb.Key(SiteFolder, self.file_name, parent=ancestor_key_ndb).get()
 assert_that(model, not_none())

 self.check_folder_model_properties(model, fields)

 parent_folder_id = 'media-root'
 parent_folder_key_ndb = ndb.Key(SiteFolder, parent_folder_id, parent=ancestor_key_ndb)

 query = models.SiteFolder.query(ancestor=ancestor_key_ndb)
 query = query.filter(SiteFolder.folder_name == 'folder-name')
 query = query.filter(SiteFolder.parent_folder_key == parent_folder_key_ndb)
 query = query.filter(SiteFolder.state == '')

 model = query.fetch(limit=1)
 assert_that(model, has_length(1))



class BaseExpando(SearchableExpando):
 _default_indexed = False
 date_updated = ndb.DateTimeProperty(auto_now=True)
 date_created = ndb.DateTimeProperty(auto_now_add=True)

 def __init__(self, *args, **kwds):
 super(BaseExpando, self).__init__(*args, **kwds)

 def _pre_put_hook(self):
 pass


class Site(BaseExpando):
 pass


class SiteFolder(ndb.Expando):
 # site_id is parent

 _default_indexed = False
 date_updated = ndb.DateTimeProperty(indexed=True) # updating on create and explicit update
 date_created = ndb.DateTimeProperty(indexed=False, auto_now_add=True)

 parent_folder_key = ndb.KeyProperty(kind='SiteFolder', indexed=True)

 folder_name = ndb.StringProperty(indexed=True)
 site_id = ndb.StringProperty(indexed=True)
 user_id = ndb.StringProperty(indexed=True)
 ns = ndb.StringProperty(indexed=True) # namespace
 state = ndb.StringProperty(indexed=True, default=FileState.media)
 origin = ndb.StringProperty(indexed=True)

 tags = ndb.StringProperty(indexed=True, repeated=True)

[chrisrossi]

What is SearchableExpando?

[ekor15]

Sorry, I thought I copied it:

class SearchableExpando(ndb.Expando):
 def _post_put_hook(self, future):
 pass

 @classmethod
 def _post_delete_hook(cls, key, future):
 pass

[ekor15]

@chrisrossi
any news?