Remove plot_utils.py wrappers; use autoarray plot_array/plot_grid directly

- Strip plot_utils.py down to autolens-specific utilities only:
  _to_lines, _to_positions, _save_subplot, _critical_curves_from,
  _caustics_from.
- Remove _zoom_array, _auto_mask_edge, _numpy_lines, _numpy_positions,
  _prepare_array — these are now handled inside autoarray's plot_array/
  plot_grid directly (Array2D/Grid2D objects accepted natively).
- Remove plot_array and plot_grid adapter functions from plot_utils.py.
- All callers now import plot_array from autoarray.plot.plots.array and
  plot_grid from autoarray.plot.plots.grid.
- plot/__init__.py re-exports plot_array/plot_grid from autoarray.
- fit_imaging_plots.py uses _zoom_array_2d from autoarray for
  _symmetric_vmax computation.

https://claude.ai/code/session_01CzJBy8KvFXiNchoNdk5i9k

Author: claude

autolens/analysis/plotter_interface.py

@@ -14,7 +14,7 @@
 
 from autolens.lens.tracer import Tracer
 from autolens.lens.plot.tracer_plots import subplot_galaxies_images
-from autolens.plot.plot_utils import plot_array
+from autoarray.plot.plots.array import plot_array
 
 
 class PlotterInterface(AgPlotterInterface):

autolens/imaging/plot/fit_imaging_plots.py

@@ -5,13 +5,12 @@
 import autoarray as aa
 import autogalaxy as ag
 
+from autoarray.plot.plots.array import plot_array, _zoom_array_2d
 from autolens.plot.plot_utils import (
-    plot_array,
     _to_lines,
     _save_subplot,
     _critical_curves_from,
     _caustics_from,
-    _zoom_array,
 )
 
 
