Skip to content

Commit 309be22

Browse files
claudeclaude
committed
fix: name adapt_images when an adaptive mesh has no image-plane grid (#332)
Omitting adapt_images with Delaunay / KNearestNeighbor / KNNBarycentric used to surface as: AttributeError: 'NoneType' object has no attribute 'array' autoarray/inversion/mesh/border_relocator.py, relocated_mesh_grid_from naming nothing the caller controls, in a file they have never opened. It now raises MeshException at the point the precondition is known to be unmet, naming adapt_images, showing the AdaptImages idiom, and noting that the rectangular family needs no adapt_images at all. The guard sits at Delaunay.interpolator_from, the entry point the whole adaptive family inherits, so one check covers all three meshes. Chose fail-fast over having the mesh wire the grid up itself (the reporter's own suggestion). Building an image-plane mesh grid requires a weighting policy — which is exactly what adapt_images carries — so inventing one here would silently make a science choice on the user's behalf. This matches how phase 1 handled the rectangular/split combination: an explicit "you must supply X" rather than implementing a missing capability. THE MESHES ARE NOT BROKEN. The issue headline says Delaunay and KNNBarycentric are "unusable in FitImaging"; that is false and the reply on #332 already corrects it. Verified again here: with adapt_images supplied, Delaunay+Constant, KNNBarycentric+Constant and Delaunay+ConstantSplit all fit, and RectangularUniform+Constant fits with no adapt_images at all. The tests assert the CLEAR FAILURE plus those controls — asserting bare construction succeeds would have enshrined the misreading. One correction to the recorded diagnosis: the None is `mesh_grid` (border_relocator.py:450), not `grid` (line 446) as the prompt stated. Part 2 of #332 (ConstantSplit on RectangularUniform) shipped in phase 1 and is untouched. Tests: 10 new cases in test_autoarray/inversion/pixelization/mesh/test_adapt_images_precondition.py. Suite 991 passed; the 3 pynufft failures in test_transformer.py are pre-existing on main and tracked separately. Closes #332. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013PgqSCLTemK5bApVAwhVM4
1 parent f2f7a4f commit 309be22

3 files changed

Lines changed: 198 additions & 0 deletions

File tree

‎autoarray/inversion/mesh/mesh/abstract.py‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import numpy as np
22
from typing import Optional
33

4+
from autoarray import exc
45
from autoarray.settings import Settings
56
from autoarray.inversion.mesh.border_relocator import BorderRelocator
67
from autoarray.inversion.regularization.abstract import AbstractRegularization
@@ -63,6 +64,50 @@ def relocated_grid_from(
6364
xp=xp,
6465
)
6566

67+
def _validate_source_plane_mesh_grid(self, source_plane_mesh_grid):
68+
"""
69+
Raise if the mesh was given no source-plane mesh grid.
70+
71+
The adaptive meshes (``Delaunay``, ``KNearestNeighbor``, ``KNNBarycentric``) do
72+
not compute their own image-plane mesh grid — it is a required input, supplied
73+
in PyAutoGalaxy / PyAutoLens through ``adapt_images``. Omitting it leaves this
74+
grid ``None`` and the failure previously landed several frames deeper as
75+
``AttributeError: 'NoneType' object has no attribute 'array'`` inside
76+
``border_relocator.py``, naming nothing the caller controls and no file the
77+
caller has opened.
78+
79+
This raises at the point the precondition is known to be unmet, and names
80+
``adapt_images`` so the message points at the thing the caller actually passes.
81+
82+
Fail-fast is deliberate rather than having the mesh wire the grid up itself:
83+
constructing an image-plane mesh grid requires a weighting policy (which is
84+
exactly what ``adapt_images`` carries), so inventing one here would silently
85+
pick a science choice on the user's behalf. This matches how the
86+
rectangular-mesh / split-regularization combination was handled — an explicit
87+
"you must supply X" exception rather than implementing a missing capability.
88+
89+
Parameters
90+
----------
91+
source_plane_mesh_grid
92+
The source-plane mesh grid to check.
93+
"""
94+
if source_plane_mesh_grid is None:
95+
raise exc.MeshException(
96+
f"The mesh `{type(self).__name__}` was not given an image-plane mesh "
97+
f"grid, so its source-plane mesh grid is None and the pixelization "
98+
f"cannot be built.\n\n"
99+
f"This mesh does not compute that grid itself — it is a required "
100+
f"input, supplied via `adapt_images`:\n\n"
101+
f" adapt_images = al.AdaptImages(\n"
102+
f" galaxy_image_plane_mesh_grid_dict={{source: image_plane_mesh_grid}}\n"
103+
f" )\n"
104+
f" fit = al.FitImaging(dataset=dataset, tracer=tracer, adapt_images=adapt_images)\n\n"
105+
f"See the `pixelization` feature scripts in the workspace (e.g. "
106+
f"`imaging/features/pixelization/delaunay.py`) for the full idiom. A "
107+
f"mesh in the rectangular family (e.g. `RectangularUniform`) builds "
108+
f"its own grid and needs no `adapt_images`."
109+
)
110+
66111
def relocated_mesh_grid_from(
67112
self,
68113
border_relocator: Optional[BorderRelocator],

‎autoarray/inversion/mesh/mesh/delaunay.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,14 @@ def interpolator_from(
176176
adapt_data
177177
Not used for a rectangular mesh.
178178
"""
179+
# Adaptive meshes require an image-plane mesh grid (supplied via `adapt_images`)
180+
# and do not compute one themselves. Checked here, at the entry point the whole
181+
# adaptive family shares, so a missing precondition names `adapt_images` rather
182+
# than surfacing as an AttributeError on None several frames deeper.
183+
self._validate_source_plane_mesh_grid(
184+
source_plane_mesh_grid=source_plane_mesh_grid
185+
)
186+
179187
relocated_grid = self.relocated_grid_from(
180188
border_relocator=border_relocator,
181189
source_plane_data_grid=source_plane_data_grid,

‎test_autoarray/inversion/pixelization/mesh/test_adapt_images_precondition.py‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
"""
2+
Regression tests for PyAutoArray#332 — the missing-`adapt_images` precondition.
3+
4+
__What this issue actually is__
5+
6+
The issue's headline says `Delaunay` and `KNNBarycentric` are "unusable in
7+
`FitImaging`". That is **false**, and the public reply on #332 corrects it while
8+
crediting the underlying finding. Both meshes work correctly; they *require* an
9+
image-plane mesh grid, supplied via `adapt_images`.
10+
11+
So the defect is the **error**, not the mesh. Omitting `adapt_images` used to surface
12+
as:
13+
14+
AttributeError: 'NoneType' object has no attribute 'array'
15+
autoarray/inversion/mesh/border_relocator.py, in relocated_mesh_grid_from
16+
17+
— naming nothing the caller controls, in a file they have never opened.
18+
19+
**These tests therefore assert a CLEAR FAILURE, not a successful fit.** Asserting that
20+
bare construction succeeds would enshrine the reporter's misreading; that trap is
21+
recorded in the prompt for this task and is deliberately avoided here.
22+
23+
The `adapt_images` branch is exercised at the integration level (a real `FitImaging`
24+
with an `AdaptImages` still fits, for `Delaunay` + `Constant`, `KNNBarycentric` +
25+
`Constant` and `Delaunay` + `ConstantSplit`); these unit tests cover the guard itself
26+
and its controls at the mesh boundary.
27+
"""
28+
29+
import numpy as np
30+
import pytest
31+
32+
import autoarray as aa
33+
from autoarray import exc
34+
35+
36+
@pytest.fixture(name="source_plane_data_grid")
37+
def make_source_plane_data_grid():
38+
return aa.Grid2D.uniform(shape_native=(5, 5), pixel_scales=1.0)
39+
40+
41+
@pytest.fixture(name="source_plane_mesh_grid")
42+
def make_source_plane_mesh_grid():
43+
return aa.Grid2DIrregular(
44+
values=[[0.1, 0.1], [1.1, 0.6], [2.1, 0.1], [0.4, 1.1], [1.1, 2.1], [2.1, 1.1]]
45+
)
46+
47+
48+
# ======================================================================================
49+
# The guard — a missing image-plane mesh grid fails legibly
50+
# ======================================================================================
51+
52+
53+
@pytest.mark.parametrize(
54+
"mesh_cls", [aa.mesh.Delaunay, aa.mesh.KNearestNeighbor, aa.mesh.KNNBarycentric]
55+
)
56+
def test__adaptive_meshes_raise_when_no_source_plane_mesh_grid_is_given(
57+
mesh_cls, source_plane_data_grid
58+
):
59+
with pytest.raises(exc.MeshException):
60+
mesh_cls(pixels=6).interpolator_from(
61+
source_plane_data_grid=source_plane_data_grid,
62+
source_plane_mesh_grid=None,
63+
)
64+
65+
66+
def test__the_message_names_adapt_images_and_the_mesh__not_just_the_exception_type(
67+
source_plane_data_grid,
68+
):
69+
"""
70+
Asserting on the message is the point of this issue — the old failure raised too,
71+
it just said nothing useful. `adapt_images` is the thing the caller actually passes.
72+
"""
73+
with pytest.raises(exc.MeshException) as error:
74+
aa.mesh.Delaunay(pixels=6).interpolator_from(
75+
source_plane_data_grid=source_plane_data_grid,
76+
source_plane_mesh_grid=None,
77+
)
78+
79+
message = str(error.value)
80+
81+
assert "adapt_images" in message
82+
assert "Delaunay" in message
83+
84+
85+
def test__the_message_points_at_the_workspace_idiom_and_the_rectangular_alternative(
86+
source_plane_data_grid,
87+
):
88+
with pytest.raises(exc.MeshException) as error:
89+
aa.mesh.KNNBarycentric(pixels=6).interpolator_from(
90+
source_plane_data_grid=source_plane_data_grid,
91+
source_plane_mesh_grid=None,
92+
)
93+
94+
message = str(error.value)
95+
96+
assert "galaxy_image_plane_mesh_grid_dict" in message
97+
assert "RectangularUniform" in message
98+
99+
100+
def test__the_failure_is_no_longer_an_attribute_error_on_none(source_plane_data_grid):
101+
"""The original symptom: AttributeError deep inside border_relocator.py."""
102+
with pytest.raises(exc.MeshException):
103+
aa.mesh.Delaunay(pixels=6).interpolator_from(
104+
source_plane_data_grid=source_plane_data_grid,
105+
source_plane_mesh_grid=None,
106+
)
107+
108+
109+
# ======================================================================================
110+
# Controls — the meshes are NOT broken, which is the correction to the headline
111+
# ======================================================================================
112+
113+
114+
@pytest.mark.parametrize(
115+
"mesh_cls", [aa.mesh.Delaunay, aa.mesh.KNearestNeighbor, aa.mesh.KNNBarycentric]
116+
)
117+
def test__control__an_adaptive_mesh_with_a_mesh_grid_still_builds_its_interpolator(
118+
mesh_cls, source_plane_data_grid, source_plane_mesh_grid
119+
):
120+
"""
121+
The headline correction, pinned: supplied with the grid `adapt_images` carries,
122+
these meshes work. If this ever fails, the mesh really is broken and the reply
123+
posted on #332 needs revisiting.
124+
"""
125+
interpolator = mesh_cls(pixels=6).interpolator_from(
126+
source_plane_data_grid=source_plane_data_grid,
127+
source_plane_mesh_grid=source_plane_mesh_grid,
128+
)
129+
130+
assert interpolator is not None
131+
132+
133+
def test__control__the_rectangular_family_needs_no_image_plane_mesh_grid(
134+
source_plane_data_grid,
135+
):
136+
"""
137+
`RectangularUniform` computes its own grid, so the guard must not fire for it —
138+
otherwise the fix would break the one mesh the issue never complained about.
139+
"""
140+
interpolator = aa.mesh.RectangularUniform(shape=(3, 3)).interpolator_from(
141+
source_plane_data_grid=source_plane_data_grid,
142+
source_plane_mesh_grid=None,
143+
)
144+
145+
assert interpolator is not None

0 commit comments

Comments
 (0)