From 813d20c08439237b252e935be3be866a1cd59010 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 12:45:25 -0600 Subject: [PATCH 01/12] [FSSDK-12094] Fix Ruby holdout implementation which related to FSC failures --- optimizely/decision_service.py | 211 +++++++++++++------------ optimizely/optimizely.py | 25 +-- optimizely/project_config.py | 90 +++++++---- tests/test_config.py | 4 +- tests/test_decision_service.py | 15 +- tests/test_decision_service_holdout.py | 13 +- tests/test_user_context.py | 6 +- 7 files changed, 209 insertions(+), 155 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 78be89d8..a14c55f4 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -714,8 +714,8 @@ def get_decision_for_flag( reasons.extend(holdout_decision['reasons']) decision = holdout_decision['decision'] - # Check if user was bucketed into holdout (has a variation) - if decision.variation is None: + # Check if user was bucketed into holdout (has a decision) + if decision is None: continue message = ( @@ -730,21 +730,102 @@ def get_decision_for_flag( 'reasons': reasons } - # If no holdout decision, fall back to existing experiment/rollout logic - # Use get_variations_for_feature_list which handles experiments and rollouts - fallback_result = self.get_variations_for_feature_list( - project_config, [feature_flag], user_context, decide_options - )[0] - - # Merge reasons - if fallback_result.get('reasons'): - reasons.extend(fallback_result['reasons']) + # Check if the feature flag has an experiment and the user is bucketed into that experiment + if feature_flag.experimentIds: + # Iterate through experiments to find a match + for experiment_id in feature_flag.experimentIds: + experiment = project_config.get_experiment_from_id(experiment_id) + if not experiment: + continue + + # Check for forced decision + optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext( + feature_flag.key, experiment.key + ) + forced_decision_variation, forced_reasons = self.validated_forced_decision( + project_config, optimizely_decision_context, user_context + ) + reasons.extend(forced_reasons) + + if forced_decision_variation: + decision = Decision( + experiment, forced_decision_variation, enums.DecisionSources.FEATURE_TEST, None + ) + return { + 'decision': decision, + 'error': False, + 'reasons': reasons + } + + # Get variation through normal bucketing + variation_result = self.get_variation( + project_config, experiment, user_context, user_profile_tracker, reasons, decide_options + ) + cmab_uuid = variation_result['cmab_uuid'] + variation_reasons = variation_result['reasons'] + decision_variation = variation_result['variation'] + error = variation_result['error'] + reasons.extend(variation_reasons) + + # If there's an error, return immediately + if error: + decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) + return { + 'decision': decision, + 'error': True, + 'reasons': reasons + } + + # If user is bucketed into a variation, return the decision + if decision_variation: + self.logger.debug( + f'User "{user_id}" ' + f'bucketed into experiment "{experiment.key}" of feature "{feature_flag.key}".' + ) + decision = Decision( + experiment, decision_variation, enums.DecisionSources.FEATURE_TEST, cmab_uuid + ) + return { + 'decision': decision, + 'error': False, + 'reasons': reasons + } + + # Check if the feature flag has a rollout and the user is bucketed into that rollout + rollout_decision, rollout_reasons = self.get_variation_for_rollout( + project_config, feature_flag, user_context + ) + reasons.extend(rollout_reasons) + + if rollout_decision and rollout_decision.variation: + # Check if this was a forced decision (last reason contains "forced decision map") + is_forced_decision = reasons and 'forced decision map' in reasons[-1] if reasons else False + + if not is_forced_decision: + # Only add the "bucketed into rollout" message for normal bucketing + message = ( + f"The user '{user_id}' is bucketed into a rollout " + f"for feature flag '{feature_flag.key}'." + ) + self.logger.info(message) + reasons.append(message) - return { - 'decision': fallback_result['decision'], - 'error': fallback_result.get('error', False), - 'reasons': reasons - } + return { + 'decision': rollout_decision, + 'error': False, + 'reasons': reasons + } + else: + message = ( + f"The user '{user_id}' is not bucketed into a rollout " + f"for feature flag '{feature_flag.key}'." + ) + self.logger.info(message) + return { + 'decision': Decision(None, None, enums.DecisionSources.ROLLOUT, None), + 'error': False, + 'reasons': reasons + } def get_variation_for_holdout( self, @@ -931,100 +1012,24 @@ def get_variations_for_feature_list( - 'error': Boolean indicating if an error occurred during the decision process. - 'reasons': List of log messages representing decision making for each feature. """ - decide_reasons: list[str] = [] - + ignore_ups = False if options: ignore_ups = OptimizelyDecideOption.IGNORE_USER_PROFILE_SERVICE in options - else: - ignore_ups = False user_profile_tracker: Optional[UserProfileTracker] = None - if self.user_profile_service is not None and not ignore_ups: - user_profile_tracker = UserProfileTracker(user_context.user_id, self.user_profile_service, self.logger) - user_profile_tracker.load_user_profile(decide_reasons, None) + if not ignore_ups and self.user_profile_service: + user_id = user_context.user_id + user_profile_tracker = UserProfileTracker(user_id, self.user_profile_service, self.logger) + user_profile_tracker.load_user_profile([], None) decisions = [] + for feature_flag in features: + decision = self.get_decision_for_flag( + feature_flag, user_context, project_config, options, user_profile_tracker + ) + decisions.append(decision) - for feature in features: - feature_reasons = decide_reasons.copy() - experiment_decision_found = False # Track if an experiment decision was made for the feature - - # Check if the feature flag is under an experiment - if feature.experimentIds: - for experiment_id in feature.experimentIds: - experiment = project_config.get_experiment_from_id(experiment_id) - decision_variation: Optional[Union[entities.Variation, VariationDict]] = None - - if experiment: - optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext( - feature.key, experiment.key) - forced_decision_variation, reasons_received = self.validated_forced_decision( - project_config, optimizely_decision_context, user_context) - feature_reasons.extend(reasons_received) - - if forced_decision_variation: - decision_variation = forced_decision_variation - cmab_uuid = None - error = False - else: - variation_result = self.get_variation( - project_config, experiment, user_context, user_profile_tracker, feature_reasons, options - ) - cmab_uuid = variation_result['cmab_uuid'] - variation_reasons = variation_result['reasons'] - decision_variation = variation_result['variation'] - error = variation_result['error'] - feature_reasons.extend(variation_reasons) - - if error: - decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) - decision_result: DecisionResult = { - 'decision': decision, - 'error': True, - 'reasons': feature_reasons - } - decisions.append(decision_result) - experiment_decision_found = True - break - - if decision_variation: - self.logger.debug( - f'User "{user_context.user_id}" ' - f'bucketed into experiment "{experiment.key}" of feature "{feature.key}".' - ) - decision = Decision(experiment, decision_variation, - enums.DecisionSources.FEATURE_TEST, cmab_uuid) - decision_result = { - 'decision': decision, - 'error': False, - 'reasons': feature_reasons - } - decisions.append(decision_result) - experiment_decision_found = True # Mark that a decision was found - break # Stop after the first successful experiment decision - - # Only process rollout if no experiment decision was found and no error - if not experiment_decision_found: - rollout_decision, rollout_reasons = self.get_variation_for_rollout(project_config, - feature, - user_context) - if rollout_reasons: - feature_reasons.extend(rollout_reasons) - if rollout_decision: - self.logger.debug(f'User "{user_context.user_id}" ' - f'bucketed into rollout for feature "{feature.key}".') - else: - self.logger.debug(f'User "{user_context.user_id}" ' - f'not bucketed into any rollout for feature "{feature.key}".') - - decision_result = { - 'decision': rollout_decision, - 'error': False, - 'reasons': feature_reasons - } - decisions.append(decision_result) - - if self.user_profile_service is not None and user_profile_tracker is not None and ignore_ups is False: + if user_profile_tracker: user_profile_tracker.save_user_profile() return decisions diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index 7b27d849..7353e10a 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -433,7 +433,7 @@ def _get_feature_variable_for_type( decision_result = self.decision_service.get_variation_for_feature(project_config, feature_flag, user_context) decision = decision_result['decision'] - if decision.variation: + if decision and decision.variation: feature_enabled = self._get_feature_enabled(decision.variation) if feature_enabled: @@ -792,23 +792,24 @@ def is_feature_enabled(self, feature_key: str, user_id: str, attributes: Optiona user_context = OptimizelyUserContext(self, self.logger, user_id, attributes, False) decision = self.decision_service.get_variation_for_feature(project_config, feature, user_context)['decision'] - cmab_uuid = decision.cmab_uuid + cmab_uuid = decision.cmab_uuid if decision else None - is_source_experiment = decision.source == enums.DecisionSources.FEATURE_TEST - is_source_rollout = decision.source == enums.DecisionSources.ROLLOUT + is_source_experiment = decision.source == enums.DecisionSources.FEATURE_TEST if decision else False + is_source_rollout = decision.source == enums.DecisionSources.ROLLOUT if decision else False - if decision.variation: + if decision and decision.variation: if self._get_feature_enabled(decision.variation) is True: feature_enabled = True - if (is_source_rollout or not decision.variation) and project_config.get_send_flag_decisions_value(): + if (decision and (is_source_rollout or not decision.variation) and + project_config.get_send_flag_decisions_value()): self._send_impression_event( project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key if decision.experiment else '', str(decision.source), feature_enabled, user_id, attributes, cmab_uuid ) # Send event if Decision came from an experiment. - if is_source_experiment and decision.variation and decision.experiment: + if decision and is_source_experiment and decision.variation and decision.experiment: source_info = { 'experiment_key': decision.experiment.key, 'variation_key': self._get_variation_key(decision.variation), @@ -1244,7 +1245,7 @@ def _create_optimizely_decision( ) -> OptimizelyDecision: user_id = user_context.user_id feature_enabled = False - if flag_decision.variation is not None: + if flag_decision and flag_decision.variation is not None: if self._get_feature_enabled(flag_decision.variation): feature_enabled = True @@ -1252,9 +1253,9 @@ def _create_optimizely_decision( # Create Optimizely Decision Result. attributes = user_context.get_user_attributes() - rule_key = flag_decision.experiment.key if flag_decision.experiment else None + rule_key = flag_decision.experiment.key if (flag_decision and flag_decision.experiment) else None all_variables = {} - decision_source = flag_decision.source + decision_source = flag_decision.source if flag_decision else None decision_event_dispatched = False feature_flag = project_config.feature_key_map.get(flag_key) @@ -1262,7 +1263,9 @@ def _create_optimizely_decision( # Send impression event if Decision came from a feature # test and decide options doesn't include disableDecisionEvent if OptimizelyDecideOption.DISABLE_DECISION_EVENT not in decide_options: - if decision_source == DecisionSources.FEATURE_TEST or project_config.send_flag_decisions: + if (decision_source == DecisionSources.FEATURE_TEST or + decision_source == DecisionSources.HOLDOUT or + project_config.send_flag_decisions): self._send_impression_event(project_config, flag_decision.experiment, flag_decision.variation, diff --git a/optimizely/project_config.py b/optimizely/project_config.py index 23508bb6..d8ee66c3 100644 --- a/optimizely/project_config.py +++ b/optimizely/project_config.py @@ -92,7 +92,7 @@ def __init__(self, datafile: str | bytes, logger: Logger, error_handler: Any): self.holdouts: list[HoldoutDict] = config.get('holdouts', []) self.holdout_id_map: dict[str, HoldoutDict] = {} - self.global_holdouts: dict[str, HoldoutDict] = {} + self.global_holdouts: list[HoldoutDict] = [] self.included_holdouts: dict[str, list[HoldoutDict]] = {} self.excluded_holdouts: dict[str, list[HoldoutDict]] = {} self.flag_holdouts_map: dict[str, list[HoldoutDict]] = {} @@ -101,27 +101,40 @@ def __init__(self, datafile: str | bytes, logger: Logger, error_handler: Any): if holdout.get('status') != 'Running': continue + # Ensure holdout has layerId field (holdouts don't have campaigns) + if 'layerId' not in holdout: + holdout['layerId'] = '' + holdout_id = holdout['id'] self.holdout_id_map[holdout_id] = holdout - included_flags = holdout.get('includedFlags') - if not included_flags: - # This is a global holdout - self.global_holdouts[holdout_id] = holdout - - excluded_flags = holdout.get('excludedFlags') - if excluded_flags: - for flag_id in excluded_flags: - if flag_id not in self.excluded_holdouts: - self.excluded_holdouts[flag_id] = [] - self.excluded_holdouts[flag_id].append(holdout) - else: - # This holdout applies to specific flags + included_flags = holdout.get('includedFlags', []) + excluded_flags = holdout.get('excludedFlags', []) + + has_included = bool(included_flags) + has_excluded = bool(excluded_flags) + + if not has_included and not has_excluded: + # No included or excluded flags - this is a global holdout + self.global_holdouts.append(holdout) + + elif has_included: + # Has included flags - add to included_holdouts map + # (works for both cases with or without excluded flags) for flag_id in included_flags: if flag_id not in self.included_holdouts: self.included_holdouts[flag_id] = [] self.included_holdouts[flag_id].append(holdout) + elif has_excluded and not has_included: + # No included flags but has excluded flags - global with exclusions + self.global_holdouts.append(holdout) + + for flag_id in excluded_flags: + if flag_id not in self.excluded_holdouts: + self.excluded_holdouts[flag_id] = [] + self.excluded_holdouts[flag_id].append(holdout) + # Utility maps for quick lookup self.group_id_map: dict[str, entities.Group] = self._generate_key_map(self.groups, 'id', entities.Group) self.experiment_id_map: dict[str, entities.Experiment] = self._generate_key_map( @@ -221,20 +234,6 @@ def __init__(self, datafile: str | bytes, logger: Logger, error_handler: Any): self.experiment_feature_map[exp_id] = [feature.id] rules.append(self.experiment_id_map[exp_id]) - flag_id = feature.id - applicable_holdouts = [] - - if flag_id in self.included_holdouts: - applicable_holdouts.extend(self.included_holdouts[flag_id]) - - for holdout in self.global_holdouts.values(): - excluded_flag_ids = holdout.get('excludedFlags', []) - if flag_id not in excluded_flag_ids: - applicable_holdouts.append(holdout) - - if applicable_holdouts: - self.flag_holdouts_map[feature.key] = applicable_holdouts - rollout = None if len(feature.rolloutId) == 0 else self.rollout_id_map[feature.rolloutId] if rollout: for exp in rollout.experiments: @@ -839,6 +838,7 @@ def get_holdouts_for_flag(self, flag_key: str) -> list[HoldoutDict]: Args: flag_key: Key of the feature flag. + This parameter is required and should not be null/None. Returns: The holdouts that apply for a specific flag. @@ -846,7 +846,39 @@ def get_holdouts_for_flag(self, flag_key: str) -> list[HoldoutDict]: if not self.holdouts: return [] - return self.flag_holdouts_map.get(flag_key, []) + # 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] + + # Validate that the flag exists in the datafile + feature = self.feature_key_map.get(flag_key) + if not feature: + # Cache the empty result for non-existent flags + self.flag_holdouts_map[flag_key] = [] + return [] + + flag_id = feature.id + + # Prioritize global holdouts first + excluded = self.excluded_holdouts.get(flag_id, []) + + if excluded: + # Filter out excluded holdouts from global holdouts + active_holdouts = [ + holdout for holdout in self.global_holdouts + if holdout not in excluded + ] + else: + active_holdouts = self.global_holdouts.copy() + + # Append included holdouts + included = self.included_holdouts.get(flag_id, []) + active_holdouts.extend(included) + + # Cache the result + self.flag_holdouts_map[flag_key] = active_holdouts + + return self.flag_holdouts_map[flag_key] def get_holdout(self, holdout_id: str) -> Optional[HoldoutDict]: """ Helper method to get holdout from holdout ID. diff --git a/tests/test_config.py b/tests/test_config.py index 08a81f6d..7c1097e4 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1512,7 +1512,9 @@ def test_holdout_initialization__categorizes_holdouts_properly(self): self.assertIn('holdout_1', self.config_with_holdouts.holdout_id_map) self.assertIn('holdout_2', self.config_with_holdouts.holdout_id_map) - self.assertIn('holdout_1', self.config_with_holdouts.global_holdouts) + # Check if holdout_1 is in global_holdouts (list of dicts) + holdout_ids = [h['id'] for h in self.config_with_holdouts.global_holdouts] + self.assertIn('holdout_1', holdout_ids) # Use correct feature flag IDs boolean_feature_id = '91111' diff --git a/tests/test_decision_service.py b/tests/test_decision_service.py index dbcb7436..231a79f9 100644 --- a/tests/test_decision_service.py +++ b/tests/test_decision_service.py @@ -1377,15 +1377,19 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_rollout(sel expected_variation = self.project_config.get_variation_from_id( "211127", "211129" ) + from optimizely.decision_service import Decision + from optimizely.helpers import enums + expected_decision = Decision(None, expected_variation, enums.DecisionSources.ROLLOUT, None) get_variation_for_rollout_patch = mock.patch( "optimizely.decision_service.DecisionService.get_variation_for_rollout", - return_value=[expected_variation, None], + return_value=(expected_decision, []), ) with get_variation_for_rollout_patch as mock_get_variation_for_rollout, \ self.mock_decision_logger as mock_decision_service_logging: - variation_received = self.decision_service.get_variation_for_feature( + decision_result = self.decision_service.get_variation_for_feature( self.project_config, feature, user, False - )['decision'] + ) + variation_received = decision_result['decision'].variation if decision_result['decision'] else None self.assertEqual( expected_variation, variation_received, @@ -1395,9 +1399,8 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_rollout(sel self.project_config, feature, user ) - # Assert no log messages were generated - self.assertEqual(1, mock_decision_service_logging.debug.call_count) - self.assertEqual(1, len(mock_decision_service_logging.method_calls)) + # Assert info log messages were generated (changed from debug due to new flow through get_decision_for_flag) + self.assertEqual(1, mock_decision_service_logging.info.call_count) def test_get_variation_for_feature__returns_variation_if_user_not_in_experiment_but_in_rollout( self, diff --git a/tests/test_decision_service_holdout.py b/tests/test_decision_service_holdout.py index 0f47e997..d74c6618 100644 --- a/tests/test_decision_service_holdout.py +++ b/tests/test_decision_service_holdout.py @@ -507,9 +507,16 @@ def test_uses_consistent_bucketing_for_same_user(self): # If both have decisions, they should match if decision1 and decision2: - # Variation is an object, not a dict, so use attributes - var1_id = decision1.variation.id if decision1.variation else None - var2_id = decision2.variation.id if decision2.variation else None + # Variation can be either an object or a dict (for holdouts) + def get_variation_id(variation): + if variation is None: + return None + if isinstance(variation, dict): + return variation.get('id') + return variation.id + + var1_id = get_variation_id(decision1.variation) + var2_id = get_variation_id(decision2.variation) self.assertEqual( var1_id, var2_id, diff --git a/tests/test_user_context.py b/tests/test_user_context.py index 3ae9be0d..fbc261bb 100644 --- a/tests/test_user_context.py +++ b/tests/test_user_context.py @@ -872,7 +872,8 @@ def test_decide__option__include_reasons__feature_rollout(self): 'Evaluating audiences for rule 1: ["11154"].', 'Audiences for rule 1 collectively evaluated to TRUE.', 'User "test_user" meets audience conditions for targeting rule 1.', - 'User "test_user" bucketed into a targeting rule 1.' + 'User "test_user" bucketed into a targeting rule 1.', + 'The user "test_user" is bucketed into a rollout for feature flag "test_feature_in_rollout".' ] self.assertEqual(expected_reasons, actual.reasons) @@ -1270,7 +1271,8 @@ def test_decide_reasons__hit_everyone_else_rule(self): 'Evaluating audiences for rule Everyone Else: [].', 'Audiences for rule Everyone Else collectively evaluated to TRUE.', 'User "abcde" meets audience conditions for targeting rule Everyone Else.', - 'User "abcde" bucketed into a targeting rule Everyone Else.' + 'User "abcde" bucketed into a targeting rule Everyone Else.', + "The user 'abcde' is bucketed into a rollout for feature flag 'test_feature_in_rollout'." ] self.assertEqual(expected_reasons, actual.reasons) From 46640d809bc8cad816f8df2e36ba35456f7420c5 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 13:26:58 -0600 Subject: [PATCH 02/12] Fix tests --- optimizely/decision_service.py | 8 ++++---- tests/test_user_context.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index a14c55f4..d3c5438b 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -714,8 +714,8 @@ def get_decision_for_flag( reasons.extend(holdout_decision['reasons']) decision = holdout_decision['decision'] - # Check if user was bucketed into holdout (has a decision) - if decision is None: + # Check if user was bucketed into holdout (has a variation) + if decision is None or decision.variation is None: continue message = ( @@ -905,9 +905,9 @@ def get_variation_for_holdout( self.logger.info(message) decide_reasons.append(message) - # Create Decision for holdout - experiment is None, source is HOLDOUT + # Create Decision for holdout - pass holdout dict as experiment, source is HOLDOUT holdout_decision: Decision = Decision( - experiment=None, + experiment=holdout, variation=variation, source=enums.DecisionSources.HOLDOUT, cmab_uuid=None diff --git a/tests/test_user_context.py b/tests/test_user_context.py index fbc261bb..1b72e3e3 100644 --- a/tests/test_user_context.py +++ b/tests/test_user_context.py @@ -873,7 +873,7 @@ def test_decide__option__include_reasons__feature_rollout(self): 'Audiences for rule 1 collectively evaluated to TRUE.', 'User "test_user" meets audience conditions for targeting rule 1.', 'User "test_user" bucketed into a targeting rule 1.', - 'The user "test_user" is bucketed into a rollout for feature flag "test_feature_in_rollout".' + "The user 'test_user' is bucketed into a rollout for feature flag 'test_feature_in_rollout'." ] self.assertEqual(expected_reasons, actual.reasons) From b3f17f1c317e0bfd126185be25d7188559875c0b Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 14:38:12 -0600 Subject: [PATCH 03/12] Fix unit and FSC --- optimizely/event/user_event_factory.py | 6 ++++- optimizely/optimizely.py | 37 ++++++++++++++++++++------ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/optimizely/event/user_event_factory.py b/optimizely/event/user_event_factory.py index 7a77720f..d1a7e64a 100644 --- a/optimizely/event/user_event_factory.py +++ b/optimizely/event/user_event_factory.py @@ -67,7 +67,11 @@ def create_impression_event( variation: Optional[Variation] = None experiment_id = None if activated_experiment: - experiment_id = activated_experiment.id + # Handle both Experiment objects and holdout dicts + if isinstance(activated_experiment, dict): + experiment_id = activated_experiment.get('id') + else: + experiment_id = activated_experiment.id if variation_id and flag_key: # need this condition when we send events involving forced decisions diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index 7353e10a..670cd2ea 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -261,6 +261,25 @@ 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]: + """Helper to extract experiment/holdout key from either dict or Experiment object. + Args: + experiment: Either a dict (from holdout) or entities.Experiment object + Returns: + The experiment/holdout key as a string, or None if not available + """ + if experiment is None: + return None + + try: + if isinstance(experiment, dict): + return experiment.get('key') + else: + return experiment.key + except (AttributeError, KeyError, TypeError): + self.logger.warning(f"Unable to extract experiment key from {type(experiment)}") + return None + def _validate_instantiation_options(self) -> None: """ Helper method to validate all instantiation parameters. @@ -455,7 +474,7 @@ def _get_feature_variable_for_type( if decision.source in (enums.DecisionSources.FEATURE_TEST, enums.DecisionSources.HOLDOUT): source_info = { - 'experiment_key': decision.experiment.key if decision.experiment else None, + 'experiment_key': self._get_experiment_key(decision.experiment), 'variation_key': self._get_variation_key(decision.variation), } @@ -559,7 +578,7 @@ def _get_all_feature_variables_for_type( if decision.source == enums.DecisionSources.FEATURE_TEST: source_info = { - 'experiment_key': decision.experiment.key if decision.experiment else None, + 'experiment_key': self._get_experiment_key(decision.experiment), 'variation_key': self._get_variation_key(decision.variation), } @@ -804,19 +823,21 @@ def is_feature_enabled(self, feature_key: str, user_id: str, attributes: Optiona if (decision and (is_source_rollout or not decision.variation) and project_config.get_send_flag_decisions_value()): self._send_impression_event( - project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key if - decision.experiment else '', str(decision.source), feature_enabled, user_id, attributes, cmab_uuid + project_config, decision.experiment, decision.variation, feature.key, + self._get_experiment_key(decision.experiment) or '', str(decision.source), feature_enabled, + user_id, attributes, cmab_uuid ) # Send event if Decision came from an experiment. if decision and is_source_experiment and decision.variation and decision.experiment: source_info = { - 'experiment_key': decision.experiment.key, + 'experiment_key': self._get_experiment_key(decision.experiment), 'variation_key': self._get_variation_key(decision.variation), } self._send_impression_event( - project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key, - str(decision.source), feature_enabled, user_id, attributes, cmab_uuid + project_config, decision.experiment, decision.variation, feature.key, + self._get_experiment_key(decision.experiment) or '', str(decision.source), feature_enabled, + user_id, attributes, cmab_uuid ) if feature_enabled: @@ -1253,7 +1274,7 @@ def _create_optimizely_decision( # Create Optimizely Decision Result. attributes = user_context.get_user_attributes() - rule_key = flag_decision.experiment.key if (flag_decision and flag_decision.experiment) else None + rule_key = self._get_experiment_key(flag_decision.experiment) if flag_decision else None all_variables = {} decision_source = flag_decision.source if flag_decision else None decision_event_dispatched = False From 4acf348c7f8541b56ef11f2bd70cfa85f83ae66e Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 21:55:37 -0600 Subject: [PATCH 04/12] Fix unit and FSC tests --- optimizely/decision_service.py | 4 ++-- optimizely/optimizely.py | 6 +++--- optimizely/project_config.py | 31 +++++++++++++++++-------------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index d3c5438b..d2b7f00b 100644 --- a/optimizely/decision_service.py +++ b/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 diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index 670cd2ea..017c1b7b 100644 --- a/optimizely/optimizely.py +++ b/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 """ diff --git a/optimizely/project_config.py b/optimizely/project_config.py index d8ee66c3..75115293 100644 --- a/optimizely/project_config.py +++ b/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. From 232d26cf83879fd2735441595dc8f999f05437d2 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 22:12:34 -0600 Subject: [PATCH 05/12] Fix type check problems --- .github/workflows/python.yml | 9 +++++---- optimizely/decision_service.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 6baa2c09..24d95e6a 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -91,10 +91,11 @@ jobs: fail-fast: false matrix: python-version: - - "pypy-3.9" - - "pypy-3.10" - - "3.9" - - "3.10" + # disabled due to librt is not available on this pypy version + # - "pypy-3.9" + # - "pypy-3.10" + # - "3.9" + # - "3.10" - "3.11" - "3.12" steps: diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index d2b7f00b..659bd803 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -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=None, + experiment=holdout, # type: ignore[arg-type] variation=variation, source=enums.DecisionSources.HOLDOUT, cmab_uuid=None From e6ad886bfda9918971dbaef17da34c5ca5ea092a Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 23:11:53 -0600 Subject: [PATCH 06/12] Implement Ruby changes correctly --- optimizely/decision_service.py | 10 +++--- optimizely/optimizely.py | 58 +++++++++++----------------------- optimizely/project_config.py | 41 ++++++++++-------------- 3 files changed, 39 insertions(+), 70 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 659bd803..09e61de7 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -708,14 +708,14 @@ def get_decision_for_flag( user_id = user_context.user_id # Check holdouts - holdouts = project_config.get_holdouts_for_flag(feature_flag.id) + holdouts = project_config.get_holdouts_for_flag(feature_flag.key) for holdout in holdouts: holdout_decision = self.get_variation_for_holdout(holdout, user_context, project_config) reasons.extend(holdout_decision['reasons']) decision = holdout_decision['decision'] # Check if user was bucketed into holdout (has a variation) - if decision is None or decision.variation is None: + if decision.variation is None: continue message = ( @@ -905,9 +905,9 @@ def get_variation_for_holdout( self.logger.info(message) decide_reasons.append(message) - # Create Decision for holdout - pass holdout dict as experiment, source is HOLDOUT + # Create Decision for holdout - experiment is None, source is HOLDOUT holdout_decision: Decision = Decision( - experiment=holdout, # type: ignore[arg-type] + experiment=None, variation=variation, source=enums.DecisionSources.HOLDOUT, cmab_uuid=None @@ -1017,7 +1017,7 @@ def get_variations_for_feature_list( ignore_ups = OptimizelyDecideOption.IGNORE_USER_PROFILE_SERVICE in options user_profile_tracker: Optional[UserProfileTracker] = None - if not ignore_ups and self.user_profile_service: + if self.user_profile_service is not None and not ignore_ups: user_id = user_context.user_id user_profile_tracker = UserProfileTracker(user_id, self.user_profile_service, self.logger) user_profile_tracker.load_user_profile([], None) diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index 017c1b7b..c6c37d5c 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -15,7 +15,7 @@ from typing import TYPE_CHECKING, Any, Optional, Union -from optimizely.helpers.types import HoldoutDict, VariationDict +from optimizely.helpers.types import VariationDict from . import decision_service @@ -261,25 +261,6 @@ 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, HoldoutDict]]) -> Optional[str]: - """Helper to extract experiment/holdout key from either dict or Experiment object. - Args: - experiment: Either a HoldoutDict (from holdout) or entities.Experiment object - Returns: - The experiment/holdout key as a string, or None if not available - """ - if experiment is None: - return None - - try: - if isinstance(experiment, dict): - return experiment.get('key') - else: - return experiment.key - except (AttributeError, KeyError, TypeError): - self.logger.warning(f"Unable to extract experiment key from {type(experiment)}") - return None - def _validate_instantiation_options(self) -> None: """ Helper method to validate all instantiation parameters. @@ -452,7 +433,7 @@ def _get_feature_variable_for_type( decision_result = self.decision_service.get_variation_for_feature(project_config, feature_flag, user_context) decision = decision_result['decision'] - if decision and decision.variation: + if decision.variation: feature_enabled = self._get_feature_enabled(decision.variation) if feature_enabled: @@ -474,7 +455,7 @@ def _get_feature_variable_for_type( if decision.source in (enums.DecisionSources.FEATURE_TEST, enums.DecisionSources.HOLDOUT): source_info = { - 'experiment_key': self._get_experiment_key(decision.experiment), + 'experiment_key': decision.experiment.key if decision.experiment else None, 'variation_key': self._get_variation_key(decision.variation), } @@ -578,7 +559,7 @@ def _get_all_feature_variables_for_type( if decision.source == enums.DecisionSources.FEATURE_TEST: source_info = { - 'experiment_key': self._get_experiment_key(decision.experiment), + 'experiment_key': decision.experiment.key if decision.experiment else None, 'variation_key': self._get_variation_key(decision.variation), } @@ -811,33 +792,30 @@ def is_feature_enabled(self, feature_key: str, user_id: str, attributes: Optiona user_context = OptimizelyUserContext(self, self.logger, user_id, attributes, False) decision = self.decision_service.get_variation_for_feature(project_config, feature, user_context)['decision'] - cmab_uuid = decision.cmab_uuid if decision else None + cmab_uuid = decision.cmab_uuid - is_source_experiment = decision.source == enums.DecisionSources.FEATURE_TEST if decision else False - is_source_rollout = decision.source == enums.DecisionSources.ROLLOUT if decision else False + is_source_experiment = decision.source == enums.DecisionSources.FEATURE_TEST + is_source_rollout = decision.source == enums.DecisionSources.ROLLOUT - if decision and decision.variation: + if decision.variation: if self._get_feature_enabled(decision.variation) is True: feature_enabled = True - if (decision and (is_source_rollout or not decision.variation) and - project_config.get_send_flag_decisions_value()): + if (is_source_rollout or not decision.variation) and project_config.get_send_flag_decisions_value(): self._send_impression_event( - project_config, decision.experiment, decision.variation, feature.key, - self._get_experiment_key(decision.experiment) or '', str(decision.source), feature_enabled, - user_id, attributes, cmab_uuid + project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key if + decision.experiment else '', str(decision.source), feature_enabled, user_id, attributes, cmab_uuid ) # Send event if Decision came from an experiment. - if decision and is_source_experiment and decision.variation and decision.experiment: + if is_source_experiment and decision.variation and decision.experiment: source_info = { - 'experiment_key': self._get_experiment_key(decision.experiment), + 'experiment_key': decision.experiment.key, 'variation_key': self._get_variation_key(decision.variation), } self._send_impression_event( - project_config, decision.experiment, decision.variation, feature.key, - self._get_experiment_key(decision.experiment) or '', str(decision.source), feature_enabled, - user_id, attributes, cmab_uuid + project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key, + str(decision.source), feature_enabled, user_id, attributes, cmab_uuid ) if feature_enabled: @@ -1266,7 +1244,7 @@ def _create_optimizely_decision( ) -> OptimizelyDecision: user_id = user_context.user_id feature_enabled = False - if flag_decision and flag_decision.variation is not None: + if flag_decision.variation is not None: if self._get_feature_enabled(flag_decision.variation): feature_enabled = True @@ -1274,9 +1252,9 @@ def _create_optimizely_decision( # Create Optimizely Decision Result. attributes = user_context.get_user_attributes() - rule_key = self._get_experiment_key(flag_decision.experiment) if flag_decision else None + rule_key = flag_decision.experiment.key if flag_decision.experiment else None all_variables = {} - decision_source = flag_decision.source if flag_decision else None + decision_source = flag_decision.source decision_event_dispatched = False feature_flag = project_config.feature_key_map.get(flag_key) diff --git a/optimizely/project_config.py b/optimizely/project_config.py index 75115293..32cd7e32 100644 --- a/optimizely/project_config.py +++ b/optimizely/project_config.py @@ -833,12 +833,12 @@ def get_flag_variation( return None - def get_holdouts_for_flag(self, flag_key_or_id: str) -> list[HoldoutDict]: + def get_holdouts_for_flag(self, flag_key: str) -> list[HoldoutDict]: """ Helper method to get holdouts from an applied feature flag. Args: - flag_key_or_id: Key or ID of the feature flag. - This parameter is required and should not be null/None. + flag_key: Key of the feature flag. + This parameter is required and should not be null/None. Returns: The holdouts that apply for a specific flag. @@ -846,31 +846,22 @@ def get_holdouts_for_flag(self, flag_key_or_id: str) -> list[HoldoutDict]: if not self.holdouts: return [] - # Check cache first (before validation, so we cache the validation result too) - if flag_key_or_id in self.flag_holdouts_map: - return self.flag_holdouts_map[flag_key_or_id] - - # 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_or_id] = [] + # Get the feature flag to extract flag_id + feature = self.feature_key_map.get(flag_key) + if not feature: return [] + flag_id = feature.id + + # Check cache first (before validation, so we cache the validation result too) + if flag_id in self.flag_holdouts_map: + return self.flag_holdouts_map[flag_id] + # Prioritize global holdouts first excluded = self.excluded_holdouts.get(flag_id, []) if excluded: - # Filter out excluded holdouts from global holdouts - active_holdouts = [ - holdout for holdout in self.global_holdouts - if holdout not in excluded - ] + active_holdouts = [holdout for holdout in self.global_holdouts if holdout not in excluded] else: active_holdouts = self.global_holdouts.copy() @@ -878,10 +869,10 @@ def get_holdouts_for_flag(self, flag_key_or_id: str) -> list[HoldoutDict]: included = self.included_holdouts.get(flag_id, []) active_holdouts.extend(included) - # Cache the result using the input parameter as the cache key - self.flag_holdouts_map[flag_key_or_id] = active_holdouts + # Cache the result + self.flag_holdouts_map[flag_id] = active_holdouts - return self.flag_holdouts_map[flag_key_or_id] + return self.flag_holdouts_map[flag_id] def get_holdout(self, holdout_id: str) -> Optional[HoldoutDict]: """ Helper method to get holdout from holdout ID. From c505bc049134d49d3a205f5fecf2134fe250a121 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Wed, 10 Dec 2025 23:29:35 -0600 Subject: [PATCH 07/12] Fix FSC --- optimizely/decision_service.py | 4 ++-- optimizely/optimizely.py | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 09e61de7..412287aa 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -905,9 +905,9 @@ def get_variation_for_holdout( self.logger.info(message) decide_reasons.append(message) - # Create Decision for holdout - experiment is None, source is HOLDOUT + # Create Decision for holdout - pass holdout dict as experiment, source is HOLDOUT holdout_decision: Decision = Decision( - experiment=None, + experiment=holdout, # type: ignore[arg-type] variation=variation, source=enums.DecisionSources.HOLDOUT, cmab_uuid=None diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index c6c37d5c..c61c8db5 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -1252,7 +1252,15 @@ def _create_optimizely_decision( # Create Optimizely Decision Result. attributes = user_context.get_user_attributes() - rule_key = flag_decision.experiment.key if flag_decision.experiment else None + # Handle both Experiment entities and holdout dicts + if flag_decision.experiment: + if isinstance(flag_decision.experiment, dict): + # Holdout is a dict, not an Experiment entity + rule_key = flag_decision.experiment.get('key') + else: + rule_key = flag_decision.experiment.key + else: + rule_key = None all_variables = {} decision_source = flag_decision.source decision_event_dispatched = False From ef9114b7301c5eb53301fb76de7b1a779dff64c4 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Thu, 11 Dec 2025 11:50:11 -0600 Subject: [PATCH 08/12] Revert unnecessary changes --- optimizely/decision_service.py | 209 ++++++++++++------------- optimizely/event/user_event_factory.py | 6 +- optimizely/optimizely.py | 10 +- tests/test_decision_service.py | 4 +- tests/test_user_context.py | 6 +- 5 files changed, 108 insertions(+), 127 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 412287aa..78be89d8 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -730,102 +730,21 @@ def get_decision_for_flag( 'reasons': reasons } - # Check if the feature flag has an experiment and the user is bucketed into that experiment - if feature_flag.experimentIds: - # Iterate through experiments to find a match - for experiment_id in feature_flag.experimentIds: - experiment = project_config.get_experiment_from_id(experiment_id) - if not experiment: - continue - - # Check for forced decision - optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext( - feature_flag.key, experiment.key - ) - forced_decision_variation, forced_reasons = self.validated_forced_decision( - project_config, optimizely_decision_context, user_context - ) - reasons.extend(forced_reasons) - - if forced_decision_variation: - decision = Decision( - experiment, forced_decision_variation, enums.DecisionSources.FEATURE_TEST, None - ) - return { - 'decision': decision, - 'error': False, - 'reasons': reasons - } - - # Get variation through normal bucketing - variation_result = self.get_variation( - project_config, experiment, user_context, user_profile_tracker, reasons, decide_options - ) - cmab_uuid = variation_result['cmab_uuid'] - variation_reasons = variation_result['reasons'] - decision_variation = variation_result['variation'] - error = variation_result['error'] - reasons.extend(variation_reasons) - - # If there's an error, return immediately - if error: - decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) - return { - 'decision': decision, - 'error': True, - 'reasons': reasons - } - - # If user is bucketed into a variation, return the decision - if decision_variation: - self.logger.debug( - f'User "{user_id}" ' - f'bucketed into experiment "{experiment.key}" of feature "{feature_flag.key}".' - ) - decision = Decision( - experiment, decision_variation, enums.DecisionSources.FEATURE_TEST, cmab_uuid - ) - return { - 'decision': decision, - 'error': False, - 'reasons': reasons - } - - # Check if the feature flag has a rollout and the user is bucketed into that rollout - rollout_decision, rollout_reasons = self.get_variation_for_rollout( - project_config, feature_flag, user_context - ) - reasons.extend(rollout_reasons) - - if rollout_decision and rollout_decision.variation: - # Check if this was a forced decision (last reason contains "forced decision map") - is_forced_decision = reasons and 'forced decision map' in reasons[-1] if reasons else False - - if not is_forced_decision: - # Only add the "bucketed into rollout" message for normal bucketing - message = ( - f"The user '{user_id}' is bucketed into a rollout " - f"for feature flag '{feature_flag.key}'." - ) - self.logger.info(message) - reasons.append(message) + # If no holdout decision, fall back to existing experiment/rollout logic + # Use get_variations_for_feature_list which handles experiments and rollouts + fallback_result = self.get_variations_for_feature_list( + project_config, [feature_flag], user_context, decide_options + )[0] - return { - 'decision': rollout_decision, - 'error': False, - 'reasons': reasons - } - else: - message = ( - f"The user '{user_id}' is not bucketed into a rollout " - f"for feature flag '{feature_flag.key}'." - ) - self.logger.info(message) - return { - 'decision': Decision(None, None, enums.DecisionSources.ROLLOUT, None), - 'error': False, - 'reasons': reasons - } + # Merge reasons + if fallback_result.get('reasons'): + reasons.extend(fallback_result['reasons']) + + return { + 'decision': fallback_result['decision'], + 'error': fallback_result.get('error', False), + 'reasons': reasons + } def get_variation_for_holdout( self, @@ -905,9 +824,9 @@ def get_variation_for_holdout( self.logger.info(message) decide_reasons.append(message) - # Create Decision for holdout - pass holdout dict as experiment, source is HOLDOUT + # Create Decision for holdout - experiment is None, source is HOLDOUT holdout_decision: Decision = Decision( - experiment=holdout, # type: ignore[arg-type] + experiment=None, variation=variation, source=enums.DecisionSources.HOLDOUT, cmab_uuid=None @@ -1012,24 +931,100 @@ def get_variations_for_feature_list( - 'error': Boolean indicating if an error occurred during the decision process. - 'reasons': List of log messages representing decision making for each feature. """ - ignore_ups = False + decide_reasons: list[str] = [] + if options: ignore_ups = OptimizelyDecideOption.IGNORE_USER_PROFILE_SERVICE in options + else: + ignore_ups = False user_profile_tracker: Optional[UserProfileTracker] = None if self.user_profile_service is not None and not ignore_ups: - user_id = user_context.user_id - user_profile_tracker = UserProfileTracker(user_id, self.user_profile_service, self.logger) - user_profile_tracker.load_user_profile([], None) + user_profile_tracker = UserProfileTracker(user_context.user_id, self.user_profile_service, self.logger) + user_profile_tracker.load_user_profile(decide_reasons, None) decisions = [] - for feature_flag in features: - decision = self.get_decision_for_flag( - feature_flag, user_context, project_config, options, user_profile_tracker - ) - decisions.append(decision) - if user_profile_tracker: + for feature in features: + feature_reasons = decide_reasons.copy() + experiment_decision_found = False # Track if an experiment decision was made for the feature + + # Check if the feature flag is under an experiment + if feature.experimentIds: + for experiment_id in feature.experimentIds: + experiment = project_config.get_experiment_from_id(experiment_id) + decision_variation: Optional[Union[entities.Variation, VariationDict]] = None + + if experiment: + optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext( + feature.key, experiment.key) + forced_decision_variation, reasons_received = self.validated_forced_decision( + project_config, optimizely_decision_context, user_context) + feature_reasons.extend(reasons_received) + + if forced_decision_variation: + decision_variation = forced_decision_variation + cmab_uuid = None + error = False + else: + variation_result = self.get_variation( + project_config, experiment, user_context, user_profile_tracker, feature_reasons, options + ) + cmab_uuid = variation_result['cmab_uuid'] + variation_reasons = variation_result['reasons'] + decision_variation = variation_result['variation'] + error = variation_result['error'] + feature_reasons.extend(variation_reasons) + + if error: + decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) + decision_result: DecisionResult = { + 'decision': decision, + 'error': True, + 'reasons': feature_reasons + } + decisions.append(decision_result) + experiment_decision_found = True + break + + if decision_variation: + self.logger.debug( + f'User "{user_context.user_id}" ' + f'bucketed into experiment "{experiment.key}" of feature "{feature.key}".' + ) + decision = Decision(experiment, decision_variation, + enums.DecisionSources.FEATURE_TEST, cmab_uuid) + decision_result = { + 'decision': decision, + 'error': False, + 'reasons': feature_reasons + } + decisions.append(decision_result) + experiment_decision_found = True # Mark that a decision was found + break # Stop after the first successful experiment decision + + # Only process rollout if no experiment decision was found and no error + if not experiment_decision_found: + rollout_decision, rollout_reasons = self.get_variation_for_rollout(project_config, + feature, + user_context) + if rollout_reasons: + feature_reasons.extend(rollout_reasons) + if rollout_decision: + self.logger.debug(f'User "{user_context.user_id}" ' + f'bucketed into rollout for feature "{feature.key}".') + else: + self.logger.debug(f'User "{user_context.user_id}" ' + f'not bucketed into any rollout for feature "{feature.key}".') + + decision_result = { + 'decision': rollout_decision, + 'error': False, + 'reasons': feature_reasons + } + decisions.append(decision_result) + + if self.user_profile_service is not None and user_profile_tracker is not None and ignore_ups is False: user_profile_tracker.save_user_profile() return decisions diff --git a/optimizely/event/user_event_factory.py b/optimizely/event/user_event_factory.py index d1a7e64a..7a77720f 100644 --- a/optimizely/event/user_event_factory.py +++ b/optimizely/event/user_event_factory.py @@ -67,11 +67,7 @@ def create_impression_event( variation: Optional[Variation] = None experiment_id = None if activated_experiment: - # Handle both Experiment objects and holdout dicts - if isinstance(activated_experiment, dict): - experiment_id = activated_experiment.get('id') - else: - experiment_id = activated_experiment.id + experiment_id = activated_experiment.id if variation_id and flag_key: # need this condition when we send events involving forced decisions diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index c61c8db5..c6c37d5c 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -1252,15 +1252,7 @@ def _create_optimizely_decision( # Create Optimizely Decision Result. attributes = user_context.get_user_attributes() - # Handle both Experiment entities and holdout dicts - if flag_decision.experiment: - if isinstance(flag_decision.experiment, dict): - # Holdout is a dict, not an Experiment entity - rule_key = flag_decision.experiment.get('key') - else: - rule_key = flag_decision.experiment.key - else: - rule_key = None + rule_key = flag_decision.experiment.key if flag_decision.experiment else None all_variables = {} decision_source = flag_decision.source decision_event_dispatched = False diff --git a/tests/test_decision_service.py b/tests/test_decision_service.py index 231a79f9..5fe99ee7 100644 --- a/tests/test_decision_service.py +++ b/tests/test_decision_service.py @@ -1399,8 +1399,8 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_rollout(sel self.project_config, feature, user ) - # Assert info log messages were generated (changed from debug due to new flow through get_decision_for_flag) - self.assertEqual(1, mock_decision_service_logging.info.call_count) + # Assert debug log messages were generated (rollout decisions log at debug level) + self.assertEqual(1, mock_decision_service_logging.debug.call_count) def test_get_variation_for_feature__returns_variation_if_user_not_in_experiment_but_in_rollout( self, diff --git a/tests/test_user_context.py b/tests/test_user_context.py index 1b72e3e3..3ae9be0d 100644 --- a/tests/test_user_context.py +++ b/tests/test_user_context.py @@ -872,8 +872,7 @@ def test_decide__option__include_reasons__feature_rollout(self): 'Evaluating audiences for rule 1: ["11154"].', 'Audiences for rule 1 collectively evaluated to TRUE.', 'User "test_user" meets audience conditions for targeting rule 1.', - 'User "test_user" bucketed into a targeting rule 1.', - "The user 'test_user' is bucketed into a rollout for feature flag 'test_feature_in_rollout'." + 'User "test_user" bucketed into a targeting rule 1.' ] self.assertEqual(expected_reasons, actual.reasons) @@ -1271,8 +1270,7 @@ def test_decide_reasons__hit_everyone_else_rule(self): 'Evaluating audiences for rule Everyone Else: [].', 'Audiences for rule Everyone Else collectively evaluated to TRUE.', 'User "abcde" meets audience conditions for targeting rule Everyone Else.', - 'User "abcde" bucketed into a targeting rule Everyone Else.', - "The user 'abcde' is bucketed into a rollout for feature flag 'test_feature_in_rollout'." + 'User "abcde" bucketed into a targeting rule Everyone Else.' ] self.assertEqual(expected_reasons, actual.reasons) From a20c3a23ce97261642179f84fea60a55ebd12357 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Thu, 11 Dec 2025 12:09:00 -0600 Subject: [PATCH 09/12] Fix FSC --- optimizely/decision_service.py | 35 +++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 78be89d8..723cca46 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -948,6 +948,39 @@ def get_variations_for_feature_list( for feature in features: feature_reasons = decide_reasons.copy() experiment_decision_found = False # Track if an experiment decision was made for the feature + holdout_decision_found = False # Track if a holdout decision was made for the feature + user_id = user_context.user_id + + # Check holdouts first (they take precedence over experiments and rollouts) + holdouts = project_config.get_holdouts_for_flag(feature.key) + for holdout in holdouts: + holdout_decision_result = self.get_variation_for_holdout(holdout, user_context, project_config) + feature_reasons.extend(holdout_decision_result['reasons']) + + decision = holdout_decision_result['decision'] + # Check if user was bucketed into holdout (has a variation) + if decision.variation is None: + continue + + message = ( + f"The user '{user_id}' is bucketed into holdout '{holdout['key']}' " + f"for feature flag '{feature.key}'." + ) + self.logger.info(message) + feature_reasons.append(message) + + decision_result: DecisionResult = { + 'decision': holdout_decision_result['decision'], + 'error': False, + 'reasons': feature_reasons + } + decisions.append(decision_result) + holdout_decision_found = True + break + + # If holdout decision found, skip experiment and rollout evaluation + if holdout_decision_found: + continue # Check if the feature flag is under an experiment if feature.experimentIds: @@ -978,7 +1011,7 @@ def get_variations_for_feature_list( if error: decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) - decision_result: DecisionResult = { + decision_result = { 'decision': decision, 'error': True, 'reasons': feature_reasons From d6329afb5c9809bcbef5a68db902d6740fada261 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Thu, 11 Dec 2025 12:21:25 -0600 Subject: [PATCH 10/12] Fix FSC holdout test cases --- optimizely/decision_service.py | 4 ++-- optimizely/event/user_event_factory.py | 4 +++- optimizely/optimizely.py | 15 +++++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 723cca46..413dece4 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -824,9 +824,9 @@ def get_variation_for_holdout( self.logger.info(message) decide_reasons.append(message) - # Create Decision for holdout - experiment is None, source is HOLDOUT + # Create Decision for holdout - pass holdout dict as experiment so rule_key can be extracted holdout_decision: Decision = Decision( - experiment=None, + experiment=holdout, # type: ignore[arg-type] variation=variation, source=enums.DecisionSources.HOLDOUT, cmab_uuid=None diff --git a/optimizely/event/user_event_factory.py b/optimizely/event/user_event_factory.py index 7a77720f..1816da06 100644 --- a/optimizely/event/user_event_factory.py +++ b/optimizely/event/user_event_factory.py @@ -67,7 +67,9 @@ def create_impression_event( variation: Optional[Variation] = None experiment_id = None if activated_experiment: - experiment_id = activated_experiment.id + # For holdouts, activated_experiment is a dict; for experiments, it's an Experiment entity + experiment_id = (activated_experiment['id'] if isinstance(activated_experiment, dict) + else activated_experiment.id) if variation_id and flag_key: # need this condition when we send events involving forced decisions diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index c6c37d5c..e44b3205 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -1252,7 +1252,12 @@ def _create_optimizely_decision( # Create Optimizely Decision Result. attributes = user_context.get_user_attributes() - rule_key = flag_decision.experiment.key if flag_decision.experiment else None + # For holdouts, experiment is a dict; for experiments, it's an Experiment entity + if flag_decision.experiment: + rule_key = (flag_decision.experiment['key'] if isinstance(flag_decision.experiment, dict) + else flag_decision.experiment.key) + else: + rule_key = None all_variables = {} decision_source = flag_decision.source decision_event_dispatched = False @@ -1303,9 +1308,11 @@ def _create_optimizely_decision( try: if flag_decision.experiment is not None: - experiment_id = flag_decision.experiment.id - except AttributeError: - self.logger.warning("flag_decision.experiment has no attribute 'id'") + # For holdouts, experiment is a dict; for experiments, it's an Experiment entity + experiment_id = (flag_decision.experiment['id'] if isinstance(flag_decision.experiment, dict) + else flag_decision.experiment.id) + except (AttributeError, KeyError, TypeError): + self.logger.warning("Unable to extract experiment_id from flag_decision.experiment") try: if flag_decision.variation is not None: From 129c049ad239a73a47b89e1d631e1d1281c85078 Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Thu, 11 Dec 2025 13:23:04 -0600 Subject: [PATCH 11/12] Please pass FSC --- optimizely/optimizely.py | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/optimizely/optimizely.py b/optimizely/optimizely.py index e44b3205..650221e6 100644 --- a/optimizely/optimizely.py +++ b/optimizely/optimizely.py @@ -454,8 +454,12 @@ def _get_feature_variable_for_type( ) if decision.source in (enums.DecisionSources.FEATURE_TEST, enums.DecisionSources.HOLDOUT): + experiment_key = None + if decision.experiment: + experiment_key = (decision.experiment['key'] if isinstance(decision.experiment, dict) + else decision.experiment.key) source_info = { - 'experiment_key': decision.experiment.key if decision.experiment else None, + 'experiment_key': experiment_key, 'variation_key': self._get_variation_key(decision.variation), } @@ -558,8 +562,12 @@ def _get_all_feature_variables_for_type( all_variables[variable_key] = actual_value if decision.source == enums.DecisionSources.FEATURE_TEST: + experiment_key = None + if decision.experiment: + experiment_key = (decision.experiment['key'] if isinstance(decision.experiment, dict) + else decision.experiment.key) source_info = { - 'experiment_key': decision.experiment.key if decision.experiment else None, + 'experiment_key': experiment_key, 'variation_key': self._get_variation_key(decision.variation), } @@ -802,19 +810,25 @@ def is_feature_enabled(self, feature_key: str, user_id: str, attributes: Optiona feature_enabled = True if (is_source_rollout or not decision.variation) and project_config.get_send_flag_decisions_value(): + experiment_key = '' + if decision.experiment: + experiment_key = (decision.experiment['key'] if isinstance(decision.experiment, dict) + else decision.experiment.key) self._send_impression_event( - project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key if - decision.experiment else '', str(decision.source), feature_enabled, user_id, attributes, cmab_uuid + project_config, decision.experiment, decision.variation, feature.key, experiment_key, + str(decision.source), feature_enabled, user_id, attributes, cmab_uuid ) # Send event if Decision came from an experiment. if is_source_experiment and decision.variation and decision.experiment: + experiment_key = (decision.experiment['key'] if isinstance(decision.experiment, dict) + else decision.experiment.key) source_info = { - 'experiment_key': decision.experiment.key, + 'experiment_key': experiment_key, 'variation_key': self._get_variation_key(decision.variation), } self._send_impression_event( - project_config, decision.experiment, decision.variation, feature.key, decision.experiment.key, + project_config, decision.experiment, decision.variation, feature.key, experiment_key, str(decision.source), feature_enabled, user_id, attributes, cmab_uuid ) From 9422468ce7a92cf0b62acba4e6b5106bfaa9f1de Mon Sep 17 00:00:00 2001 From: esrakartalOpt Date: Thu, 11 Dec 2025 14:55:55 -0600 Subject: [PATCH 12/12] Implement holdout correctly and fix tests --- optimizely/decision_service.py | 207 +++++++++++++-------------------- tests/test_decision_service.py | 4 +- tests/test_user_context.py | 6 +- 3 files changed, 88 insertions(+), 129 deletions(-) diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py index 413dece4..56b439ff 100644 --- a/optimizely/decision_service.py +++ b/optimizely/decision_service.py @@ -707,7 +707,7 @@ def get_decision_for_flag( reasons = decide_reasons.copy() if decide_reasons else [] user_id = user_context.user_id - # Check holdouts + # Check holdouts first (they take precedence) holdouts = project_config.get_holdouts_for_flag(feature_flag.key) for holdout in holdouts: holdout_decision = self.get_variation_for_holdout(holdout, user_context, project_config) @@ -730,21 +730,84 @@ def get_decision_for_flag( 'reasons': reasons } - # If no holdout decision, fall back to existing experiment/rollout logic - # Use get_variations_for_feature_list which handles experiments and rollouts - fallback_result = self.get_variations_for_feature_list( - project_config, [feature_flag], user_context, decide_options - )[0] - - # Merge reasons - if fallback_result.get('reasons'): - reasons.extend(fallback_result['reasons']) + # Check if the feature flag is under an experiment + if feature_flag.experimentIds: + for experiment_id in feature_flag.experimentIds: + experiment = project_config.get_experiment_from_id(experiment_id) + decision_variation: Optional[Union[entities.Variation, VariationDict]] = None + + if experiment: + optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext( + feature_flag.key, experiment.key) + forced_decision_variation, reasons_received = self.validated_forced_decision( + project_config, optimizely_decision_context, user_context) + reasons.extend(reasons_received) + + if forced_decision_variation: + decision_variation = forced_decision_variation + cmab_uuid = None + error = False + else: + variation_result = self.get_variation( + project_config, experiment, user_context, user_profile_tracker, reasons, decide_options + ) + cmab_uuid = variation_result['cmab_uuid'] + variation_reasons = variation_result['reasons'] + decision_variation = variation_result['variation'] + error = variation_result['error'] + reasons.extend(variation_reasons) + + if error: + # If there's an error (e.g., CMAB error), return immediately without falling back to rollout + decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) + return { + 'decision': decision, + 'error': True, + 'reasons': reasons + } + + if decision_variation: + self.logger.debug( + f'User "{user_context.user_id}" ' + f'bucketed into experiment "{experiment.key}" of feature "{feature_flag.key}".' + ) + decision = Decision(experiment, decision_variation, + enums.DecisionSources.FEATURE_TEST, cmab_uuid) + return { + 'decision': decision, + 'error': False, + 'reasons': reasons + } + + # Fall back to rollout + rollout_decision, rollout_reasons = self.get_variation_for_rollout(project_config, + feature_flag, + user_context) + reasons.extend(rollout_reasons) + + if rollout_decision and rollout_decision.variation: + # Check if this was a forced decision (last reason contains "forced decision map") + is_forced_decision = reasons and 'forced decision map' in reasons[-1] if reasons else False + + if not is_forced_decision: + # Only add the "bucketed into rollout" message for normal bucketing + message = f"The user '{user_id}' is bucketed into a rollout for feature flag '{feature_flag.key}'." + self.logger.info(message) + reasons.append(message) - return { - 'decision': fallback_result['decision'], - 'error': fallback_result.get('error', False), - 'reasons': reasons - } + return { + 'decision': rollout_decision, + 'error': False, + 'reasons': reasons + } + else: + message = f"The user '{user_id}' is not bucketed into a rollout for feature flag '{feature_flag.key}'." + self.logger.info(message) + return { + 'decision': Decision(None, None, enums.DecisionSources.ROLLOUT, None), + 'error': False, + 'reasons': reasons + } def get_variation_for_holdout( self, @@ -946,116 +1009,10 @@ def get_variations_for_feature_list( decisions = [] for feature in features: - feature_reasons = decide_reasons.copy() - experiment_decision_found = False # Track if an experiment decision was made for the feature - holdout_decision_found = False # Track if a holdout decision was made for the feature - user_id = user_context.user_id - - # Check holdouts first (they take precedence over experiments and rollouts) - holdouts = project_config.get_holdouts_for_flag(feature.key) - for holdout in holdouts: - holdout_decision_result = self.get_variation_for_holdout(holdout, user_context, project_config) - feature_reasons.extend(holdout_decision_result['reasons']) - - decision = holdout_decision_result['decision'] - # Check if user was bucketed into holdout (has a variation) - if decision.variation is None: - continue - - message = ( - f"The user '{user_id}' is bucketed into holdout '{holdout['key']}' " - f"for feature flag '{feature.key}'." - ) - self.logger.info(message) - feature_reasons.append(message) - - decision_result: DecisionResult = { - 'decision': holdout_decision_result['decision'], - 'error': False, - 'reasons': feature_reasons - } - decisions.append(decision_result) - holdout_decision_found = True - break - - # If holdout decision found, skip experiment and rollout evaluation - if holdout_decision_found: - continue - - # Check if the feature flag is under an experiment - if feature.experimentIds: - for experiment_id in feature.experimentIds: - experiment = project_config.get_experiment_from_id(experiment_id) - decision_variation: Optional[Union[entities.Variation, VariationDict]] = None - - if experiment: - optimizely_decision_context = OptimizelyUserContext.OptimizelyDecisionContext( - feature.key, experiment.key) - forced_decision_variation, reasons_received = self.validated_forced_decision( - project_config, optimizely_decision_context, user_context) - feature_reasons.extend(reasons_received) - - if forced_decision_variation: - decision_variation = forced_decision_variation - cmab_uuid = None - error = False - else: - variation_result = self.get_variation( - project_config, experiment, user_context, user_profile_tracker, feature_reasons, options - ) - cmab_uuid = variation_result['cmab_uuid'] - variation_reasons = variation_result['reasons'] - decision_variation = variation_result['variation'] - error = variation_result['error'] - feature_reasons.extend(variation_reasons) - - if error: - decision = Decision(experiment, None, enums.DecisionSources.FEATURE_TEST, cmab_uuid) - decision_result = { - 'decision': decision, - 'error': True, - 'reasons': feature_reasons - } - decisions.append(decision_result) - experiment_decision_found = True - break - - if decision_variation: - self.logger.debug( - f'User "{user_context.user_id}" ' - f'bucketed into experiment "{experiment.key}" of feature "{feature.key}".' - ) - decision = Decision(experiment, decision_variation, - enums.DecisionSources.FEATURE_TEST, cmab_uuid) - decision_result = { - 'decision': decision, - 'error': False, - 'reasons': feature_reasons - } - decisions.append(decision_result) - experiment_decision_found = True # Mark that a decision was found - break # Stop after the first successful experiment decision - - # Only process rollout if no experiment decision was found and no error - if not experiment_decision_found: - rollout_decision, rollout_reasons = self.get_variation_for_rollout(project_config, - feature, - user_context) - if rollout_reasons: - feature_reasons.extend(rollout_reasons) - if rollout_decision: - self.logger.debug(f'User "{user_context.user_id}" ' - f'bucketed into rollout for feature "{feature.key}".') - else: - self.logger.debug(f'User "{user_context.user_id}" ' - f'not bucketed into any rollout for feature "{feature.key}".') - - decision_result = { - 'decision': rollout_decision, - 'error': False, - 'reasons': feature_reasons - } - decisions.append(decision_result) + decision = self.get_decision_for_flag( + feature, user_context, project_config, options, user_profile_tracker, decide_reasons + ) + decisions.append(decision) if self.user_profile_service is not None and user_profile_tracker is not None and ignore_ups is False: user_profile_tracker.save_user_profile() diff --git a/tests/test_decision_service.py b/tests/test_decision_service.py index 5fe99ee7..dd183312 100644 --- a/tests/test_decision_service.py +++ b/tests/test_decision_service.py @@ -1399,8 +1399,8 @@ def test_get_variation_for_feature__returns_variation_for_feature_in_rollout(sel self.project_config, feature, user ) - # Assert debug log messages were generated (rollout decisions log at debug level) - self.assertEqual(1, mock_decision_service_logging.debug.call_count) + # Assert info log message was generated for rollout bucketing + self.assertEqual(1, mock_decision_service_logging.info.call_count) def test_get_variation_for_feature__returns_variation_if_user_not_in_experiment_but_in_rollout( self, diff --git a/tests/test_user_context.py b/tests/test_user_context.py index 3ae9be0d..1b72e3e3 100644 --- a/tests/test_user_context.py +++ b/tests/test_user_context.py @@ -872,7 +872,8 @@ def test_decide__option__include_reasons__feature_rollout(self): 'Evaluating audiences for rule 1: ["11154"].', 'Audiences for rule 1 collectively evaluated to TRUE.', 'User "test_user" meets audience conditions for targeting rule 1.', - 'User "test_user" bucketed into a targeting rule 1.' + 'User "test_user" bucketed into a targeting rule 1.', + "The user 'test_user' is bucketed into a rollout for feature flag 'test_feature_in_rollout'." ] self.assertEqual(expected_reasons, actual.reasons) @@ -1270,7 +1271,8 @@ def test_decide_reasons__hit_everyone_else_rule(self): 'Evaluating audiences for rule Everyone Else: [].', 'Audiences for rule Everyone Else collectively evaluated to TRUE.', 'User "abcde" meets audience conditions for targeting rule Everyone Else.', - 'User "abcde" bucketed into a targeting rule Everyone Else.' + 'User "abcde" bucketed into a targeting rule Everyone Else.', + "The user 'abcde' is bucketed into a rollout for feature flag 'test_feature_in_rollout'." ] self.assertEqual(expected_reasons, actual.reasons)