refactored code

Author: Matias Melograno

splitio/brokers.py

@@ -80,14 +80,6 @@ def get_change_number(self):
         """
         return self.get_split_fetcher().change_number
 
-    def log_impression(self, impression):
-        """
-        Logs an impression after a get_treatment call
-        :return: The treatment log implementation.
-        :rtype: TreatmentLog
-        """
-        return self.get_impression_log().log(impression)
-
     def log_impressions(self, impressions):
         """
         Logs impressions after a get_treatments call

splitio/clients.py

@@ -130,7 +130,7 @@ def get_treatment(self, key, feature, attributes=None):
                 self._record_stats(impression, start, SDK_GET_TREATMENT)
 
                 self._send_impression_to_listener(impression, attributes)
-            except Exception:
+            except Exception:  # pylint: disable=broad-except
                 self._logger.exception(
                     'Exception reporting impression into get_treatment exception block'
                 )
@@ -165,7 +165,7 @@ def get_treatments(self, key, features, attributes=None):
         bulk_impressions = []
         treatments = {}
 
-        if (matching_key is None and bucketing_key is None):
+        if matching_key is None and bucketing_key is None:
             for feature in features:
                 impression = self._build_impression(matching_key, feature, CONTROL, Label.EXCEPTION,
                                                     0, bucketing_key, start)

splitio/config.py

@@ -61,23 +61,19 @@
 
 GLOBAL_KEY_PARAMETERS = {
     'sdk-language-version': SDK_VERSION,
-    'instance-id': 'unknown',
-    'ip-address': 'unknown',
+    'instance-id': get_hostname(),
+    'ip-address': get_ip(),
 }
 
 
 def set_machine_ip(machine_ip):
     if machine_ip:
         GLOBAL_KEY_PARAMETERS['ip-address'] = machine_ip
-    else:
-        GLOBAL_KEY_PARAMETERS['ip-address'] = get_ip()
 
 
 def set_machine_name(machine_name):
     if machine_name:
         GLOBAL_KEY_PARAMETERS['instance-id'] = machine_name
-    else:
-        GLOBAL_KEY_PARAMETERS['instance-id'] = get_hostname()
 
 
 def parse_config_file(filename):

splitio/evaluator.py

@@ -4,7 +4,6 @@
 from splitio.splitters import Splitter
 from splitio.key import Key
 from splitio.treatments import CONTROL
-from . import input_validator
 
 
 class Evaluator(object):
@@ -27,13 +26,13 @@ def evaluate_treatment(self, feature, matching_key, bucketing_key, attributes=No
         Evaluates the user submitted data against a feature and return the resulting treatment.
 
         :param feature: The feature for which to get the treatment
-        :type string: feature
+        :type feature:  str
 
         :param matching_key: The matching_key for which to get the treatment
-        :type string: str
+        :type matching_key: str
 
         :param bucketing_key: The bucketing_key for which to get the treatment
-        :type string: str
+        :type bucketing_key: str
 
         :param attributes: An optional dictionary of attributes
         :type attributes: dict
@@ -131,44 +130,3 @@ def get_treatment_for_split(self, split, matching_key, bucketing_key, attributes
 
         # No condition matches
         return None, None
-
-    def get_treatment(self, key, feature, attributes=None):
-        """
-        Evaluate a feature and return the appropriate traetment.
-         Will not generate impressions nor metrics
-         :param key: user key
-        :type key: mixed
-         :param feature: feature name
-        :type feature: str
-         :param attributes: (Optional) attributes associated with the user key
-        :type attributes: dict
-        """
-        matching_key, bucketing_key = input_validator.validate_key(key)
-        feature = input_validator.validate_feature_name(feature)
-        if (matching_key is None and bucketing_key is None) or feature is None:
-            return CONTROL
-        try:
-            # Fetching Split definition
-            split = self._broker.fetch_feature(feature)
-            if split is None:
-                self._logger.warning(
-                    'Unknown or invalid dependent feature: %s',
-                    feature
-                )
-                return CONTROL
-            if split.killed:
-                return split.default_treatment
-            treatment, _ = self.get_treatment_for_split(
-                split,
-                matching_key,
-                bucketing_key,
-                attributes
-            )
-            if treatment is None:
-                return split.default_treatment
-            return treatment
-        except Exception:  # pylint: disable=broad-except
-            self._logger.exception(
-                'Exception caught retrieving dependent feature. Returning CONTROL'
-            )
-            return CONTROL

splitio/utils.py

@@ -17,12 +17,12 @@ def get_ip():
         s.connect(('10.255.255.255', 1))
         IP = s.getsockname()[0]
     except Exception:
-        IP = '127.0.0.1'
+        IP = 'unknown'
     finally:
         s.close()
     return IP
 
 
 def get_hostname():
     ip = get_ip()
-    return 'ip-' + ip.replace('.', '-')
+    return 'unknown' if ip != '' else 'ip-' + ip.replace('.', '-')

splitio/version.py

@@ -1 +1 @@
-__version__ = '6.3.0'
+__version__ = '6.3.0-rc1'