Merge pull request #21 from dataiku/bug/sc-82448-templating-not-working-when-no-codeenv

Fix for SC 82448 : templating not working when no codeenv

Author: alexbourret

python-lib/dku_utils.py

@@ -57,3 +57,30 @@ def get_value_from_path(dictionary, path, default=None, can_raise=True):
             else:
                 return None
     return ret
+
+
+def template_dict(dictionnary, **kwargs):
+    """ Recurses into dictionnary and replace template {{keys}} with the matching values present in the kwargs dictionnary"""
+    ret = dict.copy(dictionnary)
+    for key in ret:
+        if isinstance(ret[key], dict):
+            ret[key] = template_dict(ret[key], **kwargs)
+        if is_string(ret[key]):
+            ret[key] = format_template(ret[key], **kwargs)
+    return ret
+
+
+def format_template(template, **kwargs):
+    """ Replace {{keys}} elements in template with the matching value in the kwargs dictionnary"""
+    if template is None:
+        return None
+    formated = template
+    for key in kwargs:
+        replacement = kwargs.get(key, "")
+        formated = formated.replace("{{{{{}}}}}".format(key), str(replacement))
+    return formated
+
+
+def is_string(data):
+    data_type = type(data).__name__
+    return data_type in ["str", "unicode"]

python-lib/rest_api_client.py

@@ -4,35 +4,13 @@
 from pagination import Pagination
 from safe_logger import SafeLogger
 from loop_detector import LoopDetector
-from dku_utils import get_dku_key_values
+from dku_utils import get_dku_key_values, template_dict, format_template
 from dku_constants import DKUConstants
 
 
 logger = SafeLogger("api-connect plugin", forbiden_keys=["token", "password"])
 
 
-def template_dict(dictionnary, **kwargs):
-    """ Recurses into dictionnary and replace template {{keys}} with the matching values present in the kwargs dictionnary"""
-    ret = dict.copy(dictionnary)
-    for key in ret:
-        if isinstance(ret[key], dict):
-            ret[key] = template_dict(ret[key], **kwargs)
-        if isinstance(ret[key], str):
-            ret[key] = format_template(ret[key], **kwargs)
-    return ret
-
-
-def format_template(template, **kwargs):
-    """ Replace {{keys}} elements in template with the matching value in the kwargs dictionnary"""
-    if template is None:
-        return None
-    formated = template
-    for key in kwargs:
-        replacement = kwargs.get(key, "")
-        formated = formated.replace("{{{{{}}}}}".format(key), str(replacement))
-    return formated
-
-
 class RestAPIClientError(ValueError):
     pass
 

tests/python/unit/requirements.txt

@@ -0,0 +1,2 @@
+pytest==6.2.1
+allure-pytest==2.8.29

tests/python/unit/test_common.py

@@ -0,0 +1,34 @@
+from dku_utils import template_dict
+import pytest
+
+
+class TestCommonMethods:
+    def setup_class(self):
+        self.template = {
+            'url': 'https://api.spotify.com/v1/users/{{user_id}}/playlists',
+            'headers': {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer {{access_token}}'
+            },
+            'recipe_columns_parameter_names': ['user_id'],
+            'key_to_next_page_url': 'next', 'items_key': 'items'
+        }
+        self.kwargs = {
+            u'column': u'profiles id',
+            'access_token': u'12341234secretcode-4321shhhhhh',
+            'user_id': '1234abcde'
+        }
+        self.endpoint_ok = {
+            'url': 'https://api.spotify.com/v1/users/1234abcde/playlists',
+            'headers': {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer 12341234secretcode-4321shhhhhh'
+            },
+            'key_to_next_page_url': 'next',
+            'items_key': 'items',
+            'recipe_columns_parameter_names': ['user_id']
+        }
+
+    def test_template_dict(self):
+        endpoint = template_dict(self.template, **self.kwargs)
+        assert endpoint == self.endpoint_ok