Merge pull request #43 from harness/FFM-4813

FFM-4813

Author: stephenmcconkey

README.md

@@ -16,7 +16,7 @@ Python SDK For Harness Feature Flags
 Use this README to get started with our Feature Flags (FF) SDK for Python. This guide outlines the basics of getting started with the SDK and provides a full code sample for you to try out. 
 This sample doesn’t include configuration options, for in depth steps and configuring the SDK, for example, disabling streaming or using our Relay Proxy, see the  [Python SDK Reference](https://ngdocs.harness.io/article/hwoxb6x2oe-python-sdk-reference).
 
-For a sample FF Python SDK project, see our test [test Golang project](examples/getting_started/getting_started.py).
+For a sample FF Python SDK project, see our test [test python project](examples/getting_started/getting_started.py).
 
 ![FeatureFlags](https://github.com/harness/ff-python-server-sdk/raw/main/docs/images/ff-gui.png)
 

featureflags/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Enver Bisevac"""
 __email__ = "enver.bisevac@harness.io"
-__version__ = '1.1.2'
+__version__ = '1.1.3'

featureflags/evaluations/evaluator.py

@@ -163,11 +163,11 @@ def _evaluate_clauses(self, clauses: Union[Unset, Clauses],
                           target: Target) -> bool:
         if not isinstance(clauses, Unset):
             for clause in clauses:
-                if not self._evaluate_clause(clause, target):
-                    log.debug("Unsuccessful evaluation of clause %s", clause)
-                    return False
+                if self._evaluate_clause(clause, target):
+                    log.debug("Successful evaluation of clause %s", clause)
+                    return True
         log.debug("All clauses %s evaluated", clauses)
-        return True
+        return False
 
     def _evaluate_rule(self, rule: ServingRule, target: Target) -> bool:
         return self._evaluate_clauses(rule.clauses, target)

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.2
+current_version = 1.1.3
 commit = True
 tag = True
 

setup.py

@@ -56,6 +56,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/drone/ff-python-server-sdk",
-    version='1.1.2',
+    version='1.1.3',
     zip_safe=False,
 )

tests/unit/test_evaluator.py

@@ -2,7 +2,7 @@
 
 from featureflags.evaluations.auth_target import Target
 from featureflags.evaluations.clause import Clause
-from featureflags.evaluations.constants import EQUAL_OPERATOR
+from featureflags.evaluations.constants import EQUAL_OPERATOR, STARTS_WITH_OPERATOR
 from featureflags.evaluations.distribution import Distribution
 from featureflags.evaluations.enum import FeatureState
 from featureflags.evaluations.evaluator import Evaluator
@@ -58,7 +58,6 @@ def distribution_by_email():
 
 @pytest.fixture
 def feature(variations):
-
     default_serve = Serve(variation=TRUE)
 
     return FeatureConfig(
@@ -75,7 +74,6 @@ def feature(variations):
 
 @pytest.fixture
 def segment(target):
-
     return Segment(
         identifier="beta",
         name="Beta users",
@@ -164,6 +162,48 @@ def test_evaluate_clause(data_provider, target):
     assert got is True
 
 
+def test_evaluate_clauses(data_provider, target):
+    evaluator = Evaluator(data_provider)
+    clause1 = Clause(
+        id="",
+        attribute="identifier",
+        op=EQUAL_OPERATOR,
+        values=[target.identifier]
+    )
+
+    clause2 = Clause(
+        id="",
+        attribute="name",
+        op=EQUAL_OPERATOR,
+        values=[target.name]
+    )
+
+    clause3 = Clause(
+        id="",
+        attribute="name",
+        op=EQUAL_OPERATOR,
+        values=["Not John"]
+    )
+
+    clause4 = Clause(
+        id="",
+        attribute="name",
+        op=STARTS_WITH_OPERATOR,
+        values=["Not John"]
+    )
+
+    testcases = [
+        {"scenario": "Evaluate clauses with no clauses", "input": [], "expected": False},
+        {"scenario": "Evaluate clauses with 2 Clauses both will match", "input": [clause1, clause2], "expected": True},
+        {"scenario": "Evaluate clauses with 2 Clauses only 1 match", "input": [clause1, clause3], "expected": True},
+        {"scenario": "Evaluate clauses with 2 Clauses but no match", "input": [clause3, clause4], "expected": False}
+    ]
+
+    for tc in testcases:
+        actual = evaluator._evaluate_clauses(tc["input"], target)
+        assert actual is tc["expected"]
+
+
 def test_evaluate_rules(data_provider, target):
     evaluator = Evaluator(data_provider)