kameleoon-client-python 3.16.2__tar.gz → 3.16.3__tar.gz

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kameleoon-client-python
-Version: 3.16.2
+Version: 3.16.3
 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-pythonpath==0.7.3; extra == "test"
+Requires-Dist: wheel==0.36.2; extra == "test"
+Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
+Requires-Dist: types-PyYAML==5.4.3; extra == "test"
+Requires-Dist: pytest-ordering==0.6; extra == "test"
+Requires-Dist: pylint==2.12.*; extra == "test"
+Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: Werkzeug==2.0.1; extra == "test"
 Requires-Dist: Django==3.2.4; extra == "test"
-Requires-Dist: pyyaml<6.1.0,>=5.4.0; extra == "test"
+Requires-Dist: types-requests==2.25.0; extra == "test"
+Requires-Dist: pytest-cov==2.12.1; extra == "test"
 Requires-Dist: aioresponses==0.7.*; extra == "test"
-Requires-Dist: pylint==2.12.*; extra == "test"
-Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
-Requires-Dist: freezegun==1.1.0; extra == "test"
-Requires-Dist: wheel==0.36.2; extra == "test"
+Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
+Requires-Dist: twine==3.4.1; extra == "test"
+Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
 Requires-Dist: requests<3.0.0,>=2.25; extra == "test"
 Requires-Dist: flake8==4.0.1; extra == "test"
-Requires-Dist: pytest-cov==2.12.1; extra == "test"
-Requires-Dist: types-requests==2.25.0; extra == "test"
-Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: pytest-pythonpath==0.7.3; extra == "test"
 Requires-Dist: mypy==0.991; extra == "test"
-Requires-Dist: twine==3.4.1; extra == "test"
-Requires-Dist: types-PyYAML==5.4.3; extra == "test"
-Requires-Dist: Werkzeug==2.0.1; extra == "test"
-Requires-Dist: pytest-ordering==0.6; extra == "test"
-Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
 Requires-Dist: pytest-django==4.4.0; extra == "test"
-Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
+Requires-Dist: freezegun==1.1.0; extra == "test"
+Requires-Dist: pyyaml<6.1.0,>=5.4.0; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/configuration/data_file.py

@@ -48,7 +48,7 @@ class DataFile:
         configuration: Dict[str, Any], segments: Dict[int, Segment], cdi: CustomDataInfo
     ) -> Dict[str, FeatureFlag]:
         return {
-            (ff := FeatureFlag(jobj, segments, cdi)).feature_key: ff  # pylint: disable=C0103
+            (ff := FeatureFlag(jobj, segments, cdi)).feature_key: ff
             for jobj in configuration.get("featureFlags") or []
         }
 

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/data/conversion.py

@@ -44,7 +44,7 @@ class Conversion(Data, DuplicationSafeSendableBase):
         self.__goal_id = goal_id
         self.__revenue = revenue
         self.__negative = negative
-        self.__metadata = metadata
+        self._metadata = metadata
 
     @property
     def goal_id(self) -> int:
@@ -64,7 +64,7 @@ class Conversion(Data, DuplicationSafeSendableBase):
     @property
     def metadata(self) -> Optional[Iterable[CustomData]]:
         """Returns metadata"""
-        return self.__metadata
+        return self._metadata
 
     @property
     def data_type(self) -> DataType:
@@ -97,5 +97,5 @@ class Conversion(Data, DuplicationSafeSendableBase):
             f"Conversion{{goal_id:{self.__goal_id},"
             f"revenue:{self.__revenue},"
             f"negative:{self.__negative},"
-            f"metadata:{StringUtils.object_to_string(self.__metadata)}}}"
+            f"metadata:{StringUtils.object_to_string(self._metadata)}}}"
         )

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/data/custom_data.py

@@ -11,6 +11,7 @@ class CustomData(Data, DuplicationUnsafeSendableBase):
     """Custom data"""
 
     EVENT_TYPE = "customData"
