actually use the mapper

Author: khvn26

flag_engine/context/mappers.py

@@ -4,18 +4,10 @@
 
 from flag_engine.segments.types import ContextValue, is_context_value
 
-OverrideKey = tuple[
-    str,
-    str,
-    bool,
-    typing.Any,
-]
-OverridesKey = tuple[OverrideKey, ...]
-
 
 def map_any_value_to_context_value(value: typing.Any) -> ContextValue:
     """
-    Try to coerce a value of arbitrary type to a trait value type.
+    Try to coerce a value of arbitrary type to a context value type.
     Union member-specific constraints, such as max string value length, are ignored here.
     Replicate behaviour from marshmallow/pydantic V1 for number-like strings.
     For decimals return an int in case of unset exponent.

flag_engine/segments/evaluator.py

@@ -9,6 +9,7 @@
 import jsonpath_rfc9535
 import semver
 
+from flag_engine.context.mappers import map_any_value_to_context_value
 from flag_engine.context.types import (
     EvaluationContext,
     FeatureContext,
@@ -214,12 +215,13 @@ def get_context_value(
     context: EvaluationContext,
     property: str,
 ) -> ContextValue:
+    value = None
     if property.startswith("$."):
-        return _get_context_value_getter(property)(context)
-    if identity_context := context.get("identity"):
+        value = _get_context_value_getter(property)(context)
+    elif identity_context := context.get("identity"):
         if traits := identity_context.get("traits"):
-            return traits.get(property)
-    return None
+            value = traits.get(property)
+    return map_any_value_to_context_value(value)
 
 
 def _matches_context_value(

tests/unit/context/__init__.py

@@ -0,0 +1,29 @@
+import typing
+from decimal import Decimal
+
+import pytest
+
+from flag_engine.context.mappers import map_any_value_to_context_value
+from flag_engine.segments.types import ContextValue
+
+
+@pytest.mark.parametrize(
+    "value, expected_result",
+    [
+        (Decimal("1"), 1),
+        (Decimal("1.1"), 1.1),
+        ("1", 1),
+        ("1.0", 1.0),
+        ("-1.2", -1.2),
+        ("-42", -42),
+    ],
+)
+def test_map_any_value_to_context_value__returns_expected(
+    value: typing.Any,
+    expected_result: ContextValue,
+) -> None:
+    # When
+    result = map_any_value_to_context_value(value)
+
+    # Then
+    assert result == expected_result