kameleoon-client-python 3.17.0__tar.gz → 3.17.1__tar.gz

{kameleoon_client_python-3.17.0 → kameleoon_client_python-3.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kameleoon-client-python
-Version: 3.17.0
+Version: 3.17.1
 Summary: Kameleoon Client Python Software Development Kit.
 Home-page: https://developers.kameleoon.com/python-sdk.html
 Author: Kameleoon
@@ -20,27 +20,27 @@ Requires-Dist: requests<3.0.0,>=2.25
 Requires-Dist: sseclient-py<1.9.0,>=1.7.0
 Requires-Dist: aiohttp<4.0.0,>=3.8.0
 Provides-Extra: test
-Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
-Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
+Requires-Dist: flake8==4.0.1; extra == "test"
 Requires-Dist: freezegun==1.1.0; extra == "test"
-Requires-Dist: twine==3.4.1; extra == "test"
-Requires-Dist: wheel==0.36.2; extra == "test"
-Requires-Dist: Werkzeug==2.0.1; extra == "test"
-Requires-Dist: mypy==0.991; extra == "test"
-Requires-Dist: pytest-ordering==0.6; extra == "test"
-Requires-Dist: pytest-cov==2.12.1; extra == "test"
-Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: types-requests==2.25.0; extra == "test"
+Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
+Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
+Requires-Dist: pytest-pythonpath==0.7.3; extra == "test"
 Requires-Dist: aioresponses==0.7.*; extra == "test"
-Requires-Dist: pytest-django==4.4.0; extra == "test"
-Requires-Dist: Django==3.2.4; extra == "test"
+Requires-Dist: wheel==0.36.2; extra == "test"
 Requires-Dist: requests<3.0.0,>=2.25; extra == "test"
-Requires-Dist: flake8==4.0.1; extra == "test"
+Requires-Dist: twine==3.4.1; extra == "test"
+Requires-Dist: pytest-django==4.4.0; extra == "test"
+Requires-Dist: types-PyYAML==5.4.3; extra == "test"
 Requires-Dist: pyyaml<6.1.0,>=5.4.0; extra == "test"
+Requires-Dist: pytest-cov==2.12.1; extra == "test"
+Requires-Dist: pytest-ordering==0.6; extra == "test"
+Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: Werkzeug==2.0.1; extra == "test"
 Requires-Dist: pylint==2.12.*; extra == "test"
-Requires-Dist: types-PyYAML==5.4.3; extra == "test"
-Requires-Dist: pytest-pythonpath==0.7.3; extra == "test"
-Requires-Dist: types-requests==2.25.0; extra == "test"
-Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
+Requires-Dist: Django==3.2.4; extra == "test"
+Requires-Dist: mypy==0.991; extra == "test"
+Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{kameleoon_client_python-3.17.0 → kameleoon_client_python-3.17.1}/kameleoon/kameleoon_client.py

@@ -757,6 +757,11 @@ class KameleoonClient:
             save,
             bucketing_cd_index,
         )
+        consent, blocking_behaviour = self.__get_consent_and_blocking_behaviour(visitor)
+        if consent == LegalConsent.NOT_GIVEN and blocking_behaviour == ConsentBlockingBehaviour.COMPLETELY_BLOCKED:
+            raise FeatureEnvironmentDisabled(
+                "Evaluation for a holdout is blocked because visitor's consent was not provided."
+            )
         is_not_in_holdout = True
         code_for_hash = self.__get_code_for_hash(visitor, visitor_code, bucketing_cd_index)
         variation_hash = Hasher.obtain(code_for_hash, holdout.id_)
@@ -1695,11 +1700,7 @@ class KameleoonClient:
             feature_flag,
         )
         visitor = self._visitor_manager.get_visitor(visitor_code)
-        datafile = self._data_manager.data_file
-        if datafile.settings.is_consent_required:
-            consent = visitor.legal_consent if visitor else LegalConsent.UNKNOWN
-        else:
-            consent = LegalConsent.GIVEN
+        consent, blocking_behaviour = self.__get_consent_and_blocking_behaviour(visitor)
         code_for_hash = self.__get_code_for_hash(visitor, visitor_code, feature_flag.bucketing_custom_data_index)
         eval_exp = None
         for rule in feature_flag.rules:
@@ -1722,7 +1723,6 @@ class KameleoonClient:
             if hash_rule <= rule.exposition:
                 # Checking if the evaluation is blocked due to the consent policy
                 if (consent == LegalConsent.NOT_GIVEN) and rule.is_experimentation:
