Ensure proper JSON serialization of numpy.ndarray (apache#8946)

etr2460 · Jan 10, 2020 · 7ff18f0 · 7ff18f0
1 parent 497c3e5
commit 7ff18f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/superset/utils/core.py b/superset/utils/core.py
@@ -40,7 +40,7 @@
 
 import bleach
 import markdown as md
-import numpy
+import numpy as np
 import pandas as pd
 import parsedatetime
 import sqlalchemy as sa
@@ -343,10 +343,12 @@ def format_timedelta(td: timedelta) -> str:
 def base_json_conv(obj):
     if isinstance(obj, memoryview):
         obj = obj.tobytes()
-    if isinstance(obj, numpy.int64):
+    if isinstance(obj, np.int64):
         return int(obj)
-    elif isinstance(obj, numpy.bool_):
+    elif isinstance(obj, np.bool_):
         return bool(obj)
+    elif isinstance(obj, np.ndarray):
+        return obj.tolist()
     elif isinstance(obj, set):
         return list(obj)
     elif isinstance(obj, decimal.Decimal):

diff --git a/tests/utils_tests.py b/tests/utils_tests.py
@@ -121,6 +121,7 @@ def test_json_iso_dttm_ser(self):
     def test_base_json_conv(self):
         assert isinstance(base_json_conv(numpy.bool_(1)), bool) is True
         assert isinstance(base_json_conv(numpy.int64(1)), int) is True
+        assert isinstance(base_json_conv(numpy.array([1, 2, 3])), list) is True
         assert isinstance(base_json_conv(set([1])), list) is True
         assert isinstance(base_json_conv(Decimal("1.0")), float) is True
         assert isinstance(base_json_conv(uuid.uuid4()), str) is True