fix typing error in template.py (#336)

* fix typing error in template.py

* increment version

Author: chadp777

pctasks/cli/pctasks/cli/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/client/pctasks/client/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/core/pctasks/core/utils/template.py

@@ -23,7 +23,7 @@ class TemplateError(Exception):
     pass
 
 
-TemplateValue = Union[str, List[Any], Dict[str, Any]]
+TemplateValue = Union[bool, int, float, str, List[Any], Dict[str, Any]]
 # TemplateValue = Union[str, List["TemplateValue"], Dict[str, Any]]
 # If https://github.com/python/mypy/issues/731 is closed, use above.
 
@@ -113,9 +113,7 @@ def _fetch(
                 else:
                     raise ValueError(f"Expected dict at key {head}, got {type(v)}")
             else:
-                if not (
-                    isinstance(v, dict) or isinstance(v, list) or isinstance(v, str)
-                ):
+                if not (isinstance(v, (dict, list, str, int, float, bool))):
                     raise ValueError(
                         f"Expected final value at key {head}, got {type(v)}"
                     )

pctasks/core/pctasks/core/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/core/tests/utils/test_template.py

@@ -9,6 +9,7 @@
 from pctasks.core.utils.template import (
     LocalTemplater,
     TemplateError,
+    TemplateValue,
     find_value,
     split_path,
     template_dict,
@@ -37,9 +38,10 @@ def test_template() -> None:
         },
     }
 
-    def _get_value(path: List[str]) -> Optional[str]:
+    def _get_value(path: List[str]) -> Optional[TemplateValue]:
         if path[0] == "params":
             return find_value(params, path[1:])
+        return None
 
     result = template_dict(data, _get_value)
 
@@ -49,7 +51,36 @@ def _get_value(path: List[str]) -> Optional[str]:
     assert result["environment"]["list"] == "two"
 
 
-def test_split_path():
+def test_template_new_types() -> None:
+    params = {
+        "force": True,
+        "int_value": 1,
+        "float_value": 1.0,
+    }
+
+    data = {
+        "id": "something",
+        "environment": {
+            "force": r"${{ params.force }}",
+            "int_value": r"${{ params.int_value }}",
+            "float_value": r"${{ params.float_value }}",
+        },
+    }
+
+    def _get_value(path: List[str]) -> Optional[TemplateValue]:
+        if path[0] == "params":
+            return find_value(params, path[1:])
+        return None
+
+    result = template_dict(data, _get_value)
+
+    assert result["id"] == "something"
+    assert result["environment"]["force"]
+    assert result["environment"]["int_value"] == 1
+    assert result["environment"]["float_value"] == 1.0
+
+
+def test_split_path() -> None:
     s = "a.b.c"
     assert split_path(s) == ["a", "b", "c"]
 
@@ -79,7 +110,7 @@ def _get_value(path: List[str]) -> Optional[str]:
     templated_collection.validate()
 
 
-def test_local_path_template_glob(tmp_path) -> None:
+def test_local_path_template_glob(tmp_path: pathlib.Path) -> None:
     p = tmp_path.joinpath("file-1.json")
 
     yaml_str = f"""

pctasks/dataset/pctasks/dataset/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/dev/pctasks/dev/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/ingest/pctasks/ingest/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/ingest_task/pctasks/ingest_task/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

pctasks/notify/pctasks/notify/version.py

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"