update hdfdict to np v2, safely unpack str/bytes in datetime validation

Author: lukaspie

src/pynxtools/dataconverter/hdfdict.py

@@ -7,7 +7,7 @@
 
 import h5py
 import yaml
-from numpy import string_
+from numpy import str_
 
 TYPE = "_type_"
 
@@ -45,7 +45,7 @@ def unpack_dataset(item):
 
     """
     value = item[()]
-    type_id = item.attrs.get(TYPE, string_()).astype(str)
+    type_id = item.attrs.get(TYPE, str_()).astype(str)
     if type_id == "datetime":
         if hasattr(value, "__iter__"):
             value = [datetime.fromtimestamp(ts) for ts in value]
@@ -62,7 +62,7 @@ def unpack_dataset(item):
         value = tuple(value)
 
     elif type_id == "str":
-        value = string_(value).astype(str)
+        value = str_(value).astype(str)
 
     return value
 
@@ -181,15 +181,15 @@ def pack_dataset(hdfobject, key, value):
             attr_data = None
 
         if attr_data:
-            ds.attrs.create(name=TYPE, data=string_(attr_data))
+            ds.attrs.create(name=TYPE, data=str_(attr_data))
 
     except (TypeError, ValueError):
         # Obviously the data was not serializable. To give it
         # a last try; serialize it to yaml
         # and save it to the hdf file:
-        ds = hdfobject.create_dataset(name=key, data=string_(yaml.safe_dump(value)))
+        ds = hdfobject.create_dataset(name=key, data=str_(yaml.safe_dump(value)))
 
-        ds.attrs.create(name=TYPE, data=string_("yaml"))
+        ds.attrs.create(name=TYPE, data=str_("yaml"))
         # if this fails again, restructure your data!
 
 

src/pynxtools/dataconverter/helpers.py

@@ -794,8 +794,10 @@ def validate_data_value(
             collector.collect_and_log(path, ValidationProblem.IsNotPosInt, value)
 
         if nxdl_type in ("ISO8601", "NX_DATE_TIME"):
-            results = ISO8601.search(value)
-            if results is None:
+
+            if ISO8601.search(
+                value.decode("utf-8") if isinstance(value, bytes) else value
+            ) is None:
                 collector.collect_and_log(
                     path, ValidationProblem.InvalidDatetime, value
                 )