Merge pull request #792 from OpenKnowledgeMaps/dev

Dev

Author: chreman

server/workers/api/src/apis/request_validators.py

@@ -37,9 +37,9 @@ class Meta:
     custom_title = fields.Str()
     exclude_date_filters = fields.Boolean()
     custom_clustering = fields.Str()
-    academic_age_offset = fields.Int()
-    enable_h_index = fields.Bool()
-    enable_teaching_mentorship = fields.Bool()
+    academic_age_offset = fields.Int(allow_none=True)
+    enable_h_index = fields.Boolean(allow_none=True)
+    enable_teaching_mentorship = fields.Boolean(allow_none=True)
 
 
     @pre_load
@@ -81,6 +81,33 @@ def lang_id_empty_fallback(self, in_data, **kwargs):
 
         return in_data
 
+    @pre_load
+    def fix_academic_age_offset(self, in_data, **kwargs):
+        try:
+            if "academic_age_offset" in in_data:
+                in_data["academic_age_offset"] = int(in_data["academic_age_offset"])
+        except (ValueError, TypeError):
+            in_data["academic_age_offset"] = 0
+        return in_data
+
+    @pre_load
+    def fix_enable_h_index(self, in_data, **kwargs):
+        try:
+            if "enable_h_index" in in_data:
+                in_data["enable_h_index"] = in_data["enable_h_index"].lower().capitalize() == "True"
+        except Exception:
+            pass
+        return in_data
+    
+    @pre_load
+    def fix_enable_teaching_mentorship(self, in_data, **kwargs):
+        try:
+            if "enable_teaching_mentorship" in in_data:
+                in_data["enable_teaching_mentorship"] = in_data["enable_teaching_mentorship"].lower().capitalize() == "True"
+        except Exception:
+            pass
+        return in_data
+
     @validates('from_')
     def is_not_in_future(self, date):
         if date > datetime.today().date():

server/workers/common/common/utils.py

@@ -83,7 +83,7 @@ def get_or_create_contentprovider_lookup():
         k = str(uuid.uuid4())
         d = {"id": k, "params": {},"endpoint": "contentproviders"}
         redis_store.rpush("base", json.dumps(d))
-        result = get_key(redis_store, k, 10)
+        result = get_key(redis_store, k, 100)
         if result.get("status") == "error":
             df = pd.read_json("contentproviders.json")
             df.set_index("internal_name", inplace=True)