Skip to content

feat: apply rules based on type instead of hardcoded all #297

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

Open
Zaimwa9 wants to merge 2 commits into
base: renovate/tests-engine_tests-engine-test-data-3.x
Choose a base branch
from
+19 −15
Open

feat: apply rules based on type instead of hardcoded all #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50369fb
feat: apply rules based on type instead of hardcoded all
Zaimwa9 May 4, 2026
8cb614c
feat: use generator and removed tests
Zaimwa9 May 4, 2026
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
31 changes: 17 additions & 14 deletions flag_engine/segments/evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,27 +236,30 @@ def context_matches_rule(
) -> bool:
matches_conditions = (
get_matching_function(rule["type"])(
[
context_matches_condition(
context=context,
condition=condition,
segment_key=segment_key,
)
for condition in conditions
]
context_matches_condition(
context=context,
condition=condition,
segment_key=segment_key,
)
for condition in conditions
)
if (conditions := rule.get("conditions"))
else True
)

return matches_conditions and all(
context_matches_rule(
context=context,
rule=rule,
segment_key=segment_key,
matches_rules = (
get_matching_function(rule["type"])(
context_matches_rule(
context=context,
rule=sub_rule,
segment_key=segment_key,
)
for sub_rule in rules
)
for rule in rule.get("rules") or []
if (rules := rule.get("rules"))
else True
)
return matches_conditions and matches_rules


def context_matches_condition(
Expand Down
2 changes: 1 addition & 1 deletion tests/engine_tests/engine-test-data
Open in desktop
Submodule engine-test-data updated 3 files
+94 −0 test_cases/test_any_rule_with_nested_all_groups__no_group_matches__should_not_match.jsonc
+98 −0 test_cases/test_any_rule_with_nested_all_groups__one_group_matches__should_match.jsonc
+80 −0 test_cases/test_none_rule_with_nested_all_groups__match__should_exclude.jsonc
1 change: 1 addition & 0 deletions tests/unit/segments/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
],
}


segment_conditions_and_nested_rules: SegmentContext = {
"key": "6",
"name": "segment_multiple_conditions_all_and_nested_rules",
Expand Down
Loading