TraitValue -> ContextValue

Author: khvn26

flag_engine/context/types.py

@@ -8,7 +8,7 @@
 
 from typing_extensions import NotRequired
 
-from flag_engine.identities.traits.types import TraitValue
+from flag_engine.identities.traits.types import ContextValue
 from flag_engine.utils.types import SupportsStr
 
 
@@ -20,7 +20,7 @@ class EnvironmentContext(TypedDict):
 class IdentityContext(TypedDict):
     identifier: str
     key: SupportsStr
-    traits: NotRequired[Dict[str, TraitValue]]
+    traits: NotRequired[Dict[str, ContextValue]]
 
 
 class EvaluationContext(TypedDict):

flag_engine/identities/traits/models.py

@@ -1,8 +1,8 @@
 from pydantic import BaseModel, Field
 
-from flag_engine.identities.traits.types import TraitValue
+from flag_engine.identities.traits.types import ContextValue
 
 
 class TraitModel(BaseModel):
     trait_key: str
-    trait_value: TraitValue = Field(...)
+    trait_value: ContextValue = Field(...)

flag_engine/identities/traits/types.py

@@ -8,10 +8,10 @@
 
 from flag_engine.identities.traits.constants import TRAIT_STRING_VALUE_MAX_LENGTH
 
-_UnconstrainedTraitValue = Union[None, int, float, bool, str]
+_UnconstrainedContextValue = Union[None, int, float, bool, str]
 
 
-def map_any_value_to_trait_value(value: Any) -> _UnconstrainedTraitValue:
+def map_any_value_to_trait_value(value: Any) -> _UnconstrainedContextValue:
     """
     Try to coerce a value of arbitrary type to a trait value type.
     Union member-specific constraints, such as max string value length, are ignored here.
@@ -36,19 +36,19 @@ def map_any_value_to_trait_value(value: Any) -> _UnconstrainedTraitValue:
 _float_pattern = re.compile(r"-?[0-9]+\.[0-9]+")
 
 
-def _map_string_value_to_trait_value(value: str) -> _UnconstrainedTraitValue:
+def _map_string_value_to_trait_value(value: str) -> _UnconstrainedContextValue:
     if _int_pattern.fullmatch(value):
         return int(value)
     if _float_pattern.fullmatch(value):
         return float(value)
     return value
 
 
-def _is_trait_value(value: Any) -> TypeGuard[_UnconstrainedTraitValue]:
-    return isinstance(value, get_args(_UnconstrainedTraitValue))
+def _is_trait_value(value: Any) -> TypeGuard[_UnconstrainedContextValue]:
+    return isinstance(value, get_args(_UnconstrainedContextValue))
 
 
-TraitValue = Annotated[
+ContextValue = Annotated[
     Union[
         None,
         StrictBool,

flag_engine/segments/evaluator.py

@@ -8,7 +8,7 @@
 import semver
 
 from flag_engine.context.types import EvaluationContext
-from flag_engine.identities.traits.types import TraitValue
+from flag_engine.identities.traits.types import ContextValue
 from flag_engine.segments import constants
 from flag_engine.segments.models import (
     SegmentConditionModel,
@@ -104,7 +104,7 @@ def context_matches_condition(
     return _matches_context_value(condition, context_value) if context_value else False
 
 
-def _get_trait(context: EvaluationContext, trait_key: str) -> TraitValue:
+def _get_trait(context: EvaluationContext, trait_key: str) -> ContextValue:
     return (
         identity_context["traits"][trait_key]
         if (identity_context := context["identity"])
@@ -115,7 +115,7 @@ def _get_trait(context: EvaluationContext, trait_key: str) -> TraitValue:
 def get_context_value(
     context: EvaluationContext,
     property: str,
-) -> TraitValue:
+) -> ContextValue:
     getter = CONTEXT_VALUE_GETTERS_BY_PROPERTY.get(property) or partial(
         _get_trait,
         trait_key=property,
@@ -128,7 +128,7 @@ def get_context_value(
 
 def _matches_context_value(
     condition: SegmentConditionModel,
-    context_value: TraitValue,
+    context_value: ContextValue,
 ) -> bool:
     if matcher := MATCHERS_BY_OPERATOR.get(condition.operator):
         return matcher(condition.value, context_value)
@@ -138,14 +138,14 @@ def _matches_context_value(
 
 def _evaluate_not_contains(
     segment_value: typing.Optional[str],
-    context_value: TraitValue,
+    context_value: ContextValue,
 ) -> bool:
     return isinstance(context_value, str) and str(segment_value) not in context_value
 
 
 def _evaluate_regex(
     segment_value: typing.Optional[str],
-    context_value: TraitValue,
+    context_value: ContextValue,
 ) -> bool:
     return (
         context_value is not None
@@ -155,7 +155,7 @@ def _evaluate_regex(
 
 def _evaluate_modulo(
     segment_value: typing.Optional[str],
-    context_value: TraitValue,
+    context_value: ContextValue,
 ) -> bool:
     if not isinstance(context_value, (int, float)):
         return False
@@ -174,7 +174,7 @@ def _evaluate_modulo(
 
 
 def _evaluate_in(
-    segment_value: typing.Optional[str], context_value: TraitValue
+    segment_value: typing.Optional[str], context_value: ContextValue
 ) -> bool:
     if segment_value:
         if isinstance(context_value, str):
@@ -188,11 +188,11 @@ def _evaluate_in(
 
 def _context_value_typed(
     func: typing.Callable[..., bool],
-) -> typing.Callable[[typing.Optional[str], TraitValue], bool]:
+) -> typing.Callable[[typing.Optional[str], ContextValue], bool]:
     @wraps(func)
     def inner(
         segment_value: typing.Optional[str],
-        context_value: typing.Union[TraitValue, semver.Version],
+        context_value: typing.Union[ContextValue, semver.Version],
     ) -> bool:
         with suppress(TypeError, ValueError):
             if isinstance(context_value, str) and is_semver(segment_value):
@@ -207,7 +207,7 @@ def inner(
 
 
 MATCHERS_BY_OPERATOR: typing.Dict[
-    ConditionOperator, typing.Callable[[typing.Optional[str], TraitValue], bool]
+    ConditionOperator, typing.Callable[[typing.Optional[str], ContextValue], bool]
 ] = {
     constants.NOT_CONTAINS: _evaluate_not_contains,
     constants.REGEX: _evaluate_regex,

flag_engine/utils/types.py

@@ -3,7 +3,7 @@
 
 import semver
 
-from flag_engine.identities.traits.types import TraitValue
+from flag_engine.identities.traits.types import ContextValue
 from flag_engine.utils.semver import remove_semver_suffix
 
 
@@ -15,7 +15,7 @@ def __str__(self) -> str:  # pragma: no cover
 @singledispatch
 def get_casting_function(
     input_: object,
-) -> typing.Callable[..., TraitValue]:
+) -> typing.Callable[..., ContextValue]:
     """
     This function returns a callable to cast a value to the same type as input_
     >>> assert get_casting_function("a string") == str