+    UNDEFINED_INDEX = -1
 
     def __init__(self, index_or_name: Union[int, str], *args: str, overwrite=True) -> None:
         """
@@ -29,7 +30,7 @@ class CustomData(Data, DuplicationUnsafeSendableBase):
             self.__index = index_or_name
             self._name = None
         else:
-            self.__index = -1
+            self.__index = self.UNDEFINED_INDEX
             self._name = index_or_name
         self.__values = args
         self.__overwrite = overwrite
@@ -41,7 +42,7 @@ class CustomData(Data, DuplicationUnsafeSendableBase):
         return custom_data
 
     @property
-    def id(self) -> int:  # pylint: disable=C0103
+    def id(self) -> int:
         """
         Deprecated. Please use `index` instead.
 

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/data/manager/visitor_manager.py

@@ -3,7 +3,7 @@ import collections
 import time
 from typing import Any, Dict, Iterator, List, Optional
 from kameleoon.configuration.custom_data_info import CustomDataInfo
-from kameleoon.data import CustomData
+from kameleoon.data import Conversion, CustomData
 from kameleoon.data.mapping_identifier import MappingIdentifier
 from kameleoon.data.manager.visitor import Visitor
 from kameleoon.data.manager.visitor_slot import VisitorSlot
@@ -77,9 +77,10 @@ class VisitorManager:
         data_to_add: List[Any] = [None] * len(args)
         for i, data in enumerate(args):
             if isinstance(data, CustomData):
-                data_to_add[i] = self.__process_custom_data(visitor_code, visitor, custom_data_info, data)
-            else:
-                data_to_add[i] = data
+                data = self.__process_custom_data(visitor_code, visitor, custom_data_info, data)
+            elif isinstance(data, Conversion):
+                data = self.__process_conversion(data, custom_data_info)
+            data_to_add[i] = data
         visitor.add_data(*data_to_add)
         KameleoonLogger.debug("RETURN: VisitorManager.add_data(visitor_code: %s, args: %s) -> (visitor)",
                               visitor_code, args)
@@ -89,11 +90,11 @@ class VisitorManager:
         self, visitor_code: str, visitor: Visitor, custom_data_info: CustomDataInfo, custom_data: CustomData
     ) -> Optional[CustomData]:
         """Processes custom data, potentially modifying or mapping it based on certain conditions."""
-        if custom_data.name is not None:
-            cd_index = custom_data_info.get_custom_data_index_by_name(custom_data.name)
-            if cd_index is None:
-                return None
-            custom_data = custom_data._named_to_indexed(cd_index)
+        if mapped_cd := self.__try_map_custom_data_index_by_name(custom_data, custom_data_info):
+            custom_data = mapped_cd
+        else:
+            KameleoonLogger.error("%s is invalid and will be ignored", custom_data)
+            return None
         # We shouldn't send custom data with local only type
         if custom_data_info.is_local_only(custom_data.index):
             custom_data.mark_as_sent()
@@ -113,6 +114,28 @@ class VisitorManager:
             return MappingIdentifier(custom_data)
         return custom_data
 
+    @staticmethod
+    def __process_conversion(conversion: Conversion, cdi: CustomDataInfo) -> Conversion:
+        if conversion.metadata:
+            metadata = []
+            for cd in conversion.metadata:
+                mapped_cd = VisitorManager.__try_map_custom_data_index_by_name(cd, cdi)
+                if mapped_cd:
+                    metadata.append(mapped_cd)
+                else:
+                    KameleoonLogger.warning("Conversion metadata %s is invalid", cd)
+            conversion._metadata = metadata
+        return conversion
+
+    @staticmethod
+    def __try_map_custom_data_index_by_name(custom_data: CustomData, cdi: CustomDataInfo) -> Optional[CustomData]:
+        if custom_data.index != CustomData.UNDEFINED_INDEX:
+            return custom_data
+        if custom_data.name is None:
+            return None
+        cd_index = cdi.get_custom_data_index_by_name(custom_data.name)
+        return custom_data._named_to_indexed(cd_index) if cd_index is not None else None
+
     def __purge(self) -> None:
         KameleoonLogger.debug("CALL: VisitorManager.__purge()")
         expired_time = time.time() - self.__expiration_period

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/data/personalization.py

