fix some unit tests

Author: Jammy2211

autoarray/mask/derive/grid_2d.py

@@ -112,7 +112,7 @@ def all_false(self) -> Grid2D:
             origin=self.mask.origin,
         )
 
-        return Grid2D(values=grid_slim, mask=self.mask.derive_mask.all_false)
+        return Grid2D(values=np.array(grid_slim), mask=self.mask.derive_mask.all_false)
 
     @property
     def unmasked(self) -> Grid2D:
@@ -158,12 +158,12 @@ def unmasked(self) -> Grid2D:
         """
         from autoarray.structures.grids.uniform_2d import Grid2D
 
-        grid_1d = grid_2d_util.grid_2d_slim_via_mask_from(
-            mask_2d=np.array(self.mask),
+        grid_2d = grid_2d_util.grid_2d_slim_via_mask_from(
+            mask_2d=self.mask,
             pixel_scales=self.mask.pixel_scales,
             origin=self.mask.origin,
         )
-        return Grid2D(values=grid_1d, mask=self.mask)
+        return Grid2D(values=np.array(grid_2d), mask=self.mask)
 
     @property
     def edge(self) -> Grid2D:

autoarray/operators/over_sampling/over_sample_util.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 import numpy as np
-from typing import TYPE_CHECKING, Union, List, Tuple
+from typing import TYPE_CHECKING, Union
 from typing import List, Tuple
 
 from autoarray.structures.arrays.uniform_2d import Array2D
@@ -12,7 +12,6 @@
 from autoarray.mask.mask_2d import Mask2D
 
 from autoarray import numba_util
-from autoarray.mask import mask_2d_util
 
 from autoarray import type as ty
 
@@ -601,7 +600,7 @@ def over_sample_size_via_radial_bins_from(
         radial_grid = grid.distances_to_coordinate_from(coordinate=centre)
 
         sub_size_of_centre = sub_size_radial_bins_from(
-            radial_grid=np.array(radial_grid),
+            radial_grid=np.array(radial_grid.array),
             sub_size_list=np.array(sub_size_list),
             radial_list=np.array(radial_list),
         )

autoarray/structures/arrays/uniform_1d.py

@@ -88,7 +88,7 @@ def no_mask(
             origin=origin,
         )
 
-        return Array1D(values=values, mask=mask, header=header)
+        return Array1D(values=np.array(values), mask=mask, header=header)
 
     @classmethod
     def full(

autoarray/structures/arrays/uniform_2d.py

@@ -692,7 +692,7 @@ def no_mask(
             origin=origin,
         )
 
-        return Array2D(values=values, mask=mask, header=header)
+        return Array2D(values=np.array(values), mask=mask, header=header)
 
     @classmethod
     def full(

autoarray/structures/grids/uniform_1d.py

@@ -179,7 +179,7 @@ def no_mask(
             origin=origin,
         )
 
-        return Grid1D(values=values, mask=mask)
+        return Grid1D(values=np.array(values), mask=mask)
 
     @classmethod
     def from_mask(cls, mask: Mask1D) -> "Grid1D":
@@ -196,12 +196,12 @@ def from_mask(cls, mask: Mask1D) -> "Grid1D":
         """
 
         grid_1d = grid_1d_util.grid_1d_slim_via_mask_from(
-            mask_1d=np.array(mask),
+            mask_1d=mask.array,
             pixel_scales=mask.pixel_scales,
             origin=mask.origin,
         )
 
-        return Grid1D(values=grid_1d, mask=mask)
+        return Grid1D(values=np.array(grid_1d), mask=mask)
 
     @classmethod
     def uniform(

autoarray/structures/grids/uniform_2d.py

@@ -247,7 +247,7 @@ def no_mask(
         )
 
         return Grid2D(
-            values=values,
+            values=np.array(values),
             mask=mask,
             over_sample_size=over_sample_size,
         )
@@ -548,7 +548,7 @@ def from_mask(
         """
 
         grid_2d = grid_2d_util.grid_2d_slim_via_mask_from(
-            mask_2d=mask,
+            mask_2d=mask.array,
             pixel_scales=mask.pixel_scales,
             origin=mask.origin,
         )

autoarray/structures/vectors/irregular.py

@@ -44,6 +44,9 @@ def __init__(
         grid
             The irregular grid of (y,x) coordinates where each vector is located.
         """
+        if type(values) is list:
+            values = np.asarray(values)
+
         self.grid = Grid2DIrregular(values=grid)
 
         super().__init__(values)