Fix type check error

Author: esrakartalOpt

optimizely/decision_service.py

@@ -83,7 +83,7 @@ class Decision(NamedTuple):
     variation: Optional[entities.Variation]
     source: Optional[str]
     cmab_uuid: Optional[str]
-    holdout: Optional[Dict[str, str]]
+    holdout: Optional[Dict[str, str]] = None
 
 
 class DecisionService:
@@ -712,7 +712,8 @@ def get_decision_for_flag(
             holdout_decision = self.get_variation_for_holdout(holdout, user_context, project_config)
             reasons.extend(holdout_decision['reasons'])
 
-            if not holdout_decision['decision']:
+            decision = holdout_decision['decision']
+            if (decision.experiment is None and decision.variation is None and decision.holdout is None):
                 continue
 
             message = (
@@ -738,7 +739,7 @@ def get_decision_for_flag(
             reasons.extend(fallback_result['reasons'])
 
         return {
-            'decision': fallback_result.get('decision'),
+            'decision': fallback_result['decision'],
             'error': fallback_result.get('error', False),
             'reasons': reasons
         }
@@ -772,7 +773,7 @@ def get_variation_for_holdout(
             self.logger.info(message)
             decide_reasons.append(message)
             return {
-                'decision': None,
+                'decision': Decision(None, None, None, None, None),
                 'error': False,
                 'reasons': decide_reasons
             }
@@ -793,17 +794,22 @@ def get_variation_for_holdout(
         decide_reasons.extend(reasons_received)
 
         if not user_meets_audience_conditions:
-            message = f"User '{user_id}' does not meet the conditions for holdout '{holdout['key']}'."
+            message = (
+                f"User '{user_id}' does not meet the conditions for holdout "
+                f"'{holdout['key']}'."
+            )
             self.logger.debug(message)
             decide_reasons.append(message)
             return {
-                'decision': None,
+                'decision': Decision(None, None, None, None, None),
                 'error': False,
                 'reasons': decide_reasons
             }
 
         # Bucket user into holdout variation
-        variation, bucket_reasons = self.bucketer.bucket(project_config, holdout, user_id, bucketing_id)
+        variation, bucket_reasons = self.bucketer.bucket(
+            project_config, holdout, user_id, bucketing_id  # type: ignore[arg-type]
+        )
         decide_reasons.extend(bucket_reasons)
 
         if variation:
@@ -834,7 +840,7 @@ def get_variation_for_holdout(
         self.logger.info(message)
         decide_reasons.append(message)
         return {
-            'decision': None,
+            'decision': Decision(None, None, None, None, None),
             'error': False,
             'reasons': decide_reasons
         }

tests/test_decision_service_holdout.py

@@ -289,8 +289,9 @@ def test_user_bucketed_into_holdout_returns_before_experiments(self):
         # Decision should be valid
         if decision_result.get('decision'):
             decision = decision_result['decision']
-            self.assertIsNotNone(decision.experiment)
-            self.assertIsNotNone(decision.source)
+            self.assertEqual(decision.source, enums.DecisionSources.HOLDOUT)
+            self.assertIsNotNone(decision.holdout)
+            self.assertEqual(decision.holdout.get('key'), 'test_holdout')
 
     def test_no_holdout_decision_falls_through_to_experiment_and_rollout(self):
         """When holdout returns no decision, should fall through to experiment and rollout evaluation."""