@@ -13,7 +13,7 @@ class Personalization(BaseData):
         self.__variation_id = variation_id
 
     @property
-    def id(self) -> int:  # pylint: disable=C0103
+    def id(self) -> int:
         """Returns personalization ID"""
         return self.__id
 

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/data/targeted_segment.py

@@ -13,7 +13,7 @@ class TargetedSegment(BaseData, DuplicationUnsafeSendableBase):
         self.__id = id_
 
     @property
-    def id(self) -> int:  # pylint: disable=C0103
+    def id(self) -> int:
         """Returns the segment ID."""
         return self.__id
 

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/helpers/functions.py

@@ -16,7 +16,7 @@ def get_size(obj) -> float:
     return sum([sys.getsizeof(v) + sys.getsizeof(k) for k, v in obj.items()])
 
 
-E = TypeVar('E', bound=Enum)  # pylint: disable=C0103
+E = TypeVar('E', bound=Enum)
 
 
 def enum_from_literal(literal: str, enum_type: Type[E], default_value: E) -> E:

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/network/network_manager.py

@@ -7,7 +7,7 @@ from kameleoon.network.service_initialize_context import ServiceInitializeContex
 from kameleoon.network.services.service import Service
 
 
-S = TypeVar("S", bound=Service)  # pylint: disable=C0103
+S = TypeVar("S", bound=Service)
 
 
 class NetworkManager:

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/sdk_version.py

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

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/storage/cache.py

@@ -3,8 +3,8 @@
 from typing import TypeVar, Generic, Optional
 
 
-K = TypeVar("K")  # pylint: disable=C0103
-V = TypeVar("V")  # pylint: disable=C0103
+K = TypeVar("K")
+V = TypeVar("V")
 
 
 class Cache(Generic[K, V]):

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/targeting/conditions/targeting_condition.py

@@ -6,7 +6,7 @@ from typing import Any, TypeVar, Union, Dict, Optional
 
 from kameleoon.data.data import Data
 
-T = TypeVar("T", bound=Data)  # pylint: disable=C0103
+T = TypeVar("T", bound=Data)
 
 
 class TargetingConditionType(Enum):

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/targeting/conditions/time_elapsed_since_visit_condition.py

@@ -14,7 +14,6 @@ class TimeElapsedSinceVisitCondition(NumberCondition):
         super().__init__(json_condition, "countInMillis")
         self.__is_first_visit = self.type == TargetingConditionType.FIRST_VISIT.name
 
-    # pylint: disable=C0103
     def check(self, data: Any) -> bool:
         visitor_visits, ok = VisitorVisits.get_visitor_visits(data)
         return ok and (self._condition_value is not None) and self.__check(visitor_visits)

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/targeting/conditions/visit_number_total_condition.py

@@ -12,7 +12,6 @@ class VisitNumberTotalCondition(NumberCondition):
     def __init__(self, json_condition: Dict[str, Union[str, int, Any]]):
         super().__init__(json_condition, "visitCount")
 
-    # pylint: disable=C0103
     def check(self, data: Any) -> bool:
         visitor_visits, ok = VisitorVisits.get_visitor_visits(data)
         if ok and (self._condition_value is not None):

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon/targeting/conditions/visitor_new_return_condition.py

@@ -25,7 +25,6 @@ class VisitorNewReturnCondition(TargetingCondition):
         except KeyError as ex:
             KameleoonLogger.error("%s has wrong JSON structure: %s", self.__class__, ex)
 
