improve logic, update tests

Author: khvn26

flag_engine/segments/evaluator.py

@@ -216,18 +216,15 @@ def context_matches_condition(
     if condition["operator"] == constants.PERCENTAGE_SPLIT:
         if context_value is not None:
             object_ids = [segment_key, context_value]
-        elif (
-            identity_key := (
-                (identity_context := context.get("identity"))
-                and identity_context["key"]
-            )
-            is not None
-        ):
-            object_ids = [segment_key, identity_key]
+        elif identity_context := context.get("identity"):
+            object_ids = [segment_key, identity_context["key"]]
         else:
             return False
 
-        float_value = float(condition["value"])
+        try:
+            float_value = float(condition["value"])
+        except ValueError:
+            return False
         return get_hashed_percentage_for_object_ids(object_ids) <= float_value
 
     if condition["operator"] == constants.IS_NOT_SET:

tests/unit/segments/test_segments_evaluator.py

@@ -224,7 +224,13 @@ def test_context_in_segment(
 
 @pytest.mark.parametrize(
     "segment_split_value, identity_hashed_percentage, expected_result",
-    ((10, 1, True), (100, 50, True), (0, 1, False), (10, 20, False)),
+    (
+        (10, 1, True),
+        (100, 50, True),
+        (0, 1, False),
+        (10, 20, False),
+        ("invalid", 100, False),
+    ),
 )
 def test_context_in_segment_percentage_split(
     mocker: MockerFixture,
@@ -270,6 +276,49 @@ def test_context_in_segment_percentage_split(
     assert result == expected_result
 
 
+def test_context_in_segment_percentage_split__no_identity__returns_expected(
+    mocker: MockerFixture,
+    context: EvaluationContext,
+) -> None:
+    # Given
+    del context["identity"]
+
+    segment_context: SegmentContext = {
+        "key": "1",
+        "name": "% split",
+        "rules": [
+            {
+                "type": constants.ALL_RULE,
+                "conditions": [],
+                "rules": [
+                    {
+                        "type": constants.ALL_RULE,
+                        "conditions": [
+                            {
+                                "operator": constants.PERCENTAGE_SPLIT,
+                                "property": "",
+                                "value": "10",
+                            }
+                        ],
+                        "rules": [],
+                    }
+                ],
+            }
+        ],
+    }
+
+    mock_get_hashed_percentage = mocker.patch(
+        "flag_engine.segments.evaluator.get_hashed_percentage_for_object_ids"
+    )
+
+    # When
+    result = is_context_in_segment(context=context, segment_context=segment_context)
+
+    # Then
+    mock_get_hashed_percentage.assert_not_called()
+    assert result is False
+
+
 def test_context_in_segment_percentage_split__trait_value__calls_expected(
     mocker: MockerFixture,
     context: EvaluationContext,