Merge pull request #112 from splitio/development

[SDKS-285 & 413 & 377]: Python Sdk: Move to a single impressions queue

Author: mmelograno

CHANGES.txt

@@ -1,3 +1,8 @@
+7.0.0 (Feb 21, 2019)
+ - Stored Impressions in Queue.
+ - Fixed bug related to Machine Name and Machine IP.
+ - Updated Input Validation.
+ - New hash implementation supporting more platforms.
 6.2.2 (Dec 17, 2018)
  - Fixed issue on selecting db for Sentinel.
 6.2.1 (Dec 6, 2018)

README.md

@@ -28,8 +28,8 @@ Split has built and maintains a SDKs for:
 * PHP [Github](https://github.com/splitio/php-client) [Docs](http://docs.split.io/docs/php-sdk-overview)
 * Python [Github](https://github.com/splitio/python-client) [Docs](http://docs.split.io/docs/python-sdk-overview)
 * GO [Github](https://github.com/splitio/go-client) [Docs](http://docs.split.io/docs/go-sdk-overview)
-* Android [Github](https://github.com/splitio/android-client) [Docs](https://docs.split.io/v1/docs/android-sdk-overview)
-* IOS [Github](https://github.com/splitio/ios-client) [Docs](https://docs.split.io/v1/docs/ios-sdk-overview)
+* Android [Github](https://github.com/splitio/android-client) [Docs](https://docs.split.io/docs/android-sdk-overview)
+* IOS [Github](https://github.com/splitio/ios-client) [Docs](https://docs.split.io/docs/ios-sdk-overview)
 
 For a comprehensive list of opensource projects visit our [Github page](https://github.com/splitio?utf8=%E2%9C%93&query=%20only%3Apublic%20).
 

setup.py

@@ -35,7 +35,7 @@
           'test': tests_require,
           'redis': ['redis>=2.10.5', 'jsonpickle>=0.9.3'],
           'uwsgi': ['uwsgi>=2.0.0', 'jsonpickle>=0.9.3'],
-          'cpphash': ['splitmmh3']
+          'cpphash': ['mmh3cffi>=0.1.2']
       },
       setup_requires=['nose'],
       classifiers=[

splitio/api.py

@@ -5,6 +5,7 @@
 import requests
 import json
 
+from splitio.exceptions import ForbiddenException
 from splitio.config import SDK_API_BASE_URL, EVENTS_API_BASE_URL, SDK_VERSION
 
 _SEGMENT_CHANGES_URL_TEMPLATE = '{base_url}/segmentChanges/{segment_name}/'
@@ -92,7 +93,10 @@ def _build_headers(self):
         return headers
 
     def _logHttpError(self, response):
-        if response.status_code < 200 or response.status_code >= 400:
+        if response.status_code == requests.codes.forbidden:
+            raise ForbiddenException()
+
+        if response.status_code < requests.codes.ok or response.status_code >= requests.codes.bad:
             respJson = response.json()
             if 'message' in respJson:
                 self._logger.error(

splitio/brokers.py

@@ -26,7 +26,8 @@
     AllKeysSplit, CacheBasedSplitFetcher
 from splitio.segments import ApiSegmentChangeFetcher, \
     SelfRefreshingSegmentFetcher, JSONFileSegmentFetcher
-from splitio.config import DEFAULT_CONFIG, MAX_INTERVAL, parse_config_file
+from splitio.config import DEFAULT_CONFIG, MAX_INTERVAL, parse_config_file, \
+    set_machine_ip, set_machine_name
 from splitio.uwsgi import UWSGISplitCache, UWSGIImpressionsCache, \
     UWSGIMetricsCache, UWSGIEventsCache, get_uwsgi
 from splitio.tasks import EventsSyncTask
@@ -79,13 +80,13 @@ def get_change_number(self):
         """
         return self.get_split_fetcher().change_number
 
-    def log_impression(self, impression):
+    def log_impressions(self, impressions):
         """
-        Logs an impression after a get_treatment call
+        Logs impressions after a get_treatments call
         :return: The treatment log implementation.
         :rtype: TreatmentLog
         """
-        return self.get_impression_log().log(impression)
+        return self.get_impression_log().log_impressions(impressions)
 
     def log_operation_time(self, operation, elapsed):
         """Get the metrics implementation.
@@ -120,6 +121,7 @@ def get_events_log(self):
     def destroy(self):
         pass
 
+
 class JSONFileBroker(BaseBroker):
     def __init__(self, config, segment_changes_file_name, split_changes_file_name):
         """
@@ -138,8 +140,8 @@ def __init__(self, config, segment_changes_file_name, split_changes_file_name):
         self._segment_changes_file_name = segment_changes_file_name
         self._split_changes_file_name = split_changes_file_name
         self._split_fetcher = self._build_split_fetcher()
-        self._treatment_log = TreatmentLog() # Does nothing on ._log()
-        self._metrics = Metrics() # Does nothing on .count(), .time(), .gauge()
+        self._treatment_log = TreatmentLog()  # Does nothing on ._log()
+        self._metrics = Metrics()  # Does nothing on .count(), .time(), .gauge()
 
     def _build_split_fetcher(self):
         """
@@ -183,6 +185,7 @@ def destroy(self):
     def get_events_log(self):
         return None
 
+
 class SelfRefreshingBroker(BaseBroker):
     def __init__(self, api_key, config=None, sdk_api_base_url=None,
                  events_api_base_url=None, impression_listener=None):
@@ -488,7 +491,7 @@ def get_events_log(self):
     def refresh_splits(self):
         while not self._destroyed:
             time.sleep(self._split_refresh_period)
-            if not self._destroyed: # DO NOT REMOVE
+            if not self._destroyed:  # DO NOT REMOVE
                                     # This check is used in case the client was
                                     # destroyed while the thread was sleeping
                                     # and the file was closed, in order to
@@ -590,7 +593,6 @@ def __init__(self, uwsgi, config=None):
         self._treatment_log = treatment_log
         self._metrics = metrics
 
-
     def get_split_fetcher(self):
         """
         Get the split fetcher implementation for the broker.
@@ -640,6 +642,9 @@ def _init_config(api_key, **kwargs):
         file_config.update(config)
         config = file_config
 
+    set_machine_ip(config.get('splitSdkMachineIp'))
+    set_machine_name(config.get('splitSdkMachineName'))
+
     return api_key, config, sdk_api_base_url, events_api_base_url
 
 

splitio/cache.py

@@ -177,6 +177,16 @@ def add_impression(self, impression):
         """
         pass  # Do nothing
 
+    def add_impressions(self, impressions):
+        """
+        Adds impression to the queue if it is enabled, otherwise the impression
+        is dropped.
+        :param impressions: The impression bulk
+        :type impressions: list
+        """
+        for impression in impressions:
+            self.add_impression(impression)
+
     def fetch_all(self):
         """ List all impressions.
         :return: A list of Impression tuples