bug on variation value - fixed

Author: enver-bisevac

featureflags/client.py

@@ -124,14 +124,14 @@ def _variation(self, fn: str, identifier: str, target: Target,
                 fc = self._config.cache.get(f'flags/{identifier}')
                 if fc:
                     self.map_segments_from_cache(fc)
-                    method = getattr(fc, fn, None)
+                    method = getattr(fc, f'{fn}_variation', None)
                     if method:
                         variation = method(target)
                         if variation is None:
                             log.debug('No variation found')
                             return default
                         self._analytics.enqueue(target, fc, variation)
-                        return variation.bool()
+                        return getattr(variation, fn)(default)
                     else:
                         log.error("Wrong method name %s", fn)
             except KeyError:
@@ -140,23 +140,23 @@ def _variation(self, fn: str, identifier: str, target: Target,
 
     def bool_variation(self, identifier: str, target: Target,
                        default: bool) -> bool:
-        return self._variation('bool_variation', identifier, target, default)
+        return self._variation('bool', identifier, target, default)
 
     def int_variation(self, identifier: str, target: Target,
                       default: int) -> int:
-        return self._variation('int_variation', identifier, target, default)
+        return self._variation('int', identifier, target, default)
 
     def number_variation(self, identifier: str, target: Target,
                          default: float) -> float:
-        return self._variation('number_variation', identifier, target, default)
+        return self._variation('number', identifier, target, default)
 
     def string_variation(self, identifier: str, target: Target,
                          default: str) -> str:
-        return self._variation('string_variation', identifier, target, default)
+        return self._variation('string', identifier, target, default)
 
     def json_variation(self, identifier: str, target: Target,
                        default: Dict[str, Any]) -> Dict[str, Any]:
-        return self._variation('number_variation', identifier, target, default)
+        return self._variation('json', identifier, target, default)
 
     def close(self):
         log.info('closing sdk client')

featureflags/evaluations/clause.py

@@ -120,8 +120,6 @@ class Clauses(List[Clause]):
     def evaluate(self, target: Target, segments: Optional['Segments']) -> bool:
         for clause in self:
             operator = target.get_operator(clause.attribute)
-            if operator is None:
-                log.warning("operator not found for clause %s", clause)
             if not clause.evaluate(target, segments, operator):
                 return False
         return True

featureflags/evaluations/segment.py

@@ -26,15 +26,15 @@ class Segment(object):
     additional_properties: Dict[str, Any] = attr.ib(init=False, factory=dict)
 
     def evaluate(self, target: Target) -> bool:
-        if not isinstance(self.included, Unset):
+        if not isinstance(self.included, Unset) and self.included:
             if target.identifier in self.included:
                 return True
 
-        if not isinstance(self.excluded, Unset):
+        if not isinstance(self.excluded, Unset) and self.excluded:
             if target.identifier in self.excluded:
                 return True
 
-        if not isinstance(self.rules, Unset):
+        if not isinstance(self.rules, Unset) and self.rules:
             if self.rules.evaluate(target, None):
                 return True
         return False

featureflags/evaluations/serving_rule.py

@@ -110,5 +110,4 @@ def get_variation_name(
 
             if not isinstance(default_serve.distribution, Unset):
                 return default_serve.distribution.get_key_name(target)
-
         return None