Fix unit and FSC tests

Author: esrakartalOpt

optimizely/decision_service.py

@@ -708,7 +708,7 @@ def get_decision_for_flag(
         user_id = user_context.user_id
 
         # Check holdouts
-        holdouts = project_config.get_holdouts_for_flag(feature_flag.key)
+        holdouts = project_config.get_holdouts_for_flag(feature_flag.id)
         for holdout in holdouts:
             holdout_decision = self.get_variation_for_holdout(holdout, user_context, project_config)
             reasons.extend(holdout_decision['reasons'])
@@ -907,7 +907,7 @@ def get_variation_for_holdout(
 
             # Create Decision for holdout - pass holdout dict as experiment, source is HOLDOUT
             holdout_decision: Decision = Decision(
-                experiment=holdout,
+                experiment=None,
                 variation=variation,
                 source=enums.DecisionSources.HOLDOUT,
                 cmab_uuid=None

optimizely/optimizely.py

@@ -15,7 +15,7 @@
 
 from typing import TYPE_CHECKING, Any, Optional, Union
 
-from optimizely.helpers.types import VariationDict
+from optimizely.helpers.types import HoldoutDict, VariationDict
 
 
 from . import decision_service
@@ -261,10 +261,10 @@ def _get_feature_enabled(self, variation: Optional[Union[entities.Variation, Var
         except (AttributeError, KeyError, TypeError):
             return False
 
-    def _get_experiment_key(self, experiment: Optional[Union[entities.Experiment, dict]]) -> Optional[str]:
+    def _get_experiment_key(self, experiment: Optional[Union[entities.Experiment, HoldoutDict]]) -> Optional[str]:
         """Helper to extract experiment/holdout key from either dict or Experiment object.
         Args:
-            experiment: Either a dict (from holdout) or entities.Experiment object
+            experiment: Either a HoldoutDict (from holdout) or entities.Experiment object
         Returns:
             The experiment/holdout key as a string, or None if not available
         """

optimizely/project_config.py

@@ -833,12 +833,12 @@ def get_flag_variation(
 
         return None
 
-    def get_holdouts_for_flag(self, flag_key: str) -> list[HoldoutDict]:
+    def get_holdouts_for_flag(self, flag_key_or_id: str) -> list[HoldoutDict]:
         """ Helper method to get holdouts from an applied feature flag.
 
         Args:
-            flag_key: Key of the feature flag.
-                     This parameter is required and should not be null/None.
+            flag_key_or_id: Key or ID of the feature flag.
+                           This parameter is required and should not be null/None.
 
         Returns:
             The holdouts that apply for a specific flag.
@@ -847,18 +847,21 @@ def get_holdouts_for_flag(self, flag_key: str) -> list[HoldoutDict]:
             return []
 
         # Check cache first (before validation, so we cache the validation result too)
-        if flag_key in self.flag_holdouts_map:
-            return self.flag_holdouts_map[flag_key]
+        if flag_key_or_id in self.flag_holdouts_map:
+            return self.flag_holdouts_map[flag_key_or_id]
 
-        # Validate that the flag exists in the datafile
-        feature = self.feature_key_map.get(flag_key)
-        if not feature:
+        # Find the flag by key or ID
+        flag_id = None
+        for flag in self.feature_flags:
+            if flag['id'] == flag_key_or_id or flag['key'] == flag_key_or_id:
+                flag_id = flag['id']
+                break
+
+        if flag_id is None:
             # Cache the empty result for non-existent flags
-            self.flag_holdouts_map[flag_key] = []
+            self.flag_holdouts_map[flag_key_or_id] = []
             return []
 
-        flag_id = feature.id
-
         # Prioritize global holdouts first
         excluded = self.excluded_holdouts.get(flag_id, [])
 
@@ -875,10 +878,10 @@ def get_holdouts_for_flag(self, flag_key: str) -> list[HoldoutDict]:
         included = self.included_holdouts.get(flag_id, [])
         active_holdouts.extend(included)
 
-        # Cache the result
-        self.flag_holdouts_map[flag_key] = active_holdouts
+        # Cache the result using the input parameter as the cache key
+        self.flag_holdouts_map[flag_key_or_id] = active_holdouts
 
-        return self.flag_holdouts_map[flag_key]
+        return self.flag_holdouts_map[flag_key_or_id]
 
     def get_holdout(self, holdout_id: str) -> Optional[HoldoutDict]:
         """ Helper method to get holdout from holdout ID.