Update develop and merge

Author: haptikrajasashtikar

FeatureToggle/__init__.py

@@ -7,6 +7,7 @@
 from UnleashClient import constants as consts
 from UnleashClient import UnleashClient
 from UnleashClient.utils import LOGGER
+from FeatureToggle.utils import timed_lru_cache
 
 
 def split_and_strip(parameters: str):
@@ -50,6 +51,7 @@ def initialize(url: str,
             FeatureToggles.__redis_db = redis_db
             FeatureToggles.__enable_toggle_service = enable_toggle_service
             FeatureToggles.__cache = FeatureToggles.__get_cache()
+            LOGGER.info(f'Initializing Feature toggles')
         else:
             raise Exception("Client has been already initialized")
 
@@ -88,9 +90,9 @@ def update_cache(data: Dict[str, Any]) -> None:
             )
         except Exception as err:
             raise Exception(
-                f'Exception occured while updating the redis cache: {str(err)}'
+                f'Exception occurred while updating the redis cache: {str(err)}'
             )
-        LOGGER.info(f'Cache Updatation is Done')
+        LOGGER.info(f'[Feature Toggles] Cache Updated')
 
     @staticmethod
     def __get_unleash_client():
@@ -145,14 +147,8 @@ def is_enabled_for_domain(feature_name: str,
         Returns:
             (bool): True if Feature is enabled else False
         """
-        feature_name = FeatureToggles.__get_full_feature_name(feature_name)
-
-        context = {}
-        if domain_name:
-            context['domain_names'] = domain_name
-
-        return FeatureToggles.__get_unleash_client().is_enabled(feature_name,
-                                                                context)
+        feature_toggles = FeatureToggles.fetch_feature_toggles()
+        return domain_name in feature_toggles.get(feature_name, {}).get('domain_names', [])
 
     @staticmethod
     def is_enabled_for_partner(feature_name: str,
@@ -165,14 +161,8 @@ def is_enabled_for_partner(feature_name: str,
         Returns:
             (bool): True if Feature is enabled else False
         """
-        feature_name = FeatureToggles.__get_full_feature_name(feature_name)
-
-        context = {}
-        if partner_name:
-            context['partner_names'] = partner_name
-
-        return FeatureToggles.__get_unleash_client().is_enabled(feature_name,
-                                                                context)
+        feature_toggles = FeatureToggles.fetch_feature_toggles()
+        return partner_name in feature_toggles.get(feature_name, {}).get('partner_names', [])
 
     @staticmethod
     def is_enabled_for_business(feature_name: str,
@@ -185,14 +175,8 @@ def is_enabled_for_business(feature_name: str,
         Returns:
             (bool): True if Feature is enabled else False
         """
-        feature_name = FeatureToggles.__get_full_feature_name(feature_name)
-
-        context = {}
-        if business_via_name:
-            context['business_via_names'] = business_via_name
-
-        return FeatureToggles.__get_unleash_client().is_enabled(feature_name,
-                                                                context)
+        feature_toggles = FeatureToggles.fetch_feature_toggles()
+        return business_via_name in feature_toggles.get(feature_name, {}).get('business_via_names', [])
 
     @staticmethod
     def is_enabled_for_expert(feature_name: str,
@@ -205,14 +189,8 @@ def is_enabled_for_expert(feature_name: str,
         Returns:
             (bool): True if Feature is enabled else False
         """
-        feature_name = FeatureToggles.__get_full_feature_name(feature_name)
-
-        context = {}
-        if expert_email:
-            context['expert_emails'] = expert_email
-
-        return FeatureToggles.__get_unleash_client().is_enabled(feature_name,
-                                                                context)
+        feature_toggles = FeatureToggles.fetch_feature_toggles()
+        return expert_email in feature_toggles.get(feature_name, {}).get('expert_emails', [])
 
     @staticmethod
     def is_enabled_for_team(feature_name: str,
@@ -225,19 +203,11 @@ def is_enabled_for_team(feature_name: str,
         Returns:
             (bool): True if feature is enabled else False
         """
-        feature_name = FeatureToggles.__get_full_feature_name(feature_name)
-
-        context = {}
-        if team_id:
-            context['team_ids'] = team_id
-
-        return (
-            FeatureToggles
-            .__get_unleash_client()
-            .is_enabled(feature_name, context)
-        )
+        feature_toggles = FeatureToggles.fetch_feature_toggles()
+        return team_id in feature_toggles.get(feature_name, {}).get('team_ids', [])
 
     @staticmethod
+    @timed_lru_cache(seconds=(60*60), maxsize=2048)
     def fetch_feature_toggles():
         """
         Returns(Dict):
@@ -251,7 +221,7 @@ def fetch_feature_toggles():
             }
         """
         # TODO: Remove the cas and environment name from the feature toggles while returning the response
-
+        LOGGER.info(f'Loading Feature Toggles from Redis')
         if FeatureToggles.__cache is None:
             raise Exception(
                 'To update cache Feature Toggles class needs to be initialised'
@@ -311,5 +281,4 @@ def fetch_feature_toggles():
         except Exception as err:
             # Handle this exception from where this util gets called
             raise Exception(f'An error occurred while parsing the response: {str(err)}')
-
         return response

FeatureToggle/utils.py

@@ -0,0 +1,23 @@
+from UnleashClient import LOGGER
+from datetime import datetime, timedelta
+from functools import lru_cache, wraps
+
+
+def timed_lru_cache(seconds: int, maxsize: int = 128):
+    LOGGER.info(f'timed_lru_cache was called')
+
+    def wrapper_cache(func):
+        func = lru_cache(maxsize=maxsize)(func)
+        func.lifetime = timedelta(seconds=seconds)
+        func.expiration = datetime.utcnow() + func.lifetime
+
+        @wraps(func)
+        def wrapped_func(*args, **kwargs):
+            if datetime.utcnow() >= func.expiration:
+                func.cache_clear()
+                func.expiration = datetime.utcnow() + func.lifetime
+            return func(*args, **kwargs)
+
+        return wrapped_func
+
+    return wrapper_cache