-    # pylint: disable=C0103
     def check(self, data: Any) -> bool:
         visitor_visits, ok = VisitorVisits.get_visitor_visits(data)
         if ok:

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/kameleoon_client_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kameleoon-client-python
-Version: 3.16.2
+Version: 3.16.3
 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-pythonpath==0.7.3; extra == "test"
+Requires-Dist: wheel==0.36.2; extra == "test"
+Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
+Requires-Dist: types-PyYAML==5.4.3; extra == "test"
+Requires-Dist: pytest-ordering==0.6; extra == "test"
+Requires-Dist: pylint==2.12.*; extra == "test"
+Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: Werkzeug==2.0.1; extra == "test"
 Requires-Dist: Django==3.2.4; extra == "test"
-Requires-Dist: pyyaml<6.1.0,>=5.4.0; extra == "test"
+Requires-Dist: types-requests==2.25.0; extra == "test"
+Requires-Dist: pytest-cov==2.12.1; extra == "test"
 Requires-Dist: aioresponses==0.7.*; extra == "test"
-Requires-Dist: pylint==2.12.*; extra == "test"
-Requires-Dist: types-python-dateutil==2.8.2; extra == "test"
-Requires-Dist: freezegun==1.1.0; extra == "test"
-Requires-Dist: wheel==0.36.2; extra == "test"
+Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
+Requires-Dist: twine==3.4.1; extra == "test"
+Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
 Requires-Dist: requests<3.0.0,>=2.25; extra == "test"
 Requires-Dist: flake8==4.0.1; extra == "test"
-Requires-Dist: pytest-cov==2.12.1; extra == "test"
-Requires-Dist: types-requests==2.25.0; extra == "test"
-Requires-Dist: sseclient-py<1.9.0,>=1.7.0; extra == "test"
+Requires-Dist: pytest-pythonpath==0.7.3; extra == "test"
 Requires-Dist: mypy==0.991; extra == "test"
-Requires-Dist: twine==3.4.1; extra == "test"
-Requires-Dist: types-PyYAML==5.4.3; extra == "test"
-Requires-Dist: Werkzeug==2.0.1; extra == "test"
-Requires-Dist: pytest-ordering==0.6; extra == "test"
-Requires-Dist: pytest-asyncio==0.21.*; extra == "test"
 Requires-Dist: pytest-django==4.4.0; extra == "test"
-Requires-Dist: aiohttp<4.0.0,>=3.8.0; extra == "test"
+Requires-Dist: freezegun==1.1.0; extra == "test"
+Requires-Dist: pyyaml<6.1.0,>=5.4.0; extra == "test"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{kameleoon_client_python-3.16.2 → kameleoon_client_python-3.16.3}/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-pythonpath==0.7.3
+wheel==0.36.2
+types-python-dateutil==2.8.2
+types-PyYAML==5.4.3
+pytest-ordering==0.6
+pylint==2.12.*
+sseclient-py<1.9.0,>=1.7.0
+Werkzeug==2.0.1
 Django==3.2.4
-pyyaml<6.1.0,>=5.4.0
+types-requests==2.25.0
+pytest-cov==2.12.1
 aioresponses==0.7.*
-pylint==2.12.*
-types-python-dateutil==2.8.2
-freezegun==1.1.0
-wheel==0.36.2
+pytest-asyncio==0.21.*
+twine==3.4.1
+aiohttp<4.0.0,>=3.8.0
 requests<3.0.0,>=2.25
 flake8==4.0.1
-pytest-cov==2.12.1
-types-requests==2.25.0
-sseclient-py<1.9.0,>=1.7.0
+pytest-pythonpath==0.7.3
 mypy==0.991
-twine==3.4.1
-types-PyYAML==5.4.3
-Werkzeug==2.0.1
-pytest-ordering==0.6
-pytest-asyncio==0.21.*
 pytest-django==4.4.0
-aiohttp<4.0.0,>=3.8.0
+freezegun==1.1.0
+pyyaml<6.1.0,>=5.4.0