black and minor fixes

Author: Jammy2211

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       id: cache-pip
       with:
         path: ~/.cache/pip
@@ -36,9 +36,9 @@ jobs:
         pip3 install setuptools
         pip3 install wheel
         pip3 install pytest coverage pytest-cov
-        pip3 install -r PyAutoConf/requirements.txt
-        pip3 install -r PyAutoArray/requirements.txt
-        pip3 install -r PyAutoArray/optional_requirements.txt
+        pip install ./PyAutoConf
+        pip install ./PyAutoArray
+        pip install ./PyAutoArray[optional]
 
         cd PyAutoArray/autoarray/util/nn/src/nn
         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/runner/work/PyAutoArray/PyAutoArray/PyAutoArray/autoarray/util/nn/src/nn

autoarray/fixtures.py

@@ -67,6 +67,7 @@ def make_array_1d_7():
 def make_array_2d_7x7():
     return aa.Array2D.ones(shape_native=(7, 7), pixel_scales=(1.0, 1.0))
 
+
 def make_array_2d_rgb_7x7():
     return aa.Array2DRGB(values=np.ones((7, 7, 3)), mask=make_mask_2d_7x7())
 

autoarray/inversion/inversion/abstract.py

@@ -446,7 +446,6 @@ def mapper_zero_pixel_list(self) -> np.ndarray:
                 )
         return mapper_zero_pixel_list
 
-
     @cached_property
     @profile_func
     def reconstruction(self) -> np.ndarray:

autoarray/inversion/pixelization/mappers/abstract.py

@@ -397,6 +397,9 @@ def extent_from(
         zoom_to_brightest: bool = True,
         zoom_percent: Optional[float] = None,
     ) -> Tuple[float, float, float, float]:
+
+        from autoarray.geometry import geometry_util
+
         if zoom_to_brightest and values is not None:
             if zoom_percent is None:
                 zoom_percent = conf.instance["visualize"]["general"]["zoom"][
@@ -408,8 +411,6 @@ def extent_from(
             true_indices = np.argwhere(fractional_bool)
             true_grid = self.source_plane_mesh_grid[true_indices]
 
-            from autoarray.geometry import geometry_util
-
             try:
                 return geometry_util.extent_symmetric_from(
                     extent=(
@@ -420,9 +421,13 @@ def extent_from(
                     )
                 )
             except ValueError:
-                return self.source_plane_mesh_grid.geometry.extent
+                return geometry_util.extent_symmetric_from(
+                    extent=self.source_plane_mesh_grid.geometry.extent
+                )
 
-        return self.source_plane_mesh_grid.geometry.extent
+        return geometry_util.extent_symmetric_from(
+            extent=self.source_plane_mesh_grid.geometry.extent
+        )
 
     def interpolated_array_from(
         self,

autoarray/mask/derive/zoom_2d.py

@@ -302,7 +302,9 @@ def array_2d_rgb_from(self, array: Array2DRGB, buffer: int = 1) -> Array2DRGB:
             )
 
             if i == 0:
-                array_2d_rgb = np.zeros((extracted_array_2d.shape[0], extracted_array_2d.shape[1], 3))
+                array_2d_rgb = np.zeros(
+                    (extracted_array_2d.shape[0], extracted_array_2d.shape[1], 3)
+                )
 
             array_2d_rgb[:, :, i] = extracted_array_2d
 
@@ -320,4 +322,4 @@ def array_2d_rgb_from(self, array: Array2DRGB, buffer: int = 1) -> Array2DRGB:
             origin=array.mask.mask_centre,
         )
 
-        return Array2DRGB(values=array_2d_rgb.astype("int"), mask=mask)
+        return Array2DRGB(values=array_2d_rgb.astype("int"), mask=mask)

autoarray/plot/mat_plot/two_d.py

@@ -257,9 +257,7 @@ def plot_array(
                 "a pixel scales attribute."
             )
 
-        if conf.instance["visualize"]["general"]["general"][
-            "zoom_around_mask"
-        ]:
+        if conf.instance["visualize"]["general"]["general"]["zoom_around_mask"]:
 
             zoom = Zoom2D(mask=array.mask)
 
@@ -303,7 +301,6 @@ def plot_array(
                 origin=origin,
             )
 
-
         if visuals_2d.array_overlay is not None:
             self.array_overlay.overlay_array(
                 array=visuals_2d.array_overlay, figure=self.figure

autoarray/plot/wrap/base/units.py

@@ -15,7 +15,7 @@ def __init__(
         ticks_label: Optional[str] = None,
         colorbar_convert_factor: Optional[float] = None,
         colorbar_label: Optional[str] = None,
-        **kwargs
+        **kwargs,
     ):
         """
         This object controls the units of a plotted figure, and performs multiple tasks when making the plot:

autoarray/plot/wrap/one_d/yx_plot.py

@@ -72,7 +72,7 @@ def plot_y_vs_x(
                 #     marker="o",
                 fmt="o",
                 # ls=ls_errorbar,
-                **self.config_dict
+                **self.config_dict,
             )
             if plot_axis_type == "errorbar_logy":
                 plt.yscale("log")

autoarray/plot/wrap/two_d/array_overlay.py

@@ -23,4 +23,4 @@ def overlay_array(self, array, figure):
         array_zoom = zoom.array_2d_from(array=array, buffer=0)
         extent = array_zoom.geometry.extent
 
-        plt.imshow(X=array.native, aspect=aspect, extent=extent, **self.config_dict)
+        plt.imshow(X=array.native, aspect=aspect, extent=extent, **self.config_dict)

autoarray/plot/wrap/two_d/delaunay_drawer.py

@@ -112,5 +112,5 @@ def draw_delaunay_pixels(
             cmap=cmap,
             vmin=vmin,
             vmax=vmax,
-            **self.config_dict
+            **self.config_dict,
         )