Merge branch 'farhan-anjum/FSSDK-11175-add-decision-service-methods-for-cmab' into farhan-anjum/FSSDK-11184-update-impression-event-for-cmab

FarhanAnjum-opti · FarhanAnjum-opti · commit 265ea3cff0b1 · 2025-07-07T22:12:40.000+06:00
diff --git a/optimizely/bucketer.py b/optimizely/bucketer.py
@@ -124,7 +124,7 @@ def bucket(
             variation = project_config.get_variation_from_id_by_experiment_id(experiment.id, variation_id)
             return variation, decide_reasons
 
-        elif not decide_reasons:
+        else:
             message = 'Bucketed into an empty traffic range. Returning nil.'
             project_config.logger.info(message)
             decide_reasons.append(message)
diff --git a/optimizely/decision/optimizely_decision.py b/optimizely/decision/optimizely_decision.py
@@ -66,5 +66,5 @@ def new_error_decision(cls, key: str, user: OptimizelyUserContext, reasons: list
             rule_key=None,
             flag_key=key,
             user_context=user,
-            reasons=[reasons[-1]] if reasons else []
+            reasons=reasons if reasons else []
         )
diff --git a/optimizely/decision_service.py b/optimizely/decision_service.py
@@ -184,13 +184,16 @@ def _get_decision_for_cmab_experiment(
                 "reasons": decide_reasons,
             }
         except Exception as e:
-            error_message = Errors.CMAB_FETCH_FAILED_DETAILED.format(experiment.key)
+            error_message = Errors.CMAB_FETCH_FAILED_DETAILED.format(
+                experiment.key
+            )
+            decide_reasons.append(error_message)
             if self.logger:
                 self.logger.error(f'{error_message} {str(e)}')
             return {
                 "error": True,
                 "result": None,
-                "reasons": [error_message],
+                "reasons": decide_reasons,
             }
 
     def set_forced_variation(
diff --git a/tests/test_bucketing.py b/tests/test_bucketing.py
@@ -337,7 +337,12 @@ def test_bucket__experiment_in_group(self):
                 variation
             )
         mock_config_logging.debug.assert_called_once_with('Assigned bucket 8400 to user with bucketing ID "test_user".')
-        mock_config_logging.info.assert_called_once_with('User "test_user" is in no experiment.')
+        mock_config_logging.info.assert_has_calls(
+            [
+                mock.call('User "test_user" is in no experiment.'),
+                mock.call('Bucketed into an empty traffic range. Returning nil.')
+            ]
+        )
 
         # In group, no matching experiment
         with mock.patch(
@@ -378,8 +383,11 @@ def test_bucket__experiment_in_group(self):
                 variation
             )
         mock_config_logging.debug.assert_called_once_with('Assigned bucket 42 to user with bucketing ID "test_user".')
-        mock_config_logging.info.assert_called_once_with(
-            'User "test_user" is not in experiment "group_exp_2" of group 19228.'
+        mock_config_logging.info.assert_has_calls(
+            [
+                mock.call('User "test_user" is not in experiment "group_exp_2" of group 19228.'),
+                mock.call('Bucketed into an empty traffic range. Returning nil.')
+            ]
         )
 
         # In group no matching variation
diff --git a/tests/test_optimizely.py b/tests/test_optimizely.py
@@ -5794,7 +5794,7 @@ def test_decide_returns_error_decision_when_decision_service_fails(self):
         ):
             # Call decide
             decision = user_context.decide('test_feature_in_experiment')
-            print(decision.__dict__)
+
             # Verify the decision contains the error information
             self.assertFalse(decision.enabled)
             self.assertIsNone(decision.variation_key)

Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,5 @@ def new_error_decision(cls, key: str, user: OptimizelyUserContext, reasons: list`
`66`	`66`	`rule_key=None,`
`67`	`67`	`flag_key=key,`
`68`	`68`	`user_context=user,`
`69`		`- reasons=[reasons[-1]] if reasons else []`
	`69`	`+ reasons=reasons if reasons else []`
`70`	`70`	`)`