FFM-11655 Sort AND/OR rules when storing group (#96)

* FFM-11655 Sort serving rules when storing segment instead of in evaluation path

* FFM-11655 Backport  for 3.7

* FFM-11655 1.6.2 version bump

* FFM-11655 Fix compatability issues with python 3.7

* FFM-11655 Fix typo in setup requirements

Author: erdirowlands

featureflags/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Harness"""
 __email__ = "support@harness.io"
-__version__ = '1.6.1'
+__version__ = '1.6.2'

featureflags/analytics.py

@@ -38,7 +38,7 @@
 VARIATION_VALUE_ATTRIBUTE = 'variationValue'
 TARGET_ATTRIBUTE = 'target'
 SDK_VERSION_ATTRIBUTE = 'SDK_VERSION'
-SDK_VERSION = '1.6.1'
+SDK_VERSION = '1.6.2'
 SDK_TYPE_ATTRIBUTE = 'SDK_TYPE'
 SDK_TYPE = 'server'
 SDK_LANGUAGE_ATTRIBUTE = 'SDK_LANGUAGE'

featureflags/api.py

@@ -1,7 +1,7 @@
 from tenacity import retry_if_result, wait_exponential, \
     stop_after_attempt, retry, retry_if_exception_type
 from http import HTTPStatus
-from typing import Any, Union
+from typing import Any, Union, List
 
 from .openapi.config.api.client.authenticate import \
     sync_detailed as authenticate
@@ -115,7 +115,7 @@ def retryable_authenticate(
 def retryable_retrieve_segments(environment_uuid: str,
                                 client: AuthenticatedClient,
                                 cluster: Union[Unset, str] = UNSET) -> \
-        Response[list[Segment]]:
+        Response[List[Segment]]:
     return retrieve_segments(client=client,
                              environment_uuid=environment_uuid,
                              cluster=cluster,
@@ -129,7 +129,7 @@ def retryable_retrieve_segments(environment_uuid: str,
 def retryable_retrieve_feature_config(environment_uuid: str,
                                       client: AuthenticatedClient,
                                       cluster: Union[Unset, str] = UNSET) -> \
-        Response[list[FeatureConfig]]:
+        Response[List[FeatureConfig]]:
     return retrieve_flags(client=client,
                           environment_uuid=environment_uuid,
                           cluster=cluster)

featureflags/client.py

@@ -23,7 +23,7 @@
 from .streaming import StreamProcessor
 from .util import log
 
-VERSION: str = "1.6.1"
+VERSION: str = "1.6.2"
 
 
 class MissingOrEmptyAPIKeyException(Exception):

featureflags/evaluations/evaluator.py

@@ -181,9 +181,8 @@ def _check_target_in_segment(self, segments: List[str],
                     return True
 
                 if segment.serving_rules:
-                    log.debug('Found and using enhanced serving_rules')
                     # Use enhanced rules first if they're available
-                    segment.serving_rules.sort(key=lambda rule: rule.priority)
+                    log.debug('Found and using enhanced serving_rules')
 
                     for serving_rule in segment.serving_rules:
                         if self._evaluate_clauses_v2(serving_rule.clauses,
@@ -251,7 +250,7 @@ def _evaluate_clauses(self, clauses: Union[Unset, Clauses],
         log.debug("All clauses %s evaluated", clauses)
         return False
 
-    def _evaluate_clauses_v2(self, clauses: Union[Unset, Clauses],
+    def _evaluate_clauses_v2(self, clauses: List[Clause],
                              target: Target) -> bool:
         if not clauses or isinstance(clauses, Unset):
             return False

featureflags/openapi/config/types.py

@@ -4,13 +4,14 @@
 from typing import (
     BinaryIO,
     Generic,
-    Literal,
     MutableMapping,
     Optional,
     Tuple,
     TypeVar,
 )
 
+from typing_extensions import Literal
+
 from attrs import define
 
 

featureflags/openapi/metrics/types.py

@@ -4,13 +4,15 @@
 from typing import (
     BinaryIO,
     Generic,
-    Literal,
     MutableMapping,
     Optional,
     Tuple,
     TypeVar,
 )
 
+from typing_extensions import Literal
+
+
 from attrs import define
 
 

featureflags/repository.py

@@ -147,6 +147,10 @@ def set_segment(self, segment: Segment) -> None:
             log.debug("Segment %s already exists", segment.identifier)
             return None
 
+        # Sort the serving rules by priority
+        if segment.serving_rules is not Unset:
+            segment.serving_rules.sort(key=lambda rule: rule.priority)
+
         segment_key = format_segment_key(segment.identifier)
 
         if self.store:

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.1
+current_version = 1.6.2
 commit = True
 tag = True
 

setup.py

@@ -18,7 +18,8 @@
     "attrs>=23.2.0",
     "mmh3>=3.0.0",
     "requests>=2.31.0",
-    "tenacity==8.2.2"
+    "tenacity==8.2.2",
+    "typing_extensions==4.12.2"
 ]
 
 setup_requirements = [
@@ -57,6 +58,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/harness/ff-python-server-sdk",
-    version='1.6.1',
+    version='1.6.2',
     zip_safe=False,
 )