support native lists as condition values for the IN operator

khvn26 · khvn26 · commit 129108b58638 · 2025-08-15T20:21:12.000+01:00
diff --git a/flag_engine/context/mappers.py b/flag_engine/context/mappers.py
@@ -122,7 +122,7 @@ def _map_identity_overrides_to_segment_contexts(
                         {
                             "property": "$.identity.identifier",
                             "operator": "IN",
-                            "value": ",".join(identifiers),
+                            "value": identifiers,
                         }
                     ],
                 }
diff --git a/flag_engine/context/types.py b/flag_engine/context/types.py
@@ -1,10 +1,10 @@
 # generated by datamodel-codegen:
-#   filename:  https://raw.githubusercontent.com/Flagsmith/flagsmith/chore/features-contexts-in-eval-context-schema/sdk/evaluation-context.json  # noqa: E501
-#   timestamp: 2025-08-11T18:17:29+00:00
+#   filename:  https://raw.githubusercontent.com/Flagsmith/flagsmith/chore/features-contexts-in-eval-context-schema/sdk/evaluation-context.json
+#   timestamp: 2025-08-15T18:12:12+00:00
 
 from __future__ import annotations
 
-from typing import Any, Dict, List, Optional, TypedDict, Union
+from typing import Any, Dict, List, Literal, Mapping, Optional, TypedDict, Union
 
 from typing_extensions import NotRequired
 
@@ -24,15 +24,24 @@ class FeatureValue(TypedDict):
 class IdentityContext(TypedDict):
     identifier: str
     key: str
-    traits: NotRequired[Dict[str, Optional[Union[str, float, bool]]]]
+    traits: NotRequired[Mapping[str, Optional[Union[str, float, bool]]]]
 
 
-class SegmentCondition(TypedDict):
-    property: NotRequired[str]
+class SegmentCondition1(TypedDict):
+    property: str
     operator: ConditionOperator
     value: str
 
 
+class SegmentCondition2(TypedDict):
+    property: str
+    operator: Literal["IN"]
+    value: List[str]
+
+
+SegmentCondition = Union[SegmentCondition1, SegmentCondition2]
+
+
 class SegmentRule(TypedDict):
     type: RuleType
     conditions: NotRequired[List[SegmentCondition]]
diff --git a/flag_engine/segments/evaluator.py b/flag_engine/segments/evaluator.py
@@ -12,9 +12,9 @@
     EvaluationContext,
     FeatureContext,
     SegmentCondition,
-    SegmentContext,
-    SegmentRule,
 )
+from flag_engine.context.types import SegmentCondition1 as SegmentConditionWithStrValue
+from flag_engine.context.types import SegmentContext, SegmentRule
 from flag_engine.environments.models import EnvironmentModel
 from flag_engine.identities.models import IdentityModel
 from flag_engine.identities.traits.types import ContextValue
@@ -227,6 +227,22 @@ def context_matches_condition(
         else None
     )
 
+    if condition["operator"] == constants.IN:
+        in_values = (
+            condition_value
+            if isinstance(condition_value := condition["value"], list)
+            else condition_value.split(",")
+        )
+        if isinstance(context_value, int) and not any(
+            context_value is x for x in (False, True)
+        ):
+            return str(context_value) in in_values
+        return context_value in in_values
+
+    # mypy is too inflexible here, we know that, at this point,
+    # the condition value is not a list[str]
+    condition = typing.cast(SegmentConditionWithStrValue, condition)
+
     if condition["operator"] == constants.PERCENTAGE_SPLIT:
         if context_value is not None:
             object_ids = [segment_key, context_value]
