Skip to content
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

Jump to bottom

google.cloud.datastore add_filter warnings #56

Merged
merged 2 commits into from
Mar 14, 2024
Merged

google.cloud.datastore add_filter warnings #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de0e7e
google.cloud.datastore add_filter warnings
dhimmel Mar 13, 2024
730e18d
additional filter
dhimmel Mar 14, 2024
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
23 changes: 17 additions & 6 deletions articat/catalog_datastore.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from google.cloud import datastore
from google.cloud.datastore import Client, Entity, Key
from google.cloud.datastore.query import PropertyFilter

from articat.artifact import ID, Artifact, Metadata, Partition, Version, not_supplied
from articat.catalog import Catalog
Expand Down Expand Up @@ -91,28 +92,38 @@ def _lookup(
and partition_dt_start == partition_dt_end
):
query.add_filter(
"partition", "=", convert_to_datetime(partition_dt_start)
filter=PropertyFilter(
"partition", "=", convert_to_datetime(partition_dt_start)
)
)
else:
if partition_dt_start is not None:
query.add_filter(
"partition", ">=", convert_to_datetime(partition_dt_start)
filter=PropertyFilter(
"partition", ">=", convert_to_datetime(partition_dt_start)
)
)
if partition_dt_end is not None:
query.add_filter(
"partition", "<", convert_to_datetime(partition_dt_end)
filter=PropertyFilter(
"partition", "<", convert_to_datetime(partition_dt_end)
)
)
query.order = ["-partition"]
if version is not not_supplied:
# NOTE: version may be None here, and that's fine
query.add_filter("version", "=", version)
query.add_filter(filter=PropertyFilter("version", "=", version))
if metadata is not None:
if metadata.schema_fields:
for f in metadata.schema_fields:
query.add_filter("metadata.schema_fields", "=", f)
query.add_filter(
filter=PropertyFilter("metadata.schema_fields", "=", f)
)
if metadata.arbitrary is not None:
for k, v in metadata.arbitrary.items():
query.add_filter(f"metadata.arbitrary.{k}", "=", v)
query.add_filter(
filter=PropertyFilter(f"metadata.arbitrary.{k}", "=", v)
)
yield from query.fetch(limit)

@classmethod
Expand Down
Loading