@@ -508,7 +507,7 @@ def subplot_fit_combined_log10(
 def _symmetric_vmax(array) -> float:
     """Return abs-max finite value for symmetric colormap scaling."""
     try:
-        vals = _zoom_array(array).native.array
+        vals = _zoom_array_2d(array).native.array
     except AttributeError:
         vals = np.asarray(array)
     finite = vals[np.isfinite(vals)]

autolens/interferometer/plot/fit_interferometer_plots.py

@@ -5,8 +5,8 @@
 import autoarray as aa
 import autogalaxy as ag
 
+from autoarray.plot.plots.array import plot_array
 from autolens.plot.plot_utils import (
-    plot_array,
     _to_lines,
     _save_subplot,
     _critical_curves_from,

autolens/lens/plot/sensitivity_plots.py

@@ -5,7 +5,8 @@
 
 import autoarray as aa
 
-from autolens.plot.plot_utils import plot_array, _save_subplot
+from autoarray.plot.plots.array import plot_array
+from autolens.plot.plot_utils import _save_subplot
 
 
 def subplot_tracer_images(

autolens/lens/plot/subhalo_plots.py

@@ -2,7 +2,8 @@
 import matplotlib.pyplot as plt
 from typing import Optional
 
-from autolens.plot.plot_utils import plot_array, _save_subplot
+from autoarray.plot.plots.array import plot_array
+from autolens.plot.plot_utils import _save_subplot
 from autolens.imaging.plot.fit_imaging_plots import _plot_source_plane
 
 

autolens/lens/plot/tracer_plots.py

@@ -5,8 +5,8 @@
 import autoarray as aa
 import autogalaxy as ag
 
+from autoarray.plot.plots.array import plot_array
 from autolens.plot.plot_utils import (
-    plot_array,
     _to_lines,
     _to_positions,
     _save_subplot,

autolens/plot/__init__.py

@@ -23,7 +23,8 @@
 # ---------------------------------------------------------------------------
 # Standalone plot helpers
 # ---------------------------------------------------------------------------
-from autolens.plot.plot_utils import plot_array, plot_grid
+from autoarray.plot.plots.array import plot_array
+from autoarray.plot.plots.grid import plot_grid
 
 # ---------------------------------------------------------------------------
 # subplot_* public API

autolens/plot/plot_utils.py

@@ -1,149 +1,6 @@
 import os
 import numpy as np
 import matplotlib.pyplot as plt
-from typing import List, Optional
-
-
-def _zoom_array(array):
-    """Apply zoom_around_mask from config if requested."""
-    try:
-        from autoconf import conf
-        zoom_around_mask = conf.instance["visualize"]["general"]["general"]["zoom_around_mask"]
-    except Exception:
-        zoom_around_mask = False
-
-    if zoom_around_mask and hasattr(array, "mask") and not array.mask.is_all_false:
-        try:
-            from autoarray.mask.derive.zoom_2d import Zoom2D
-            return Zoom2D(mask=array.mask).array_2d_from(array=array, buffer=1)
-        except Exception:
-            pass
-    return array
-
-
-def _auto_mask_edge(array) -> Optional[np.ndarray]:
-    """Return edge-pixel (y, x) coords from array.mask, or None."""
-    try:
-        if not array.mask.is_all_false:
-            return np.array(array.mask.derive_grid.edge.array)
-    except AttributeError:
-        pass
-    return None
-
-
-def _numpy_lines(lines) -> Optional[List[np.ndarray]]:
-    """Convert lines (Grid2DIrregular or list) to list of (N,2) numpy arrays."""
-    if lines is None:
-        return None
-    result = []
-    try:
-        for line in lines:
-            try:
-                arr = np.array(line.array if hasattr(line, "array") else line)
-                if arr.ndim == 2 and arr.shape[1] == 2:
-                    result.append(arr)
-            except Exception:
-                pass
-    except TypeError:
-        pass
-    return result or None
-
-
-def _numpy_positions(positions) -> Optional[List[np.ndarray]]:
-    """Convert positions to list of (N,2) numpy arrays."""
-    if positions is None:
-        return None
-    try:
-        arr = np.array(positions.array if hasattr(positions, "array") else positions)
-        if arr.ndim == 2 and arr.shape[1] == 2:
-            return [arr]
-    except Exception:
-        pass
-    if isinstance(positions, list):
-        result = []
-        for p in positions:
-            try:
-                result.append(np.array(p.array if hasattr(p, "array") else p))
-            except Exception:
-                pass
-        return result or None
-    return None
-
-
-def _prepare_array(array):
-    """Zoom and extract (arr_2d, extent, mask) from an Array2D-like object.
-
-    Returns a plain (N, M) numpy array suitable for passing to
-    ``autoarray.plot.plots.array.plot_array``, along with the spatial *extent*
-    and edge-pixel *mask* overlays.
-    """
-    array = _zoom_array(array)
-    try:
-        arr = array.native.array
-        extent = array.geometry.extent
-    except AttributeError:
-        arr = np.asarray(array)
-        extent = None
-    mask = _auto_mask_edge(array) if hasattr(array, "mask") else None
-    return arr, extent, mask
-
-
-def plot_array(
-    array,
-    ax=None,
-    title="",
-    lines=None,
-    positions=None,
-    colormap="jet",
-    use_log10=False,
-    vmin=None,
-    vmax=None,
-    output_path=None,
-    output_filename="array",
-    output_format="png",
-):
-    """Plot an Array2D (or numpy array) via autoarray's plot_array."""
-    from autoarray.plot.plots.array import plot_array as _aa_plot_array
-
-    arr, extent, mask = _prepare_array(array)
-    _aa_plot_array(
-        array=arr,
-        ax=ax,
-        extent=extent,
-        mask=mask,
-        positions=positions if isinstance(positions, list) else _numpy_positions(positions),
-        lines=lines if isinstance(lines, list) else _numpy_lines(lines),
-        title=title,
-        colormap=colormap,
-        use_log10=use_log10,
-        vmin=vmin,
-        vmax=vmax,
-        output_path=output_path if ax is None else None,
-        output_filename=output_filename,
-        output_format=output_format,
-        structure=array,
-    )
-
-
-def plot_grid(
-    grid,
-    ax=None,
-    title="",
-    output_path=None,
-    output_filename="grid",
-    output_format="png",
-):
-    """Plot a Grid2D via autoarray's plot_grid."""
-    from autoarray.plot.plots.grid import plot_grid as _aa_plot_grid
-
-    _aa_plot_grid(
-        grid=np.array(grid.array),
-        ax=ax,
-        title=title,
-        output_path=output_path if ax is None else None,
-        output_filename=output_filename,
-        output_format=output_format,
-    )
 
 
 def _to_lines(*items):
@@ -177,7 +34,6 @@ def _to_positions(*items):
 
 def _save_subplot(fig, output_path, filename, output_format="png"):
     """Save a subplot figure to disk (or show it when output_path is None)."""
-    # Normalise: format may be a list (e.g. ['png']) or a plain string.
     if isinstance(output_format, (list, tuple)):
         fmts = output_format
     else: