Edited file 'python-lib/dku_utils.py'

Author: admin

python-lib/dku_utils.py

@@ -104,30 +104,16 @@ def template_dict(dictionnary, **kwargs):
     return ret
 
 
-def format_template(template, allow_list=False, **kwargs):
-    """
-    Replace {{key}} in template with the value(s) in the kwargs dictionnary.
-    If allow_list is False, list inputs will be joined into a comma-separated string (for headers).
-    If allow_list is True, lists will be returned as lists (for query params).
-    """
-    def replace_in(template):
-        formated = template
-        for key, value in kwargs.items():
-            formated = formated.replace(f"{{{{{key}}}}}", str(value))
-        return formated
+def format_template(template, **kwargs):
+    """ Replace {{keys}} elements in template with the matching value in the kwargs dictionnary"""
     if template is None:
         return None
-    elif isinstance(template, list):
-        replaced_list = [replace_in(item) for item in template]
-        if allow_list:
-            return replaced_list
-        else:
-        # To handle headers
-            return ", ".join(replaced_list)
-    elif isinstance(template, str):
-        return replace_in(template)
-    else:
-        return template
+    placeholders = re.findall(r'{{([a-zA-Z\-\_]*)}}', template)
+    formated = template
+    for placeholder in placeholders:
+        replacement = kwargs.get(placeholder, "")
+        formated = formated.replace("{{{{{}}}}}".format(placeholder), str(replacement))
+    return formated
 
 
 def is_string(data):