-                    blocking_behaviour = datafile.settings.blocking_behaviour_if_consent_not_given
                     if blocking_behaviour == ConsentBlockingBehaviour.PARTIALLY_BLOCKED:
                         break
                     raise FeatureEnvironmentDisabled(
@@ -1757,6 +1757,19 @@ class KameleoonClient:
         )
         return eval_exp
 
+    def __get_consent_and_blocking_behaviour(
+        self,
+        visitor: Optional[Visitor],
+    ) -> Tuple[LegalConsent, ConsentBlockingBehaviour]:
+        datafile = self._data_manager.data_file
+        if datafile.settings.is_consent_required:
+            consent = visitor.legal_consent if visitor else LegalConsent.UNKNOWN
+        else:
+            consent = LegalConsent.GIVEN
+        behaviour = datafile.settings.blocking_behaviour_if_consent_not_given
+
+        return consent, behaviour
+
     @staticmethod
     def __calculate_variation_key(eval_exp: Optional[EvaluatedExperiment], default_value: str) -> str:
         KameleoonLogger.debug(

{kameleoon_client_python-3.17.0 → kameleoon_client_python-3.17.1}/kameleoon/managers/remote_data/remote_visitor_data.py

@@ -50,15 +50,15 @@ class RemoteVisitorData:
         self.__visitor_code: Optional[str] = None
         current_visit = json.get("currentVisit")
         if current_visit is not None:
-            self.__parse_visit(current_visit, False)
+            self.__parse_visit(current_visit, 0)
         previous_visits = json.get("previousVisits")
         if previous_visits:
             prev_visits = []
-            for visit in previous_visits:
+            for i, visit in enumerate(previous_visits):
                 time_started = visit.get("timeStarted", 0)
                 time_last_event = visit.get("timeLastEvent", time_started)
                 prev_visits.append(VisitorVisits.Visit(time_started, time_last_event))
-                self.__parse_visit(visit, True)
+                self.__parse_visit(visit, i + 1)
             if len(prev_visits) > 0:
                 self.__visitor_visits = VisitorVisits(prev_visits, self.__visit_number)
         self.__kcs_heat = self.__parse_kcs_heat(json.get("kcs"))
@@ -123,7 +123,7 @@ class RemoteVisitorData:
         """Returns the `visitorCode` from the most recent visit"""
         return self.__visitor_code
 
-    def __parse_visit(self, json_visit: Dict[str, Any], is_prev_visit: bool) -> None:
+    def __parse_visit(self, json_visit: Dict[str, Any], visit_offset: int) -> None:
         if (self.__visitor_code is None) and isinstance(visitor_code := json_visit.get("visitorCode"), str):
             self.__visitor_code = visitor_code
         custom_data_events = json_visit.get("customDataEvents")
@@ -143,7 +143,7 @@ class RemoteVisitorData:
             self.__parse_geolocation(geolocation_events[-1])
         static_data_event = json_visit.get("staticDataEvent")
         if static_data_event:
-            self.__parse_static_data(static_data_event, is_prev_visit)
+            self.__parse_static_data(static_data_event, visit_offset)
         personalization_events = json_visit.get("personalizationEvents")
         if personalization_events:
             self.__parse_personalizations(personalization_events)
@@ -209,15 +209,13 @@ class RemoteVisitorData:
             if country is not None:
                 self.__geolocation = Geolocation(country, data.get("region"), data.get("city"))
 
-    def __parse_static_data(self, static_data_event: Dict[str, Any], is_prev_visit: bool) -> None:
+    def __parse_static_data(self, static_data_event: Dict[str, Any], visit_offset: int) -> None:
         if self.__device and self.__browser and self.__operating_system:
             return
         data = static_data_event.get("data")
         if data is not None:
-            if self.__visit_number == 0:
-                self.__visit_number = data.get("visitNumber", 0)
-                if is_prev_visit and (self.__visit_number > 0):
-                    self.__visit_number += 1
+            if (self.__visit_number == 0) and (remote_visit_number := data.get("visitNumber")):
+                self.__visit_number = remote_visit_number + visit_offset
             if self.__filter.device and (self.__device is None):
                 device_type = enum_from_name_literal(data.get("deviceType"), DeviceType, None)
                 if device_type is not None:

{kameleoon_client_python-3.17.0 → kameleoon_client_python-3.17.1}/kameleoon/sdk_version.py

@@ -4,7 +4,7 @@ from typing import Optional, Tuple
 
 from kameleoon.logging.kameleoon_logger import KameleoonLogger
 
-version_info = (3, 17, 0)
+version_info = (3, 17, 1)
 __version__ = ".".join(str(v) for v in version_info)  # uses in scripts
 
 

{kameleoon_client_python-3.17.0 → kameleoon_client_python-3.17.1}/kameleoon_client_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kameleoon-client-python
-Version: 3.17.0
+Version: 3.17.1
 Summary: Kameleoon Client Python Software Development Kit.
 Home-page: https://developers.kameleoon.com/python-sdk.html
 Author: Kameleoon
@@ -20,27 +20,27 @@ Requires-Dist: requests<3.0.0,>=2.25
 Requires-Dist: sseclient-py<1.9.0,>=1.7.0
 Requires-Dist: aiohttp<4.0.0,>=3.8.0
 Provides-Extra: test
-Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
-Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
+Requires-Dist: flake8==4.0.1; extra == "test"
 Requires-Dist: freezegun==1.1.0; extra == "test"
-Requires-Dist: twine==3.4.1; extra == "test"
-Requires-Dist: wheel==0.36.2; extra == "test"
-Requires-Dist: Werkzeug==2.0.1; extra == "test"
-Requires-Dist: mypy==0.991; extra == "test"
-Requires-Dist: pytest-ordering==0.6; extra == "test"
-Requires-Dist: pytest-cov==2.12.1; extra == "test"
-Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: types-requests==2.25.0; extra == "test"
+Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
+Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
+Requires-Dist: pytest-pythonpath==0.7.3; extra == "test"
 Requires-Dist: aioresponses==0.7.*; extra == "test"
-Requires-Dist: pytest-django==4.4.0; extra == "test"
-Requires-Dist: Django==3.2.4; extra == "test"
+Requires-Dist: wheel==0.36.2; extra == "test"
 Requires-Dist: requests<3.0.0,>=2.25; extra == "test"
-Requires-Dist: flake8==4.0.1; extra == "test"
+Requires-Dist: twine==3.4.1; extra == "test"
+Requires-Dist: pytest-django==4.4.0; extra == "test"
+Requires-Dist: types-PyYAML==5.4.3; extra == "test"
 Requires-Dist: pyyaml<6.1.0,>=5.4.0; extra == "test"
+Requires-Dist: pytest-cov==2.12.1; extra == "test"
+Requires-Dist: pytest-ordering==0.6; extra == "test"
+Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: Werkzeug==2.0.1; extra == "test"
 Requires-Dist: pylint==2.12.*; extra == "test"
-Requires-Dist: types-PyYAML==5.4.3; extra == "test"
-Requires-Dist: pytest-pythonpath==0.7.3; extra == "test"
-Requires-Dist: types-requests==2.25.0; extra == "test"
-Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
+Requires-Dist: Django==3.2.4; extra == "test"
+Requires-Dist: mypy==0.991; extra == "test"
+Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{kameleoon_client_python-3.17.0 → kameleoon_client_python-3.17.1}/kameleoon_client_python.egg-info/requires.txt

@@ -4,24 +4,24 @@ sseclient-py<1.9.0,>=1.7.0
 aiohttp<4.0.0,>=3.8.0
 
 [test]
-pytest-asyncio==0.21.*
-aiohttp<4.0.0,>=3.8.0
+flake8==4.0.1
 freezegun==1.1.0
-twine==3.4.1
-wheel==0.36.2
-Werkzeug==2.0.1
-mypy==0.991
-pytest-ordering==0.6
-pytest-cov==2.12.1
-sseclient-py<1.9.0,>=1.7.0
+types-requests==2.25.0
+pytest-asyncio==0.21.*
+types-python-dateutil==2.8.2
+pytest-pythonpath==0.7.3
 aioresponses==0.7.*
-pytest-django==4.4.0
-Django==3.2.4
+wheel==0.36.2
 requests<3.0.0,>=2.25
-flake8==4.0.1
+twine==3.4.1
+pytest-django==4.4.0
+types-PyYAML==5.4.3
 pyyaml<6.1.0,>=5.4.0
+pytest-cov==2.12.1
+pytest-ordering==0.6
+sseclient-py<1.9.0,>=1.7.0
+Werkzeug==2.0.1
 pylint==2.12.*
-types-PyYAML==5.4.3
-pytest-pythonpath==0.7.3
-types-requests==2.25.0
-types-python-dateutil==2.8.2
+Django==3.2.4
+mypy==0.991
+aiohttp<4.0.0,>=3.8.0