experiment_id and variation_id added to payloads

Author: FarhanAnjum-opti

optimizely/optimizely.py

@@ -340,7 +340,9 @@ def _get_feature_variable_for_type(
         user_context = OptimizelyUserContext(self, self.logger, user_id, attributes, False)
 
         decision, _ = self.decision_service.get_variation_for_feature(project_config, feature_flag, user_context)
-
+        experiment_id = decision.experiment.id if decision.experiment else None
+        variation_id = decision.variation.id if decision.variation else None
+    
         if decision.variation:
 
             feature_enabled = decision.variation.featureEnabled
@@ -386,6 +388,8 @@ def _get_feature_variable_for_type(
                 'variable_value': actual_value,
                 'variable_type': variable_type,
                 'source_info': source_info,
+                'experiment_id': experiment_id,
+                'variation_id': variation_id
             },
         )
         return actual_value
@@ -427,7 +431,9 @@ def _get_all_feature_variables_for_type(
         user_context = OptimizelyUserContext(self, self.logger, user_id, attributes, False)
 
         decision, _ = self.decision_service.get_variation_for_feature(project_config, feature_flag, user_context)
-
+        experiment_id = decision.experiment.id if decision.experiment else None
+        variation_id = decision.variation.id if decision.variation else None
+    
         if decision.variation:
 
             feature_enabled = decision.variation.featureEnabled
@@ -480,6 +486,8 @@ def _get_all_feature_variables_for_type(
                 'variable_values': all_variables,
                 'source': decision.source,
                 'source_info': source_info,
+                'experiment_id': experiment_id,
+                'variation_id': variation_id
             },
         )
         return all_variables
@@ -646,13 +654,21 @@ def get_variation(
             decision_notification_type = enums.DecisionNotificationTypes.FEATURE_TEST
         else:
             decision_notification_type = enums.DecisionNotificationTypes.AB_TEST
-
+            
+        experiment_id = experiment.id if experiment else None
+        variation_id = variation.id if variation else None
+        
         self.notification_center.send_notifications(
             enums.NotificationTypes.DECISION,
             decision_notification_type,
             user_id,
             attributes or {},
-            {'experiment_key': experiment_key, 'variation_key': variation_key},
+            {
+                'experiment_key': experiment_key,
+                'variation_key': variation_key,
+                'experiment_id': experiment_id,
+                'variation_id': variation_id
+            },
         )
 
         return variation_key
@@ -738,6 +754,8 @@ def is_feature_enabled(self, feature_key: str, user_id: str, attributes: Optiona
                 'feature_enabled': feature_enabled,
                 'source': decision.source,
                 'source_info': source_info,
+                'experiment_id': decision.experiment.id,
+                'variation_id': decision.variation.id
             },
         )
 
@@ -1202,6 +1220,15 @@ def _create_optimizely_decision(
             if flag_decision is not None and flag_decision.variation is not None
             else None
         )
+        
+        rollout_id = feature_flag.rolloutId if decision_source == DecisionSources.ROLLOUT else None
+        experiment_id = project_config.get_experiment_id_by_key_or_rollout_id(rule_key, rollout_id)
+        variation_id = None
+        if variation_key:
+            variation = project_config.get_variation_from_key_by_experiment_id(experiment_id, variation_key)
+            if variation:
+                variation_id = variation.id     
+        
         # Send notification
         self.notification_center.send_notifications(
             enums.NotificationTypes.DECISION,
@@ -1215,7 +1242,9 @@ def _create_optimizely_decision(
                 'variation_key': variation_key,
                 'rule_key': rule_key,
                 'reasons': decision_reasons if should_include_reasons else [],
-                'decision_event_dispatched': decision_event_dispatched
+                'decision_event_dispatched': decision_event_dispatched,
+                'experiment_id': experiment_id,
+                'variation_id': variation_id
 
             },
         )

optimizely/project_config.py

@@ -716,3 +716,31 @@ def get_flag_variation(
                     return variation
 
         return None
+
+    def get_experiment_id_by_key_or_rollout_id(self, key: str, rollout_id: Optional[str] = None) -> Optional[str]:
+        """
+        Retrieves the experiment ID associated with a given rule key or a specific rollout.
+
+        Args:
+            key: The key associated with the experiment rule.
+            rollout_id: The ID of the rollout to search if the key is not found.
+
+        Returns:
+            Optional[str]: The experiment ID if found, otherwise None.
+        """
+        # Try getting the experiment from experiment_key_map first
+        if key:
+            experiment = self.get_experiment_from_key(key)
+            if experiment:
+                return experiment.id
+
+        # If key is not found in experiment_key_map, check a specific rollout (if provided)
+        if rollout_id:
+            rollout = self.get_rollout_from_id(rollout_id)
+            if rollout:
+                for experiment in rollout.experiments:
+                    experiment = entities.Experiment(**experiment)
+                    if experiment.key == key:
+                        return experiment.id  
+
+        return None