Merge pull request #507 from splitio/unsupported-matcher

added unsupported matcher fix

Author: chillaq

splitio/models/__init__.py

@@ -0,0 +1,6 @@
+class MatcherNotFoundException(Exception):
+    """Exception to raise when a matcher is not found."""
+
+    def __init__(self, custom_message):
+        """Constructor."""
+        Exception.__init__(self, custom_message)

splitio/models/grammar/condition.py

@@ -2,6 +2,7 @@
 
 from enum import Enum
 
+from splitio.models import MatcherNotFoundException
 from splitio.models.grammar import matchers
 from splitio.models.grammar import partitions
 
@@ -123,7 +124,11 @@ def from_raw(raw_condition):
         for raw_partition in raw_condition['partitions']
     ]
 
-    matcher_objects = [matchers.from_raw(x) for x in raw_condition['matcherGroup']['matchers']]
+    try:
+        matcher_objects = [matchers.from_raw(x) for x in raw_condition['matcherGroup']['matchers']]
+    except MatcherNotFoundException as e:
+        raise MatcherNotFoundException(str(e))
+
     combiner = _MATCHER_COMBINERS[raw_condition['matcherGroup']['combiner']]
     label = raw_condition.get('label')
 

splitio/models/grammar/matchers/__init__.py

@@ -1,4 +1,5 @@
 """Matchers entrypoint module."""
+from splitio.models import MatcherNotFoundException
 from splitio.models.grammar.matchers.keys import AllKeysMatcher, UserDefinedSegmentMatcher
 from splitio.models.grammar.matchers.numeric import BetweenMatcher, EqualToMatcher, \
     GreaterThanOrEqualMatcher, LessThanOrEqualMatcher
@@ -63,5 +64,5 @@ def from_raw(raw_matcher):
     try:
         builder = _MATCHER_BUILDERS[matcher_type]
     except KeyError:
-        raise ValueError('Invalid matcher type %s' % matcher_type)
+        raise MatcherNotFoundException('Invalid matcher type %s' % matcher_type)
     return builder(raw_matcher)

splitio/models/splits.py

@@ -1,15 +1,46 @@
 """Splits module."""
 from enum import Enum
 from collections import namedtuple
+import logging
 
+from splitio.models import MatcherNotFoundException
 from splitio.models.grammar import condition
 
+_LOGGER = logging.getLogger(__name__)
 
 SplitView = namedtuple(
     'SplitView',
     ['name', 'traffic_type', 'killed', 'treatments', 'change_number', 'configs', 'default_treatment', 'sets']
 )
 
+_DEFAULT_CONDITIONS_TEMPLATE =   {
+    "conditionType": "ROLLOUT",
+    "matcherGroup": {
+        "combiner": "AND",
+        "matchers": [
+        {
+            "keySelector": None,
+            "matcherType": "ALL_KEYS",
+            "negate": False,
+            "userDefinedSegmentMatcherData": None,
+            "whitelistMatcherData": None,
+            "unaryNumericMatcherData": None,
+            "betweenMatcherData": None,
+            "dependencyMatcherData": None,
+            "booleanMatcherData": None,
+            "stringMatcherData": None
+        }]
+    },
+    "partitions": [
+        {
+        "treatment": "control",
+        "size": 100
+        }
+    ],
+    "label": "unsupported matcher type"
+}
+
+
 
 class Status(Enum):
     """Split status."""
@@ -238,6 +269,27 @@ def from_raw(raw_split):
     :return: A parsed Split object capable of performing evaluations.
     :rtype: Split
     """
+    try:
+        return Split(
+            raw_split['name'],
+            raw_split['seed'],
+            raw_split['killed'],
+            raw_split['defaultTreatment'],
+            raw_split['trafficTypeName'],
+            raw_split['status'],
+            raw_split['changeNumber'],
+            [condition.from_raw(c) for c in raw_split['conditions']],
+            raw_split.get('algo'),
+            traffic_allocation=raw_split.get('trafficAllocation'),
+            traffic_allocation_seed=raw_split.get('trafficAllocationSeed'),
+            configurations=raw_split.get('configurations'),
+            sets=set(raw_split.get('sets')) if raw_split.get('sets') is not None else []
+        )
+    except MatcherNotFoundException as e:
+        _LOGGER.error(str(e))
+        pass
+
+    _LOGGER.debug("Using default conditions template for feature flag: %s", raw_split['name'])
     return Split(
         raw_split['name'],
         raw_split['seed'],
@@ -246,7 +298,7 @@ def from_raw(raw_split):
         raw_split['trafficTypeName'],
         raw_split['status'],
         raw_split['changeNumber'],
-        [condition.from_raw(c) for c in raw_split['conditions']],
+        [condition.from_raw(_DEFAULT_CONDITIONS_TEMPLATE)],
         raw_split.get('algo'),
         traffic_allocation=raw_split.get('trafficAllocation'),
         traffic_allocation_seed=raw_split.get('trafficAllocationSeed'),

tests/client/test_manager.py

@@ -1,6 +1,4 @@
 """SDK main manager test module."""
-import pytest
-
 from splitio.client.factory import SplitFactory
 from splitio.client.manager import SplitManager, _LOGGER as _logger
 from splitio.storage import SplitStorage, EventStorage, ImpressionStorage, SegmentStorage

tests/models/test_splits.py

@@ -1,9 +1,9 @@
 """Split model tests module."""
+import copy
 
 from splitio.models import splits
 from splitio.models.grammar.condition import Condition
 
-
 class SplitTests(object):
     """Split model tests."""
 
@@ -119,3 +119,17 @@ def test_to_split_view(self):
         assert set(as_split_view.treatments) == set(['on', 'off'])
         assert as_split_view.default_treatment == self.raw['defaultTreatment']
         assert sorted(as_split_view.sets) == sorted(list(self.raw['sets']))
+
+    def test_incorrect_matcher(self):
+        """Test incorrect matcher in split model parsing."""
+        split = copy.deepcopy(self.raw)
+        split['conditions'][0]['matcherGroup']['matchers'][0]['matcherType'] = 'INVALID_MATCHER'
+        parsed = splits.from_raw(split)
+        assert parsed.conditions[0].to_json() == splits._DEFAULT_CONDITIONS_TEMPLATE
+
+        # using multiple conditions
+        split = copy.deepcopy(self.raw)
+        split['conditions'].append(split['conditions'][0])
+        split['conditions'][0]['matcherGroup']['matchers'][0]['matcherType'] = 'INVALID_MATCHER'
+        parsed = splits.from_raw(split)
+        assert parsed.conditions[0].to_json() == splits._DEFAULT_CONDITIONS_TEMPLATE