check compressed payloads for correct type

Author: lukaspie

src/pynxtools/dataconverter/helpers.py

@@ -742,7 +742,11 @@ def is_valid_data_field(
     """
 
     accepted_types = NEXUS_TO_PYTHON_DATA_TYPES[nxdl_type]
-    # Do not count the dict as it represents a link value
+
+    if isinstance(value, dict) and set(value.keys()) == {"compress", "strength"}:
+        value = value["compress"]
+
+    # Do not count other dicts as they represent a link value
     if not isinstance(value, dict) and not is_valid_data_type(value, accepted_types):
         # try to convert string to bool
         if accepted_types[0] is bool and isinstance(value, str):

src/pynxtools/dataconverter/validation.py

@@ -821,7 +821,7 @@ def is_documented(key: str, tree: NexusNode) -> bool:
             # Collection found, mark as documented
             return True
 
-        if isinstance(mapping[key], dict) and "link" in mapping[key]:
+        if isinstance(mapping[key], Mapping) and "link" in mapping[key]:
             resolved_link = _follow_link({key: mapping[key]}, "")
 
             if key not in resolved_link:

tests/dataconverter/test_validation.py

@@ -1702,15 +1702,43 @@ def listify_template(data_dict: Template):
             [],
             id="appdef-compressed-payload",
         ),
+        pytest.param(
+            alter_dict(
+                TEMPLATE,
+                "/ENTRY[my_entry]/NXODD_name[nxodd_name]/float_value",
+                {"compress": np.int64(2.0), "strength": 1},
+            ),
+            [
+                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/float_value "
+                "should be one of the following Python types: "
+                "(<class 'float'>, <class 'numpy.floating'>), as defined in the "
+                "NXDL as NX_FLOAT."
+            ],
+            id="appdef-compressed-payload-wrong-type",
+        ),
         pytest.param(
             alter_dict(
                 TEMPLATE,
                 "/ENTRY[my_entry]/SAMPLE[sample1]]/changer_position",
-                {"compress": np.float32(2.0), "strength": 1},
+                {"compress": np.int64(2), "strength": 1},
             ),
             [],
             id="baseclass-compressed-payload",
         ),
+        pytest.param(
+            alter_dict(
+                TEMPLATE,
+                "/ENTRY[my_entry]/SAMPLE[sample1]]/changer_position",
+                {"compress": np.float32(2.0), "strength": 3},
+            ),
+            [
+                "The value at /ENTRY[my_entry]/SAMPLE[sample1]]/changer_position "
+                "should be one of the following Python types: "
+                "(<class 'int'>, <class 'numpy.integer'>), as defined in the "
+                "NXDL as NX_INT."
+            ],
+            id="baseclass-compressed-payload-wrong-type",
+        ),
     ],
 )
 def test_validate_data_dict(caplog, data_dict, error_messages, request):