Merge branch 'master' into fix-required-under-optional

Author: domna

pynxtools/dataconverter/helpers.py

@@ -264,14 +264,12 @@ def convert_data_dict_path_to_hdf5_path(path) -> str:
     return hdf5path
 
 
-def is_value_valid_element_of_enum(value, elem) -> Tuple[bool, list]:
+def is_value_valid_element_of_enum(value, elist) -> Tuple[bool, list]:
     """Checks whether a value has to be specific from the NXDL enumeration and returns options."""
-    if elem is not None:
-        has_enums, enums = nexus.get_enums(elem)
-        if has_enums and (
-            isinstance(value, list) or value not in enums[0:-1] or value == ""
-        ):
-            return False, enums
+    for elem in elist:
+        enums = nexus.get_enums(elem)
+        if enums is not None:
+            return value in enums, enums
     return True, []
 
 
@@ -624,9 +622,12 @@ def validate_data_dict(template, data, nxdl_root: ET.Element):
                     else "NXDL_TYPE_UNAVAILABLE"
                 )
                 data[path] = is_valid_data_field(data[path], nxdl_type, path)
-                is_valid_enum, enums = is_value_valid_element_of_enum(data[path], elem)
+                elist = nexus.get_inherited_nodes(
+                    nxdl_path, path.rsplit("/", 1)[-1], nxdl_root
+                )[2]
+                is_valid_enum, enums = is_value_valid_element_of_enum(data[path], elist)
                 if not is_valid_enum:
-                    raise ValueError(
+                    logger.warning(
                         f"The value at {path} should be on of the "
                         f"following strings: {enums}"
                     )

pynxtools/definitions

@@ -1 +1 @@
-v2020.10-1637-g2ac33b2cf
+v2020.10-1652-g88ff21539

pynxtools/nexus-version.txt

@@ -335,7 +335,7 @@ def fixture_filled_test_data(template, tmp_path):
             ),
             (
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/type should be on of the following"
-                " strings: [1st type,2nd type,3rd type,4th type]"
+                " strings: ['1st type', '2nd type', '3rd type', '4th type']"
             ),
             id="wrong-enum-choice",
         ),
@@ -445,6 +445,14 @@ def test_validate_data_dict(
         captured_logs = caplog.records
         helpers.validate_data_dict(template, data_dict, nxdl_root)
         assert any(error_message in rec.message for rec in captured_logs)
+    elif request.node.callspec.id in (
+        "wrong-enum-choice",
+        "atleast-one-required-child-not-provided-optional-parent",
+    ):
+        with caplog.at_level(logging.WARNING):
+            helpers.validate_data_dict(template, data_dict, nxdl_root)
+
+        assert error_message in caplog.text
     else:
         with pytest.raises(Exception) as execinfo:
             helpers.validate_data_dict(template, data_dict, nxdl_root)