updated evaluator

Author: chillaq

splitio/engine/evaluator.py

@@ -74,21 +74,21 @@ def eval_with_context(self, key, bucketing, feature_name, attrs, ctx):
         }
 
     def _get_fallback_treatment_and_label(self, feature_name, treatment, label):
-        if self._fallback_treatments_configuration == None or self._fallback_treatments_configuration.fallback_config == None:
+        if self._fallback_treatments_configuration == None:
             return label, treatment, None
 
-        if self._fallback_treatments_configuration.fallback_config.by_flag_fallback_treatment != None and \
-            self._fallback_treatments_configuration.fallback_config.by_flag_fallback_treatment.get(feature_name) != None:
+        if self._fallback_treatments_configuration.by_flag_fallback_treatment != None and \
+            self._fallback_treatments_configuration.by_flag_fallback_treatment.get(feature_name) != None:
             _LOGGER.debug('Using Fallback Treatment for feature: %s', feature_name)            
-            return self._fallback_treatments_configuration.fallback_config.by_flag_fallback_treatment.get(feature_name).label_prefix + label, \
-                self._fallback_treatments_configuration.fallback_config.by_flag_fallback_treatment.get(feature_name).treatment,  \
-                self._fallback_treatments_configuration.fallback_config.by_flag_fallback_treatment.get(feature_name).config
+            return self._fallback_treatments_configuration.by_flag_fallback_treatment.get(feature_name).label_prefix + label, \
+                self._fallback_treatments_configuration.by_flag_fallback_treatment.get(feature_name).treatment,  \
+                self._fallback_treatments_configuration.by_flag_fallback_treatment.get(feature_name).config
 
-        if self._fallback_treatments_configuration.fallback_config.global_fallback_treatment != None:
+        if self._fallback_treatments_configuration.global_fallback_treatment != None:
             _LOGGER.debug('Using Global Fallback Treatment.')            
-            return  self._fallback_treatments_configuration.fallback_config.global_fallback_treatment.label_prefix + label, \
-                self._fallback_treatments_configuration.fallback_config.global_fallback_treatment.treatment,  \
-                self._fallback_treatments_configuration.fallback_config.global_fallback_treatment.config
+            return  self._fallback_treatments_configuration.global_fallback_treatment.label_prefix + label, \
+                self._fallback_treatments_configuration.global_fallback_treatment.treatment,  \
+                self._fallback_treatments_configuration.global_fallback_treatment.config
 
         return label, treatment, None
 

tests/engine/test_evaluator.py

@@ -12,7 +12,7 @@
 from splitio.models.grammar import condition
 from splitio.models import rule_based_segments
 from splitio.models.fallback_treatment import FallbackTreatment
-from splitio.models.fallback_config import FallbackConfig, FallbackTreatmentsConfiguration
+from splitio.models.fallback_config import FallbackTreatmentsConfiguration
 from splitio.engine import evaluator, splitters
 from splitio.engine.evaluator import EvaluationContext
 from splitio.storage.inmemmory import InMemorySplitStorage, InMemorySegmentStorage, InMemoryRuleBasedSegmentStorage, \
@@ -384,7 +384,7 @@ def test_evaluate_treatment_with_fallback(self, mocker):
 
         # should use global fallback
         logger_mock.reset_mock()
-        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackConfig(FallbackTreatment("off-global", {"prop":"val"}))))
+        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackTreatment("off-global", {"prop":"val"})))
         result = e.eval_with_context('some_key', 'some_bucketing_key', 'some2', {}, ctx)
         assert result['treatment'] == 'off-global'
         assert result['configurations'] == '{"prop": "val"}'
@@ -394,29 +394,29 @@ def test_evaluate_treatment_with_fallback(self, mocker):
 
         # should use by flag fallback
         logger_mock.reset_mock()
-        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackConfig(None, {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})})))
+        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(None, {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})}))
         result = e.eval_with_context('some_key', 'some_bucketing_key', 'some2', {}, ctx)
         assert result['treatment'] == 'off-some2'
         assert result['configurations'] == '{"prop2": "val2"}'
         assert result['impression']['label'] == "fallback - " + Label.SPLIT_NOT_FOUND
         assert logger_mock.debug.mock_calls[0] == mocker.call("Using Fallback Treatment for feature: %s", "some2")
 
         # should not use any fallback
-        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackConfig(None, {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})})))
+        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(None, {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})}))
         result = e.eval_with_context('some_key', 'some_bucketing_key', 'some3', {}, ctx)
         assert result['treatment'] == 'control'
         assert result['configurations'] == None
         assert result['impression']['label'] == Label.SPLIT_NOT_FOUND
 
         # should use by flag fallback
-        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackConfig(FallbackTreatment("off-global", {"prop":"val"}), {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})})))
+        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackTreatment("off-global", {"prop":"val"}), {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})}))
         result = e.eval_with_context('some_key', 'some_bucketing_key', 'some2', {}, ctx)
         assert result['treatment'] == 'off-some2'
         assert result['configurations'] == '{"prop2": "val2"}'
         assert result['impression']['label'] == "fallback - " + Label.SPLIT_NOT_FOUND
 
         # should global flag fallback
-        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackConfig(FallbackTreatment("off-global", {"prop":"val"}), {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})})))
+        e = evaluator.Evaluator(splitter_mock, FallbackTreatmentsConfiguration(FallbackTreatment("off-global", {"prop":"val"}), {"some2": FallbackTreatment("off-some2", {"prop2":"val2"})}))
         result = e.eval_with_context('some_key', 'some_bucketing_key', 'some3', {}, ctx)
         assert result['treatment'] == 'off-global'
         assert result['configurations'] == '{"prop": "val"}'