util: data: export_value now converts numpy array to JSON serializable datatype

Fixes: #822

Signed-off-by: sakshamarora1 <[email protected]>

Author: sakshamarora1

CHANGELOG.md

@@ -105,6 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   packaging the model.
 - IntegrationCLITestCase creates a new directory and chdir into it for each test
 ### Fixed
+- `export_value` now converts numpy array to JSON serializable datatype
 - CSV source overwriting configloaded data to every row
 - Race condition in `MemoryRedundancyChecker` when more than 4 possible
   parameter sets for an operation.

dffml/util/data.py

@@ -205,6 +205,7 @@ def type_lookup(typename):
 
 def export_value(obj, key, value):
     # export and _asdict are not classmethods
+    typename_lower = str(type(value)).lower()
     if hasattr(value, "ENTRY_POINT_ORIG_LABEL") and hasattr(value, "config"):
         obj[key] = {"plugin": value.ENTRY_POINT_ORIG_LABEL}
         export_value(obj[key], "config", value.config)
@@ -216,14 +217,17 @@ def export_value(obj, key, value):
         obj[key] = value.export()
     elif hasattr(value, "_asdict"):
         obj[key] = value._asdict()
-    elif (
-        getattr(type(value), "__module__", None) == "numpy"
-        and isinstance(value, collections.abc.Iterable)
-        and isinstance(
-            getattr(value, "flatten", None), collections.abc.Callable
-        )
-    ):
-        obj[key] = tuple(value.flatten())
+    elif "numpy" in typename_lower:
+        if isinstance(value, collections.abc.Iterable) and isinstance(
+            getattr(value, "tolist", None), collections.abc.Callable
+        ):
+            obj[key] = value.tolist()
+        elif ".int" in typename_lower or ".uint" in typename_lower:
+            obj[key] = int(value)
+        elif "float" in typename_lower:
+            obj[key] = float(value)
+        else:
+            raise ValueError(f"Unknown numpy type: {typename_lower}")
     elif dataclasses.is_dataclass(value):
         obj[key] = export_dict(**dataclasses.asdict(value))
     elif getattr(value, "__module__", None) == "typing":