jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Refactored tag filtering in StoreService

Browse source
This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-11-13 18:03:13 -03:00
commit 29409aec51
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/backend/langflow/services/store/service.py
View file

@ -144,11 +144,12 @@ class StoreService(Service):
filter_conditions.append({"is_component": {"_eq": is_component}})
if tags:
filter_conditions.append({"tags": {"tags_id": {"name": {"_in": tags}}}})
# tags_filter = {"tags": {"_or": []}}
# for tag in tags:
# tags_filter["tags"]["_or"].append({"tags_id": {"name": {"_eq": tag}}})
# filter_conditions.append(tags_filter)
tags_filter = {"tags": {"_and": []}}
for tag in tags:
tags_filter["tags"]["_and"].append(
{"_some": {"tags_id": {"name": {"_eq": tag}}}}
)
filter_conditions.append(tags_filter)
if date_from:
# params["filter[date_updated][_gte]"] = date_from.isoformat()
@ -247,11 +248,12 @@ class StoreService(Service):
filter_conditions.append({"status": {"_eq": status}})
if tags:
filter_conditions.append({"tags": {"tags_id": {"name": {"_in": tags}}}})
# tags_filter = {"tags": {"_or": []}}
# for tag in tags:
# tags_filter["tags"]["_or"].append({"tags_id": {"name": {"_eq": tag}}})
# filter_conditions.append(tags_filter)
tags_filter = {"tags": {"_and": []}}
for tag in tags:
tags_filter["tags"]["_and"].append(
{"_some": {"tags_id": {"name": {"_eq": tag}}}}
)
filter_conditions.append(tags_filter)
if is_component is not None:
filter_conditions.append({"is_component": {"_eq": is_component}})