Revert "Removing non-b1 features" (#32)

* Revert "Removing non-b1 features (#25)"

This reverts commit e6f53c9.

* Updating beta version, fixing readme

Author: mrm9084

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+## 2.0.0b1 (Unreleased)
+
+* Adds support for Feature Variants.
+
 ## 1.0.0 (06/26/2024)
 
 Updated version to 1.0.0.

README.md

@@ -13,6 +13,7 @@ Feature management provides a way to develop and expose application functionalit
 ## Examples
 
 * [Python Application](https://github.com/microsoft/FeatureManagement-Python/blob/main/samples/feature_flag_sample.py)
+* [Python Application with Feature Variants](https://github.com/microsoft/FeatureManagement-Python/blob/main/samples/feature_variant_sample.py)
 * [Python Application with Azure App Configuration](https://github.com/microsoft/FeatureManagement-Python/blob/main/samples/feature_flag_with_azure_app_configuration_sample.py)
 * [Django Application](https://github.com/Azure/AppConfiguration/tree/main/examples/Python/python-django-webapp-sample)
 * [Flask Application](https://github.com/Azure/AppConfiguration/tree/main/examples/Python/python-flask-webapp-sample)

docs/conf.py

@@ -10,7 +10,7 @@
 project = "FeatureManagement"
 copyright = "2024, Microsoft"
 author = "Microsoft"
-release = "1.0.0"
+release = "2.0.0b1"
 
 # -- General configuration ---------------------------------------------------
 

featuremanagement/__init__.py

@@ -6,7 +6,7 @@
 from ._featuremanager import FeatureManager
 from ._featurefilters import FeatureFilter
 from ._defaultfilters import TimeWindowFilter, TargetingFilter
-from ._models import TargetingContext
+from ._models import FeatureFlag, Variant, TargetingContext
 
 from ._version import VERSION
 
@@ -16,5 +16,7 @@
     "TimeWindowFilter",
     "TargetingFilter",
     "FeatureFilter",
+    "FeatureFlag",
+    "Variant",
     "TargetingContext",
 ]

featuremanagement/_featuremanager.py

@@ -4,11 +4,12 @@
 # license information.
 # -------------------------------------------------------------------------
 import logging
+import hashlib
 from collections.abc import Mapping
 from typing import overload
 from ._defaultfilters import TimeWindowFilter, TargetingFilter
 from ._featurefilters import FeatureFilter
-from ._models import FeatureFlag, EvaluationEvent, TargetingContext
+from ._models import FeatureFlag, Variant, EvaluationEvent, TargetingContext
 
 
 FEATURE_MANAGEMENT_KEY = "feature_management"
@@ -88,6 +89,111 @@ def __init__(self, configuration, **kwargs):
                 raise ValueError("Custom filter must be a subclass of FeatureFilter")
             self._filters[feature_filter.name] = feature_filter
 
+    @staticmethod
+    def _check_default_disabled_variant(feature_flag):
+        """
+        A method called when the feature flag is disabled, to determine what the default variant should be. If there is
+        no allocation, then None is set as the value of the variant in the EvaluationEvent.
+
+        :param FeatureFlag feature_flag: Feature flag object.
+        :return: EvaluationEvent
+        """
+        if not feature_flag.allocation:
+            return EvaluationEvent(enabled=False)
+        return FeatureManager._check_variant_override(
+            feature_flag.variants, feature_flag.allocation.default_when_disabled, False
+        )
+
+    @staticmethod
+    def _check_default_enabled_variant(feature_flag):
+        """
+        A method called when the feature flag is enabled, to determine what the default variant should be. If there is
+        no allocation, then None is set as the value of the variant in the EvaluationEvent.
+
+        :param FeatureFlag feature_flag: Feature flag object.
+        :return: EvaluationEvent
+        """
+        if not feature_flag.allocation:
+            return EvaluationEvent(enabled=True)
+        return FeatureManager._check_variant_override(
+            feature_flag.variants, feature_flag.allocation.default_when_enabled, True
+        )
+
+    @staticmethod
+    def _check_variant_override(variants, default_variant_name, status):
+        """
+        A method to check if a variant is overridden to be enabled or disabled by the variant.
+
+        :param list[Variant] variants: List of variants.
+        :param str default_variant_name: Name of the default variant.
+        :param bool status: Status of the feature flag.
+        :return: EvaluationEvent
+        """
+        if not variants or not default_variant_name:
+            return EvaluationEvent(enabled=status)
+        for variant in variants:
+            if variant.name == default_variant_name:
+                if variant.status_override == "Enabled":
+                    return EvaluationEvent(enabled=True)
+                if variant.status_override == "Disabled":
+                    return EvaluationEvent(enabled=False)
+        return EvaluationEvent(enabled=status)
+
+    @staticmethod
+    def _is_targeted(context_id):
+        """Determine if the user is targeted for the given context"""
+        hashed_context_id = hashlib.sha256(context_id.encode()).digest()
+        context_marker = int.from_bytes(hashed_context_id[:4], byteorder="little", signed=False)
+
+        return (context_marker / (2**32 - 1)) * 100
+
+    def _assign_variant(self, feature_flag, targeting_context):
+        """
+        Assign a variant to the user based on the allocation.
+
+        :param FeatureFlag feature_flag: Feature flag object.
+        :param TargetingContext targeting_context: Targeting context.
+        :return: Variant name.
+        """
+        if not feature_flag.variants or not feature_flag.allocation:
+            return None
+        if feature_flag.allocation.user and targeting_context.user_id:
+            for user_allocation in feature_flag.allocation.user:
+                if targeting_context.user_id in user_allocation.users:
+                    return user_allocation.variant
+        if feature_flag.allocation.group and len(targeting_context.groups) > 0:
+            for group_allocation in feature_flag.allocation.group:
+                for group in targeting_context.groups:
+                    if group in group_allocation.groups:
+                        return group_allocation.variant
+        if feature_flag.allocation.percentile:
+            context_id = targeting_context.user_id + "\n" + feature_flag.allocation.seed
+            box = self._is_targeted(context_id)
+            for percentile_allocation in feature_flag.allocation.percentile:
+                if box == 100 and percentile_allocation.percentile_to == 100:
+                    return percentile_allocation.variant
+                if percentile_allocation.percentile_from <= box < percentile_allocation.percentile_to:
+                    return percentile_allocation.variant
+        return None
+
+    def _variant_name_to_variant(self, feature_flag, variant_name):
+        """
+        Get the variant object from the variant name.
+
+        :param FeatureFlag feature_flag: Feature flag object.
+        :param str variant_name: Name of the variant.
+        :return: Variant object.
+        """
+        if not feature_flag.variants:
+            return None
+        for variant_reference in feature_flag.variants:
+            if variant_reference.name == variant_name:
+                configuration = variant_reference.configuration_value
+                if not configuration:
+                    configuration = self._configuration.get(variant_reference.configuration_reference)
+                return Variant(variant_reference.name, configuration)
+        return None
+
     def _build_targeting_context(self, args):
         """
         Builds a TargetingContext, either returns a provided context, takes the provided user_id to make a context, or
@@ -126,6 +232,31 @@ def is_enabled(self, feature_flag_id, *args, **kwargs):
         result = self._check_feature(feature_flag_id, targeting_context, **kwargs)
         return result.enabled
 
+    @overload
+    def get_variant(self, feature_flag_id, user_id, **kwargs):
+        """
+        Determine the variant for the given context.
+
+        :param str feature_flag_id: Name of the feature flag.
+        :param str user_id: User identifier.
+        :return: return: Variant instance.
+        :rtype: Variant
+        """
+
+    def get_variant(self, feature_flag_id, *args, **kwargs):
+        """
+        Determine the variant for the given context.
+
+        :param str feature_flag_id: Name of the feature flag
+        :keyword TargetingContext targeting_context: Targeting context.
+        :return: Variant instance.
+        :rtype: Variant
+        """
+        targeting_context = self._build_targeting_context(args)
+
+        result = self._check_feature(feature_flag_id, targeting_context, **kwargs)
+        return result.variant
+
     def _check_feature_filters(self, feature_flag, targeting_context, **kwargs):
         feature_conditions = feature_flag.conditions
         feature_filters = feature_conditions.client_filters
@@ -154,6 +285,30 @@ def _check_feature_filters(self, feature_flag, targeting_context, **kwargs):
                 break
         return evaluation_event
 
+    def _assign_allocation(self, feature_flag, evaluation_event, targeting_context):
+        if feature_flag.allocation and feature_flag.variants:
+            variant_name = self._assign_variant(feature_flag, targeting_context)
+            if variant_name:
+                evaluation_event.enabled = FeatureManager._check_variant_override(
+                    feature_flag.variants, variant_name, evaluation_event.enabled
+                ).enabled
+                evaluation_event.variant = self._variant_name_to_variant(feature_flag, variant_name)
+                evaluation_event.feature = feature_flag
+                return evaluation_event
+
+        variant_name = None
+        if evaluation_event.enabled:
+            evaluation_event = FeatureManager._check_default_enabled_variant(feature_flag)
+            if feature_flag.allocation:
+                variant_name = feature_flag.allocation.default_when_enabled
+        else:
+            evaluation_event = FeatureManager._check_default_disabled_variant(feature_flag)
+            if feature_flag.allocation:
+                variant_name = feature_flag.allocation.default_when_disabled
+        evaluation_event.variant = self._variant_name_to_variant(feature_flag, variant_name)
+        evaluation_event.feature = feature_flag
+        return evaluation_event
+
     def _check_feature(self, feature_flag_id, targeting_context, **kwargs):
         """
         Determine if the feature flag is enabled for the given context.
@@ -179,9 +334,16 @@ def _check_feature(self, feature_flag_id, targeting_context, **kwargs):
 
         if not feature_flag.enabled:
             # Feature flags that are disabled are always disabled
-            return EvaluationEvent(enabled=False)
+            evaluation_event = FeatureManager._check_default_disabled_variant(feature_flag)
+            if feature_flag.allocation:
+                variant_name = feature_flag.allocation.default_when_disabled
+                evaluation_event.variant = self._variant_name_to_variant(feature_flag, variant_name)
+            evaluation_event.feature = feature_flag
+            return evaluation_event
+
+        evaluation_event = self._check_feature_filters(feature_flag, targeting_context, **kwargs)
 
-        return self._check_feature_filters(feature_flag, targeting_context, **kwargs)
+        return self._assign_allocation(feature_flag, evaluation_event, targeting_context)
 
     def list_feature_flag_names(self):
         """

featuremanagement/_models/__init__.py

@@ -4,9 +4,10 @@
 # license information.
 # -------------------------------------------------------------------------
 from ._feature_flag import FeatureFlag
+from ._variant import Variant
 from ._evaluation_event import EvaluationEvent
 from ._targeting_context import TargetingContext
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)  # type: ignore
 
-__all__ = ["FeatureFlag", "EvaluationEvent", "TargetingContext"]
+__all__ = ["FeatureFlag", "Variant", "EvaluationEvent", "TargetingContext"]