convert data types to avoid issues between np1 and np2

Author: lukaspie

src/pynxtools/dataconverter/helpers.py

@@ -165,9 +165,16 @@ def _log(self, path: str, log_type: ValidationProblem, value: Optional[Any], *ar
         elif log_type == ValidationProblem.MissingRequiredAttribute:
             logger.warning(f"The required attribute {path} hasn't been supplied.")
         elif log_type == ValidationProblem.InvalidType:
+            type_names = [
+                f"{t.__module__}.{t.__name__}"
+                if t.__module__ != "builtins"
+                else t.__name__
+                for t in value
+            ]
             logger.warning(
-                f"The value at {path} should be one of the following Python types: {value}"
-                f", as defined in the NXDL as {args[0] if args else '<unknown>'}."
+                f"The value at {path} should be one of the following Python types: "
+                f"{', '.join(type_names)}, "
+                f"as defined in the NXDL as {args[0] if args else '<unknown>'}."
             )
         elif log_type == ValidationProblem.InvalidDatetime:
             logger.warning(

tests/dataconverter/test_validation.py

@@ -443,7 +443,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/anamethatRENAMES[anamethatichangetothis]"
-                " should be one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as defined in "
+                " should be one of the following Python types: int, numpy.integer, as defined in "
                 "the NXDL as NX_INT."
             ],
             id="variadic-field-str-instead-of-int",
@@ -456,7 +456,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/in"
-                "t_value should be one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as defined in "
+                "t_value should be one of the following Python types: int, numpy.integer, as defined in "
                 "the NXDL as NX_INT."
             ],
             id="string-instead-of-int",
@@ -468,8 +468,7 @@ def format_error_message(msg: str) -> str:
                 "NOT_TRUE_OR_FALSE",
             ),
             [
-                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/bool_value should be one of the following Python types: "
-                "(<class 'bool'>, <class 'numpy.bool_'>), as defined in the NXDL as NX_BOOLEAN."
+                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/bool_value should be one of the following Python types: bool, numpy.bool, as defined in the NXDL as NX_BOOLEAN."
             ],
             id="string-instead-of-bool",
         ),
@@ -481,7 +480,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/int_value should"
-                " be one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as defined in the NXDL as NX_INT."
+                " be one of the following Python types: int, numpy.integer, as defined in the NXDL as NX_INT."
             ],
             id="list-of-int-str-instead-of-int",
         ),
@@ -493,7 +492,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/int_value should be"
-                " one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as defined in the NXDL as NX_INT."
+                " one of the following Python types: int, numpy.integer, as defined in the NXDL as NX_INT."
             ],
             id="array-of-float-instead-of-int",
         ),
@@ -545,7 +544,7 @@ def format_error_message(msg: str) -> str:
                 np.complex128(0),
             ),
             [
-                "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."
+                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/float_value should be one of the following Python types: float, numpy.floating, as defined in the NXDL as NX_FLOAT."
             ],
             id="complex-instead-of-float",
         ),
@@ -556,7 +555,7 @@ def format_error_message(msg: str) -> str:
                 "0",
             ),
             [
-                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/number_value should be one of the following Python types: (<class 'int'>, <class 'numpy.integer'>, <class 'float'>, <class 'numpy.floating'>), as defined in the NXDL as NX_NUMBER."
+                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/number_value should be one of the following Python types: int, numpy.integer, float, numpy.floating, as defined in the NXDL as NX_NUMBER."
             ],
             id="str-instead-of-number",
         ),
@@ -568,7 +567,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/char_value should be one"
-                " of the following Python types: (<class 'str'>, <class 'numpy.character'>), as"
+                " of the following Python types: str, numpy.character, as"
                 " defined in the NXDL as NX_CHAR."
             ],
             id="wrong-type-ndarray-instead-of-char",
@@ -652,9 +651,9 @@ def format_error_message(msg: str) -> str:
                 TEMPLATE, "/ENTRY[my_entry]/NXODD_name[nxodd_name]/char_value", 3
             ),
             [
-                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/char_value should be one of the following Python types:"
-                " (<class 'str'>, <class 'numpy.character'>),"
-                " as defined in the NXDL as NX_CHAR."
+                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/char_value should be "
+                "one of the following Python types: str, numpy.character, "
+                "as defined in the NXDL as NX_CHAR."
             ],
             id="int-instead-of-chars",
         ),
@@ -709,7 +708,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "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 "
+                "one of the following Python types: float, numpy.floating, as defined in the NXDL "
                 "as NX_FLOAT."
             ],
             id="array-of-str-instead-of-float",
@@ -1229,7 +1228,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/optional_parent/AXISNAME[optional_child] should be "
-                "one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as "
+                "one of the following Python types: int, numpy.integer, as "
                 "defined in the NXDL as NX_INT."
             ],
             id="concept-name-given-for-nonvariadic-field-wrong-type",
@@ -1280,7 +1279,7 @@ def format_error_message(msg: str) -> str:
                 ["0", 1, 2],
             ),
             [
-                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/type/@array should be one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as defined in the NXDL as NX_INT.",
+                "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/type/@array should be one of the following Python types: int, numpy.integer, as defined in the NXDL as NX_INT.",
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/type/@array should be one of the following: [[0, 1, 2], [2, 3, 4]].",
             ],
             id="wrong-type-array-in-attribute",
@@ -1588,7 +1587,7 @@ def format_error_message(msg: str) -> str:
             ),
             [
                 "The value at /ENTRY[my_entry]/duration should be"
-                " one of the following Python types: (<class 'int'>, <class 'numpy.integer'>), as defined in the NXDL as NX_INT."
+                " one of the following Python types: int, numpy.integer, as defined in the NXDL as NX_INT."
             ],
             id="baseclass-wrong-dtype",
         ),
@@ -1897,7 +1896,7 @@ def format_error_message(msg: str) -> str:
             [
                 "The value at /ENTRY[my_entry]/NXODD_name[nxodd_name]/int_value "
                 "should be one of the following Python types: "
-                "(<class 'int'>, <class 'numpy.integer'>), as defined in the "
+                "int, numpy.integer, as defined in the "
                 "NXDL as NX_INT."
             ],
             id="appdef-compressed-wrong-type",
@@ -1906,7 +1905,7 @@ def format_error_message(msg: str) -> str:
             alter_dict(
                 TEMPLATE,
                 "/ENTRY[my_entry]/NXODD_name[nxodd_name]/int_value",
-                {"compress": np.int64(2), "strength": 11},
+                {"compress": 2, "strength": 11},
             ),
             [
                 "Compression strength for /ENTRY[my_entry]/NXODD_name[nxodd_name]/int_value = "
@@ -1944,7 +1943,7 @@ def format_error_message(msg: str) -> str:
             [
                 "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 "
+                "int, class 'numpy.integer, as defined in the "
                 "NXDL as NX_INT."
             ],
             id="baseclass-compressed-wrong-type",