code improvements for properties

Author: Matias Melograno

splitio/api/events.py

@@ -45,12 +45,6 @@ def _build_bulk(events):
                 'value': event.value,
                 'timestamp': event.timestamp,
                 'properties': event.properties,
-            } if event.properties is not None else {
-                'key': event.key,
-                'trafficTypeName': event.traffic_type_name,
-                'eventTypeId': event.event_type_id,
-                'value': event.value,
-                'timestamp': event.timestamp,
             }
             for event in events
         ]

splitio/client/factory.py

@@ -15,7 +15,7 @@
 from splitio.client import util
 from splitio.client.listener import ImpressionListenerWrapper
 
-#Storage
+# Storage
 from splitio.storage.inmemmory import InMemorySplitStorage, InMemorySegmentStorage, \
     InMemoryImpressionStorage, InMemoryEventStorage, InMemoryTelemetryStorage
 from splitio.storage.adapters import redis
@@ -59,10 +59,10 @@ class TimeoutException(Exception):
     pass
 
 
-class SplitFactory(object):  #pylint: disable=too-many-instance-attributes
+class SplitFactory(object):  # pylint: disable=too-many-instance-attributes
     """Split Factory/Container class."""
 
-    def __init__(  #pylint: disable=too-many-arguments
+    def __init__(  # pylint: disable=too-many-arguments
             self,
             storages,
             labels_enabled,
@@ -223,7 +223,7 @@ def _wrap_impression_listener(listener, metadata):
     return None
 
 
-def _build_in_memory_factory(api_key, config, sdk_url=None, events_url=None):  #pylint: disable=too-many-locals
+def _build_in_memory_factory(api_key, config, sdk_url=None, events_url=None):  # pylint: disable=too-many-locals
     """Build and return a split factory tailored to the supplied config."""
     if not input_validator.validate_factory_instantiation(api_key):
         return None
@@ -304,8 +304,8 @@ def _build_in_memory_factory(api_key, config, sdk_url=None, events_url=None):  #
     tasks['events'].start()
     tasks['telemetry'].start()
 
-    storages['events'].set_queue_full_hook(tasks['events'].flush())
-    storages['impressions'].set_queue_full_hook(tasks['impressions'].flush())
+    storages['events'].set_queue_full_hook(tasks['events'].flush)
+    storages['impressions'].set_queue_full_hook(tasks['impressions'].flush)
 
     def split_ready_task():
         """Wait for splits to be ready and start fetching segments."""

splitio/client/input_validator.py

@@ -487,7 +487,7 @@ def valid_properties(properties):
 
     valid_properties = dict()
 
-    for property, element in properties.items():
+    for property, element in six.iteritems(properties):
         if not isinstance(property, six.string_types):  # Exclude property if is not string
             continue
 
@@ -517,4 +517,4 @@ def valid_properties(properties):
     if len(valid_properties.keys()) > 300:
         _LOGGER.warning('Event has more than 300 properties. Some of them will be trimmed' +
                         ' when processed')
-    return True, valid_properties if len(valid_properties.keys()) > 0 else None, size
+    return True, valid_properties if len(valid_properties) else None, size

splitio/engine/evaluator.py

@@ -7,7 +7,7 @@
 CONTROL = 'control'
 
 
-class Evaluator(object):  #pylint: disable=too-few-public-methods
+class Evaluator(object):  # pylint: disable=too-few-public-methods
     """Split Evaluator class."""
 
     def __init__(self, split_storage, segment_storage, splitter):

splitio/storage/uwsgi.py

@@ -458,13 +458,6 @@ def pop_many(self, count):
                 event['value'],
                 event['timestamp'],
                 event['properties']
-            ) if 'properties' in event else
-            Event(
-                event['key'],
-                event['traffic_type_name'],
-                event['event_type_id'],
-                event['value'],
-                event['timestamp'],
             )
             for event in current[:count]
         ]

tests/api/test_events.py

@@ -36,10 +36,10 @@ def test_post_events(self, mocker):
 
         # validate key-value args (body)
         assert call_made[2]['body'] == [
-            {'key': 'k1', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': 12.50, 'timestamp': 123456},
-            {'key': 'k2', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': 12.50, 'timestamp': 123456},
+            {'key': 'k1', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': 12.50, 'timestamp': 123456, 'properties': None},
+            {'key': 'k2', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': 12.50, 'timestamp': 123456, 'properties': None},
             {'key': 'k3', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': None, 'timestamp': 123456, 'properties': {"test": 1234}},
-            {'key': 'k4', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': None, 'timestamp': 123456}
+            {'key': 'k4', 'trafficTypeName': 'user', 'eventTypeId': 'purchase', 'value': None, 'timestamp': 123456, 'properties': None},
         ]
 
         httpclient.reset_mock()