return ndarray if lazy_load=False

asdf/_core/_converters/ndarray.py

@@ -143,6 +143,8 @@
         if isinstance(node, list):
             instance = NDArrayType(node, None, None, None, None, None, None)
             ctx._blocks._set_array_storage(instance, "inline")
+            if not ctx._blocks._lazy_load:
+                return instance._make_array()
             return instance
 
         if isinstance(node, dict):
@@ -185,7 +187,7 @@
                 ctx._blocks._set_array_storage(instance, "inline")
 
             if not ctx._blocks._lazy_load:
-                instance._make_array()
+                return instance._make_array()
             return instance
 
         msg = "Invalid ndarray description."

asdf/_tests/tags/core/tests/test_ndarray.py

@@ -1105,3 +1105,19 @@ def test_shape_does_not_load_array(tmp_path):
         assert af["arr"]._array is None
         assert af["arr"].shape == (100,)
         assert af["arr"]._array is None
+
+
+@pytest.mark.parametrize(
+    "lazy_load, array_class",
+    (
+        (True, ndarray.NDArrayType),
+        (False, np.ndarray),
+    ),
+)
+@pytest.mark.parametrize("lazy_tree", [True, False])
+def test_lazy_load_array_class(tmp_path, lazy_load, lazy_tree, array_class):
+    file_path = tmp_path / "test.asdf"
+    asdf.AsdfFile({"arr": np.arange(100)}).write_to(file_path)
+
+    with asdf.open(file_path, lazy_load=lazy_load, lazy_tree=lazy_tree) as af:
+        assert type(af["arr"]) is array_class

changes/1929.bugfix.rst

@@ -0,0 +1 @@
+When ``lazy_load=False`` use ``ndarray`` instances for arrays (instead of ``NDArrayType``).