@@ -272,7 +288,7 @@ def get_context_value(
 
 
 def _matches_context_value(
-    condition: SegmentCondition,
+    condition: SegmentConditionWithStrValue,
     context_value: ContextValue,
 ) -> bool:
     if matcher := MATCHERS_BY_OPERATOR.get(condition["operator"]):
@@ -318,19 +334,6 @@ def _evaluate_modulo(
     return context_value % divisor == remainder
 
 
-def _evaluate_in(
-    segment_value: typing.Optional[str], context_value: ContextValue
-) -> bool:
-    if segment_value:
-        if isinstance(context_value, str):
-            return context_value in segment_value.split(",")
-        if isinstance(context_value, int) and not any(
-            context_value is x for x in (False, True)
-        ):
-            return str(context_value) in segment_value.split(",")
-    return False
-
-
 def _context_value_typed(
     func: typing.Callable[..., bool],
 ) -> typing.Callable[[typing.Optional[str], ContextValue], bool]:
@@ -357,7 +360,6 @@ def inner(
     constants.NOT_CONTAINS: _evaluate_not_contains,
     constants.REGEX: _evaluate_regex,
     constants.MODULO: _evaluate_modulo,
-    constants.IN: _evaluate_in,
     constants.EQUAL: _context_value_typed(operator.eq),
     constants.GREATER_THAN: _context_value_typed(operator.gt),
     constants.GREATER_THAN_INCLUSIVE: _context_value_typed(operator.ge),
diff --git a/tests/unit/segments/fixtures.py b/tests/unit/segments/fixtures.py
@@ -1,4 +1,4 @@
-from flag_engine.context.types import SegmentCondition, SegmentContext, SegmentRule
+from flag_engine.context.types import SegmentContext, SegmentRule
 from flag_engine.segments import constants
 
 trait_key_1 = "email"
@@ -19,7 +19,7 @@
         SegmentRule(
             type=constants.ALL_RULE,
             conditions=[
-                SegmentCondition(
+                dict(
                     operator=constants.EQUAL,
                     property=trait_key_1,
                     value=trait_value_1,
@@ -36,12 +36,12 @@
         SegmentRule(
             type=constants.ALL_RULE,
             conditions=[
-                SegmentCondition(
+                dict(
                     operator=constants.EQUAL,
                     property=trait_key_1,
                     value=trait_value_1,
                 ),
-                SegmentCondition(
+                dict(
                     operator=constants.EQUAL,
                     property=trait_key_2,
                     value=trait_value_2,
@@ -58,12 +58,12 @@
         SegmentRule(
             type=constants.ANY_RULE,
             conditions=[
-                SegmentCondition(
+                dict(
                     operator=constants.EQUAL,
                     property=trait_key_1,
                     value=trait_value_1,
                 ),
-                SegmentCondition(
+                dict(
                     operator=constants.EQUAL,
                     property=trait_key_2,
                     value=trait_value_2,
@@ -83,12 +83,12 @@
                 SegmentRule(
                     type=constants.ALL_RULE,
                     conditions=[
-                        SegmentCondition(
+                        dict(
                             operator=constants.EQUAL,
                             property=trait_key_1,
                             value=trait_value_1,
                         ),
-                        SegmentCondition(
+                        dict(
                             operator=constants.EQUAL,
                             property=trait_key_2,
                             value=trait_value_2,
@@ -98,7 +98,7 @@
                 SegmentRule(
                     type=constants.ALL_RULE,
                     conditions=[
-                        SegmentCondition(
+                        dict(
                             operator=constants.EQUAL,
                             property=trait_key_3,
                             value=trait_value_3,
@@ -117,7 +117,7 @@
         SegmentRule(
             type=constants.ALL_RULE,
             conditions=[
-                SegmentCondition(
+                dict(
                     operator=constants.EQUAL,
                     property=trait_key_1,
                     value=trait_value_1,
@@ -127,7 +127,7 @@
                 SegmentRule(
                     type=constants.ALL_RULE,
                     conditions=[
-                        SegmentCondition(
+                        dict(
                             operator=constants.EQUAL,
                             property=trait_key_2,
                             value=trait_value_2,
@@ -137,7 +137,7 @@
                 SegmentRule(
                     type=constants.ALL_RULE,
                     conditions=[
-                        SegmentCondition(
+                        dict(
                             operator=constants.EQUAL,
                             property=trait_key_3,
                             value=trait_value_3,
diff --git a/tests/unit/segments/test_segments_evaluator.py b/tests/unit/segments/test_segments_evaluator.py

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ def _map_identity_overrides_to_segment_contexts(`
`122`	`122`	`{`
`123`	`123`	`"property": "$.identity.identifier",`
`124`	`124`	`"operator": "IN",`
`125`		`- "value": ",".join(identifiers),`
	`125`	`+ "value": identifiers,`
`126`	`126`	`}`
`127`	`127`	`],`
`128`	`128`	`}`