fix: Evaluator now correctly ANDs multiple conditions in a rule

Author: abeiderman

configdirector-openfeature-server-provider/CHANGELOG.md

@@ -6,7 +6,13 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
 
 ## [Unreleased]
 
-## [1.2.0] - 2026-09-21
+## [1.1.0] - 2026-09-23
+
+### Fixed
+
+- Bump the dependency on the server SDK to 1.3.0 in order to pick up the conditional evaluation fix.
+
+## [1.0.0] - 2026-09-21
 
 ### Added
 

configdirector-openfeature-server-provider/pyproject.toml

@@ -39,7 +39,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "configdirector-server-sdk>=1.2,<2",
+  "configdirector-server-sdk>=1.3,<2",
   "openfeature-sdk>=0.8.2,<1",
 ]
 

configdirector-openfeature-server-provider/src/configdirector_openfeature/_version.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.1.0"

configdirector-server-sdk/CHANGELOG.md

@@ -8,6 +8,12 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
 
 ## [Unreleased]
 
+## [1.3.0] - 2026-09-23
+
+### Fixed
+
+- The rules evaluator now ANDs multiple conditions in a conditional rule, rather than evaluating them as an OR.
+
 ## [1.2.0] - 2026-09-21
 
 ### Added

configdirector-server-sdk/src/configdirector/_evaluation/config_evaluator.py

@@ -117,7 +117,7 @@ def _evaluate_conditional_rule(
         config: Config,
         context: EvaluationContext | None,
     ) -> _RuleResult:
-        if not any(evaluate_condition(condition, context) for condition in rule.conditions or []):
+        if not all(evaluate_condition(condition, context) for condition in rule.conditions or []):
             return _NO_MATCH
         if rule.target == "value" and rule.value is not None:
             return _RuleResult(matched=True, value=to_json_string(rule.value), value_id=rule.value_id)

configdirector-server-sdk/src/configdirector/_version.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass
 
-__version__ = "1.2.0"
+__version__ = "1.3.0"
 
 
 @dataclass(frozen=True, slots=True)

configdirector-server-sdk/tests/evaluation/test_config_evaluator.py

@@ -42,6 +42,39 @@ def identifier_is(value: str) -> Condition:
     )
 
 
+def plan_is(value: str) -> Condition:
+    return Condition(
+        id=uid(),
+        attribute="traits",
+        operator="=",
+        trait="/plan",
+        target_type="text",
+        target_values=[value],
+    )
+
+
+def config_requiring(*conditions: Condition) -> Config:
+    return Config(
+        id=CONFIG_ID,
+        key="config-with-a-two-condition-rule",
+        type="string",
+        variations=[],
+        target=TargetingRules(
+            default_value="this-is-the-default",
+            rules=[
+                ConditionalRule(
+                    id=uid(),
+                    order=0,
+                    target="value",
+                    value="Rule A Value",
+                    percentages=[],
+                    conditions=list(conditions),
+                )
+            ],
+        ),
+    )
+
+
 def test_evaluates_to_the_default_value_when_there_are_no_targeting_rules() -> None:
     config = Config(
         id=CONFIG_ID,
@@ -251,7 +284,7 @@ def test_cycles_through_multiple_rules(self) -> None:
         assert evaluator.evaluate(config, ctx(id="15")).value == "Rule B Value"
         assert evaluator.evaluate(config, ctx(id="20")).value == "this-is-the-default"
 
-    def test_falls_back_to_the_default_when_conditions_array_is_empty(self) -> None:
+    def test_a_rule_with_no_conditions_applies_to_every_context(self) -> None:
         config = Config(
             id=CONFIG_ID,
             key="config-without-rules",
@@ -272,32 +305,38 @@ def test_falls_back_to_the_default_when_conditions_array_is_empty(self) -> None:
             ),
         )
 
-        assert evaluator.evaluate(config, ctx(id="10")).value == "this-is-the-default"
+        assert evaluator.evaluate(config, ctx(id="10")).value == "Rule A Value"
+        assert evaluator.evaluate(config).value == "Rule A Value"
 
-    def test_matches_on_the_first_true_condition(self) -> None:
-        config = Config(
-            id=CONFIG_ID,
-            key="config-without-rules",
-            type="string",
-            variations=[],
-            target=TargetingRules(
-                default_value="this-is-the-default",
-                rules=[
-                    ConditionalRule(
-                        id=uid(),
-                        order=0,
-                        target="value",
-                        value="Rule A Value",
-                        percentages=[],
-                        conditions=[identifier_is("10"), identifier_is("20")],
-                    )
-                ],
-            ),
+    def test_a_rule_with_several_conditions_matches_when_every_condition_matches(self) -> None:
+        config = config_requiring(identifier_is("10"), plan_is("pro"))
+
+        assert evaluator.evaluate(config, ctx(id="10", traits={"plan": "pro"})).value == "Rule A Value"
+
+    def test_a_rule_with_several_conditions_does_not_match_when_only_the_first_matches(self) -> None:
+        config = config_requiring(identifier_is("10"), plan_is("pro"))
+
+        assert (
+            evaluator.evaluate(config, ctx(id="10", traits={"plan": "free"})).value == "this-is-the-default"
         )
 
-        assert evaluator.evaluate(config, ctx(id="10")).value == "Rule A Value"
-        assert evaluator.evaluate(config, ctx(id="20")).value == "Rule A Value"
-        assert evaluator.evaluate(config, ctx(id="30")).value == "this-is-the-default"
+    def test_a_rule_with_several_conditions_does_not_match_when_only_the_second_matches(self) -> None:
+        config = config_requiring(identifier_is("10"), plan_is("pro"))
+
+        assert evaluator.evaluate(config, ctx(id="20", traits={"plan": "pro"})).value == "this-is-the-default"
+
+    def test_a_rule_with_several_conditions_does_not_match_when_no_condition_matches(self) -> None:
+        config = config_requiring(identifier_is("10"), plan_is("pro"))
+
+        assert (
+            evaluator.evaluate(config, ctx(id="20", traits={"plan": "free"})).value == "this-is-the-default"
+        )
+
+    def test_a_rule_whose_conditions_cannot_all_hold_never_matches(self) -> None:
+        config = config_requiring(identifier_is("10"), identifier_is("20"))
+
+        assert evaluator.evaluate(config, ctx(id="10")).value == "this-is-the-default"
+        assert evaluator.evaluate(config, ctx(id="20")).value == "this-is-the-default"
 
     def test_falls_back_to_the_default_when_the_condition_matches_but_the_value_is_none(
         self,