polish

Author: chillaq

splitio/engine/evaluator.py

@@ -195,14 +195,20 @@ async def context_for(self, key, feature_names):
             splits.update(features)
             pending = set()
             for feature in features.values():
-                cf, cs, crbs = get_dependencies(feature)                    
+                cf, cs, crbs = get_dependencies(feature)     
+                for rbs in crbs:
+                    rbs_cf, rbs_cs, rbs_crbs = get_dependencies(await self._rbs_segment_storage.get(rbs))                
+                    cf.extend(rbs_cf)
+                    cs.extend(rbs_cs)
+                    crbs.extend(rbs_crbs)
+               
                 pending.update(filter(lambda f: f not in splits, cf))
                 pending_memberships.update(cs)
                 pending_rbs_memberships.update(crbs)
 
         rbs_segment_memberships = {}
         rbs_segment_conditions = {}
-        excluded_rbs_segments = {}
+        excluded_rbs_segments = set()
         key_membership = False
         segment_memberhsip = False
         for rbs_segment in pending_rbs_memberships:
@@ -218,7 +224,7 @@ async def context_for(self, key, feature_names):
                 if excluded_segment.type == SegmentType.RULE_BASED:
                     rbs_segment = await self._rbs_segment_storage.get(excluded_segment.name)
                     if rbs_segment is not None:
-                        excluded_rbs_segments.update()
+                        excluded_rbs_segments.add(rbs_segment)
 
             rbs_segment_memberships.update({rbs_segment: segment_memberhsip or key_membership})
             if not (segment_memberhsip or key_membership):

tests/engine/test_evaluator.py

@@ -315,6 +315,76 @@ def test_using_rbs_in_excluded(self):
         assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "on"
         ctx = evaluation_facctory.context_for('[email protected]', ['some'])
         assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "on"
+
+    @pytest.mark.asyncio
+    async def test_evaluate_treatment_with_rbs_in_condition_async(self):
+        e = evaluator.Evaluator(splitters.Splitter())
+        splits_storage = InMemorySplitStorageAsync()
+        rbs_storage = InMemoryRuleBasedSegmentStorageAsync()
+        segment_storage = InMemorySegmentStorageAsync()
+        evaluation_facctory = AsyncEvaluationDataFactory(splits_storage, segment_storage, rbs_storage)
+        
+        rbs_segments = os.path.join(os.path.dirname(__file__), 'files', 'rule_base_segments.json')
+        with open(rbs_segments, 'r') as flo:
+            data = json.loads(flo.read())
+            
+        mocked_split = Split('some', 12345, False, 'off', 'user', Status.ACTIVE, 12, split_conditions, 1.2, 100, 1234, {}, None, False)
+        rbs = rule_based_segments.from_raw(data["rbs"]["d"][0])
+        rbs2 = rule_based_segments.from_raw(data["rbs"]["d"][1])
+        await rbs_storage.update([rbs, rbs2], [], 12)
+        await splits_storage.update([mocked_split], [], 12)
+        
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "on"
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "off"
+        
+    @pytest.mark.asyncio
+    async def test_using_segment_in_excluded_async(self):
+        rbs_segments = os.path.join(os.path.dirname(__file__), 'files', 'rule_base_segments3.json')
+        with open(rbs_segments, 'r') as flo:
+            data = json.loads(flo.read())
+        e = evaluator.Evaluator(splitters.Splitter())
+        splits_storage = InMemorySplitStorageAsync()
+        rbs_storage = InMemoryRuleBasedSegmentStorageAsync()
+        segment_storage = InMemorySegmentStorageAsync()
+        evaluation_facctory = AsyncEvaluationDataFactory(splits_storage, segment_storage, rbs_storage)
+                    
+        mocked_split = Split('some', 12345, False, 'off', 'user', Status.ACTIVE, 12, split_conditions, 1.2, 100, 1234, {}, None, False)
+        rbs = rule_based_segments.from_raw(data["rbs"]["d"][0])
+        await rbs_storage.update([rbs], [], 12)
+        await splits_storage.update([mocked_split], [], 12)
+        segment = segments.from_raw({'name': 'segment1', 'added': ['[email protected]'], 'removed': [], 'till': 123})
+        await segment_storage.put(segment)
+        
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "on"
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "off"
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "off"
+        
+    @pytest.mark.asyncio
+    async def test_using_rbs_in_excluded_async(self):
+        rbs_segments = os.path.join(os.path.dirname(__file__), 'files', 'rule_base_segments2.json')
+        with open(rbs_segments, 'r') as flo:
+            data = json.loads(flo.read())
+        e = evaluator.Evaluator(splitters.Splitter())
+        splits_storage = InMemorySplitStorageAsync()
+        rbs_storage = InMemoryRuleBasedSegmentStorageAsync()
+        segment_storage = InMemorySegmentStorageAsync()
+        evaluation_facctory = AsyncEvaluationDataFactory(splits_storage, segment_storage, rbs_storage)
+                    
+        mocked_split = Split('some', 12345, False, 'off', 'user', Status.ACTIVE, 12, split_conditions, 1.2, 100, 1234, {}, None, False)
+        rbs = rule_based_segments.from_raw(data["rbs"]["d"][0])
+        rbs2 = rule_based_segments.from_raw(data["rbs"]["d"][1])
+        await rbs_storage.update([rbs, rbs2], [], 12)
+        await splits_storage.update([mocked_split], [], 12)
+        
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "on"
+        ctx = await evaluation_facctory.context_for('[email protected]', ['some'])
+        assert e.eval_with_context('[email protected]', '[email protected]', 'some', {'email': '[email protected]'}, ctx)['treatment'] == "on"
 
 class EvaluationDataFactoryTests(object):
     """Test evaluation factory class."""