Merge pull request #50 from PSLmodels/simple-error-val2

Fix bug with simple parameter values and error message construction

.travis.yml

@@ -16,7 +16,6 @@ install:
   - conda create -n paramtools-dev python=$TRAVIS_PYTHON_VERSION;
   - source activate paramtools-dev
   - conda env update -f environment.yml
-  - pip install -e .
 
 # command to run tests
 script:

paramtools/__init__.py

@@ -29,6 +29,7 @@
     get_leaves,
     ravel,
     consistent_labels,
+    ensure_value_object,
 )
 
 
@@ -62,4 +63,5 @@
     "get_leaves",
     "ravel",
     "consistent_labels",
+    "ensure_value_object",
 ]

paramtools/parameters.py

@@ -434,15 +434,12 @@ def _parse_errors(self, ve, params):
         }
 
         for pname, data in ve.messages.items():
+            param_data = utils.ensure_value_object(params[pname])
             error_labels = []
             formatted_errors = []
             for ix, marshmessages in data.items():
                 error_labels.append(
-                    {
-                        k: v
-                        for k, v in params[pname][ix].items()
-                        if k != "value"
-                    }
+                    {k: v for k, v in param_data[ix].items() if k != "value"}
                 )
                 formatted_errors_ix = []
                 for _, messages in marshmessages.items():

paramtools/tests/test_parameters.py

@@ -225,6 +225,11 @@ def test_errors(self, TestParams):
         exp_labels = {"min_int_param": [{}]}
         assert excinfo.value.labels == exp_labels
 
+        params = TestParams()
+        adj = {"min_int_param": "abc"}
+        with pytest.raises(ValidationError) as excinfo:
+            params.adjust(adj)
+
     def test_errors_choice_param(self, TestParams):
         params = TestParams()
         adjustment = {"str_choice_param": [{"value": "not a valid choice"}]}

paramtools/tests/test_utils.py

@@ -1,4 +1,9 @@
-from paramtools import get_leaves, ravel, consistent_labels
+from paramtools import (
+    get_leaves,
+    ravel,
+    consistent_labels,
+    ensure_value_object,
+)
 
 
 def test_get_leaves():
@@ -55,3 +60,13 @@ def test_consistent_labels():
 
     v = [{"label0": 1, "label1": 2, "value": 3}, {"label0": 4, "value": 6}]
     assert consistent_labels(v) is None
+
+
+def test_ensure_value_object():
+    assert ensure_value_object("hello") == [{"value": "hello"}]
+    assert ensure_value_object([{"value": "hello"}]) == [{"value": "hello"}]
+    assert ensure_value_object([1, 2, 3]) == [{"value": [1, 2, 3]}]
+    assert ensure_value_object([[1, 2, 3]]) == [{"value": [[1, 2, 3]]}]
+    assert ensure_value_object({"hello": "world"}) == [
+        {"value": {"hello": "world"}}
+    ]

paramtools/utils.py

@@ -85,3 +85,11 @@ def consistent_labels(value_items):
         if used != set(k for k in vo if k != "value"):
             return None
     return used
+
+
+def ensure_value_object(vo):
+    if not isinstance(vo, list) or (
+        isinstance(vo, list) and not isinstance(vo[0], dict)
+    ):
+        vo = [{"value": vo}]
+    return vo