flagsmith-flag-engine 10.0.4__tar.gz → 10.2.0__tar.gz

{flagsmith_flag_engine-10.0.4/flagsmith_flag_engine.egg-info → flagsmith_flag_engine-10.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flagsmith-flag-engine
-Version: 10.0.4
+Version: 10.2.0
 Summary: Flag engine for the Flagsmith API.
 Home-page: https://github.com/Flagsmith/flagsmith-engine
 Author: Flagsmith
@@ -46,6 +46,14 @@ source .venv/bin/activate
 python -m pip install -r requirements-dev.txt
 ```
 
+## Syncing engine-test-data
+
+The engine-test-data submodule is pinned to a specific tag. To sync it locally:
+
+```bash
+make sync-engine-test-data
+```
+
 ## Design
 
 - Marshmallow Schemas

{flagsmith_flag_engine-10.0.4 → flagsmith_flag_engine-10.2.0}/README.md

@@ -15,6 +15,14 @@ source .venv/bin/activate
 python -m pip install -r requirements-dev.txt
 ```
 
+## Syncing engine-test-data
+
+The engine-test-data submodule is pinned to a specific tag. To sync it locally:
+
+```bash
+make sync-engine-test-data
+```
+
 ## Design
 
 - Marshmallow Schemas

{flagsmith_flag_engine-10.0.4 → flagsmith_flag_engine-10.2.0}/flag_engine/context/types.py

@@ -23,6 +23,7 @@ class EnvironmentContext(TypedDict):
 
 
 class FeatureValue(TypedDict):
+    key: NotRequired[str]
     value: Any
     weight: float
     priority: int

{flagsmith_flag_engine-10.0.4 → flagsmith_flag_engine-10.2.0}/flag_engine/result/types.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict, Generic, List
+from typing import Any, Dict, Generic, List, Optional
 
 from typing_extensions import NotRequired, TypedDict
 
@@ -16,6 +16,7 @@ class FlagResult(TypedDict, Generic[FeatureMetadataT]):
     enabled: bool
     value: Any
     reason: str
+    variant: Optional[str]
     metadata: NotRequired[FeatureMetadataT]
 
 

{flagsmith_flag_engine-10.0.4 → flagsmith_flag_engine-10.2.0}/flag_engine/segments/evaluator.py

@@ -178,38 +178,39 @@ def get_flag_result_from_context(
     """
     key = _get_identity_key(context)
 
-    flag_result: typing.Optional[FlagResult[FeatureMetadataT]] = None
+    value = feature_context["value"]
+    variant: typing.Optional[str] = None
 
     if key is not None and (variants := feature_context.get("variants")):
+        # Default to the control bucket; a matched named variant overrides this.
+        variant = "control"
+
         percentage_value = get_hashed_percentage_for_object_ids(
             [feature_context["key"], key]
         )
 
         start_percentage = 0.0
 
-        for variant in sorted(
+        for feature_value in sorted(
             variants,
             key=operator.itemgetter("priority"),
         ):
-            limit = (weight := variant["weight"]) + start_percentage
+            limit = (weight := feature_value["weight"]) + start_percentage
             if start_percentage <= percentage_value < limit:
-                flag_result = {
-                    "enabled": feature_context["enabled"],
-                    "name": feature_context["name"],
-                    "reason": f"SPLIT; weight={weight}",
-                    "value": variant["value"],
-                }
+                reason = f"SPLIT; weight={weight}"
+                value = feature_value["value"]
+                variant = feature_value.get("key")
                 break
 
             start_percentage = limit
 
-    if flag_result is None:
-        flag_result = {
-            "enabled": feature_context["enabled"],
-            "name": feature_context["name"],
-            "reason": reason,
-            "value": feature_context["value"],
-        }
+    flag_result: FlagResult[FeatureMetadataT] = {
+        "enabled": feature_context["enabled"],
+        "name": feature_context["name"],
+        "reason": reason,
+        "value": value,
+        "variant": variant,
+    }
 
     if metadata := feature_context.get("metadata"):
         flag_result["metadata"] = metadata
@@ -236,27 +237,30 @@ def context_matches_rule(
 ) -> bool:
     matches_conditions = (
         get_matching_function(rule["type"])(
-            [
-                context_matches_condition(
-                    context=context,
-                    condition=condition,
-                    segment_key=segment_key,
-                )
-                for condition in conditions
-            ]
+            context_matches_condition(
+                context=context,
+                condition=condition,
+                segment_key=segment_key,
+            )
+            for condition in conditions
         )
         if (conditions := rule.get("conditions"))
         else True
     )
 
-    return matches_conditions and all(
-        context_matches_rule(
-            context=context,
-            rule=rule,
-            segment_key=segment_key,
+    matches_rules = (
+        get_matching_function(rule["type"])(
+            context_matches_rule(
+                context=context,
+                rule=sub_rule,
+                segment_key=segment_key,
+            )
+            for sub_rule in rules
         )
-        for rule in rule.get("rules") or []
+        if (rules := rule.get("rules"))
+        else True
     )
+    return matches_conditions and matches_rules
 
 
 def context_matches_condition(

{flagsmith_flag_engine-10.0.4 → flagsmith_flag_engine-10.2.0/flagsmith_flag_engine.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flagsmith-flag-engine
-Version: 10.0.4
+Version: 10.2.0
 Summary: Flag engine for the Flagsmith API.
 Home-page: https://github.com/Flagsmith/flagsmith-engine
 Author: Flagsmith
@@ -46,6 +46,14 @@ source .venv/bin/activate
 python -m pip install -r requirements-dev.txt
 ```
 
+## Syncing engine-test-data
+
+The engine-test-data submodule is pinned to a specific tag. To sync it locally:
+
+```bash
+make sync-engine-test-data
+```
+
 ## Design
 
 - Marshmallow Schemas

{flagsmith_flag_engine-10.0.4 → flagsmith_flag_engine-10.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="flagsmith-flag-engine",
-    version="10.0.4",
+    version="10.2.0",
     author="Flagsmith",
     author_email="support@flagsmith.com",
     packages=find_packages(include=["flag_engine", "flag_engine.*"]),