Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ point-source datasets.

Dependency direction: autolens sits at the top of the stack and may import all
four layers below it — **autogalaxy**, **autoarray**, **autofit**, and
**autoconf**. Nothing in the ecosystem imports autolens.
**autonerves**. Nothing in the ecosystem imports autolens.

## Related repos

Expand Down Expand Up @@ -51,7 +51,7 @@ is no black/ruff/flake8 gate — formatting is advisory. (`requires-python` in

## Configuration & defaults

autoconf supplies the packaged defaults under `autolens/config/`. Workspaces
autonerves supplies the packaged defaults under `autolens/config/`. Workspaces
override them via their own `config/` directory; the test suite pushes a local
config dir via `conf.instance.push(...)` in `test_autolens/conftest.py`. When a
change adds a new config key, mirror it into the packaged defaults so
Expand Down
40 changes: 20 additions & 20 deletions autolens/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from autoconf import jax_wrapper
from autoconf.dictable import from_dict, from_json, output_to_json, to_dict
from autonerves import jax_wrapper
from autonerves.dictable import from_dict, from_json, output_to_json, to_dict
from autoarray import preprocess

from autoarray.dataset.imaging.dataset import Imaging
Expand Down Expand Up @@ -135,18 +135,18 @@
from . import util
from . import potential_correction as pc

from autoconf import conf
from autoconf.fitsable import ndarray_via_hdu_from
from autoconf.fitsable import ndarray_via_fits_from
from autoconf.fitsable import header_obj_from
from autoconf.fitsable import output_to_fits
from autoconf.fitsable import hdu_list_for_output_from
from autonerves import conf
from autonerves.fitsable import ndarray_via_hdu_from
from autonerves.fitsable import ndarray_via_fits_from
from autonerves.fitsable import header_obj_from
from autonerves.fitsable import output_to_fits
from autonerves.fitsable import hdu_list_for_output_from

conf.instance.register(__file__)

__version__ = "2026.7.9.1"

from autoconf import check_version
from autonerves import check_version

check_version(__version__)

Expand All @@ -166,28 +166,28 @@ def __getattr__(name):
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

# ---------------------------------------------------------------------------
# Public re-export of the autoconf configuration / serialization surface.
# Public re-export of the autonerves configuration / serialization surface.
#
# Workspaces, tutorials and downstream code import these names from the science
# library (e.g. ``from autolens import conf``) rather than depending on the
# ``autoconf`` package directly, so the underlying configuration / serialization
# ``autonerves`` package directly, so the underlying configuration / serialization
# layer stays an implementation detail of the library.
# ---------------------------------------------------------------------------
from autoconf import conf
from autoconf import jax_wrapper
from autoconf import fitsable
from autoconf import setup_colab
from autoconf import setup_notebook
from autoconf.conf import with_config
from autoconf.dictable import from_dict, from_json, to_dict, output_to_json
from autoconf.fitsable import (
from autonerves import conf
from autonerves import jax_wrapper
from autonerves import fitsable
from autonerves import setup_colab
from autonerves import setup_notebook
from autonerves.conf import with_config
from autonerves.dictable import from_dict, from_json, to_dict, output_to_json
from autonerves.fitsable import (
output_to_fits,
hdu_list_for_output_from,
ndarray_via_fits_from,
ndarray_via_hdu_from,
header_obj_from,
)
from autoconf.test_mode import (
from autonerves.test_mode import (
with_test_mode_segment,
skip_visualization,
skip_fit_output,
Expand Down
6 changes: 3 additions & 3 deletions autolens/analysis/analysis/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import os
from typing import List, Optional

from autoconf import conf
from autoconf.dictable import output_to_json
from autonerves import conf
from autonerves.dictable import output_to_json

import autofit as af
import autoarray as aa
Expand All @@ -31,7 +31,7 @@
from autolens.analysis.positions import PositionsLH

from autolens import exc
from autoconf.test_mode import skip_checks
from autonerves.test_mode import skip_checks

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion autolens/analysis/latent.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import numpy as np

import autofit as af
from autoconf import conf
from autonerves import conf
from autogalaxy.imaging.model.latent import (
ab_mag_via_flux_from,
flux_mujy_via_ab_mag_from,
Expand Down
2 changes: 1 addition & 1 deletion autolens/analysis/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
)
from autolens.lens.tracer import Tracer
from autolens.point.solver import PointSolver
from autoconf.test_mode import is_test_mode, skip_checks
from autonerves.test_mode import is_test_mode, skip_checks

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion autolens/config/latent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# `false` and return NaN + one warning per process if enabled without
# `magzero` (rather than raising, which would discard a converged search).
#
# autoconf lowercases yaml keys at read time, so the registry/yaml names
# autonerves lowercases yaml keys at read time, so the registry/yaml names
# must be snake_case-lowercase (this leaks into the `latent.csv` column
# header — e.g. `total_lens_flux_mujy`, not `_muJy`).

Expand Down
2 changes: 1 addition & 1 deletion autolens/imaging/fit_imaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import numpy as np
from typing import Dict, List, Optional

from autoconf import cached_property
from autonerves import cached_property

import autoarray as aa
import autogalaxy as ag
Expand Down
2 changes: 1 addition & 1 deletion autolens/imaging/model/analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import autofit as af
import autogalaxy as ag

from autoconf.fitsable import hdu_list_for_output_from
from autonerves.fitsable import hdu_list_for_output_from

from autolens.analysis.analysis.dataset import AnalysisDataset
from autolens.analysis.latent import LatentLens
Expand Down
2 changes: 1 addition & 1 deletion autolens/interferometer/fit_interferometer.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import numpy as np
from typing import Dict, List, Optional

from autoconf import cached_property
from autonerves import cached_property

import autoarray as aa
import autogalaxy as ag
Expand Down
4 changes: 2 additions & 2 deletions autolens/interferometer/model/analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import numpy as np
from typing import Optional

from autoconf.dictable import to_dict
from autoconf.fitsable import hdu_list_for_output_from
from autonerves.dictable import to_dict
from autonerves.fitsable import hdu_list_for_output_from

import autofit as af
import autoarray as aa
Expand Down
2 changes: 1 addition & 1 deletion autolens/lens/los.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import autogalaxy as ag
from autogalaxy.cosmology import Planck15

from autoconf.test_mode import is_test_mode
from autonerves.test_mode import is_test_mode

# Number of LOS halos retained per plane when ``PYAUTO_TEST_MODE`` is active.
# Capping the population keeps the multi-plane ray-tracing and per-galaxy
Expand Down
8 changes: 4 additions & 4 deletions autolens/lens/plot/tracer_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def plane_image_from(
aa.Array2D
Plane image on the (possibly zoomed) grid.
"""
from autoconf import conf
from autonerves import conf

shape = grid.shape_native

Expand Down Expand Up @@ -389,7 +389,7 @@ def fits_tracer(
Directory in which to write ``tracer.fits``.
"""
from pathlib import Path
from autoconf.fitsable import hdu_list_for_output_from
from autonerves.fitsable import hdu_list_for_output_from

output_path = Path(output_path)
zoom = aa.Zoom2D(mask=grid.mask)
Expand Down Expand Up @@ -439,8 +439,8 @@ def fits_source_plane_images(
"""
import ast
from pathlib import Path
from autoconf import conf
from autoconf.fitsable import hdu_list_for_output_from
from autonerves import conf
from autonerves.fitsable import hdu_list_for_output_from

output_path = Path(output_path)
shape_native = tuple(ast.literal_eval(
Expand Down
2 changes: 1 addition & 1 deletion autolens/lens/to_inversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import numpy as np

from autoconf import cached_property
from autonerves import cached_property

import autoarray as aa
import autogalaxy as ag
Expand Down
4 changes: 2 additions & 2 deletions autolens/point/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@

Two I/O surfaces are supported:

- JSON (via :func:`autoconf.output_to_json` / :func:`autoconf.from_json`) — exact
- JSON (via :func:`autonerves.output_to_json` / :func:`autonerves.from_json`) — exact
round-trip, one file per ``PointDataset``; the canonical modeling input.
- CSV (via :meth:`PointDataset.to_csv` / :meth:`PointDataset.from_csv` and the
module-level :func:`output_to_csv` / :func:`list_from_csv`) — one row per observed
image, grouped by ``name``, so that tens or hundreds of cluster-scale point sources
can be edited in a single spreadsheet.
"""
from autoconf import csvable
from autonerves import csvable
from typing import List, Tuple, Optional, Union

import autoarray as aa
Expand Down
2 changes: 1 addition & 1 deletion docs/general/configs.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The configuration path can also be set manually in a script using the project **
command (the path to the `output` folder where the results of a non-linear search are stored is also set below):

```bash
from autoconf import conf
from autonerves import conf

conf.instance.push(
config_path="path/to/config",
Expand Down
4 changes: 2 additions & 2 deletions docs/installation/source.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ git clone https://github.com/PyAutoLabs/PyAutoLens
Next, install the **PyAuto** parent projects via pip:

```bash
pip install autoconf
pip install autonerves
pip install autofit
pip install autoarray
pip install autogalaxy
Expand Down Expand Up @@ -114,7 +114,7 @@ git clone https://github.com/PyAutoLabs/PyAutoLens
Next, install **PyAutoConf** via pip:

```bash
pip install autoconf
pip install autonerves
```

Next, install the source build dependencies of each project via pip:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ index 00000000..20f5f267
+
+ # --- colour normalisation --------------------------------------------------
+ if use_log10:
+ from autoconf import conf as _conf
+ from autonerves import conf as _conf
+
+ try:
+ log10_min = _conf.instance["visualize"]["general"]["general"][
Expand Down Expand Up @@ -649,7 +649,7 @@ index 00000000..4d1cc4f0
+ Either ``"figures"`` (single-panel) or ``"subplots"`` (multi-panel).
+ """
+ try:
+ from autoconf import conf
+ from autonerves import conf
+
+ return tuple(conf.instance["visualize"]["general"][context]["figsize"])
+ except Exception:
Expand Down
4 changes: 2 additions & 2 deletions test_autolens/analysis/analysis/test_analysis_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import os
import pytest

from autoconf import conf
from autoconf.dictable import from_json
from autonerves import conf
from autonerves.dictable import from_json

import autofit as af
import autolens as al
Expand Down
4 changes: 2 additions & 2 deletions test_autolens/analysis/test_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import os
import pytest

from autoconf import conf
from autoconf.dictable import from_json
from autonerves import conf
from autonerves.dictable import from_json

import autofit as af
import autolens as al
Expand Down
2 changes: 1 addition & 1 deletion test_autolens/analysis/test_positions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from pathlib import Path
import pytest

from autoconf.dictable import output_to_json, from_json, from_dict
from autonerves.dictable import output_to_json, from_json, from_dict
from autofit.tools.util import open_

import autolens as al
Expand Down
2 changes: 1 addition & 1 deletion test_autolens/lens/test_tracer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pytest
from pathlib import Path

from autoconf.dictable import from_json, output_to_json
from autonerves.dictable import from_json, output_to_json
import autofit as af
import autolens as al

Expand Down
2 changes: 1 addition & 1 deletion test_autolens/point/triangles/test_regressions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from autoconf.dictable import from_dict
from autonerves.dictable import from_dict
import autolens as al
from autolens.point.solver import PointSolver

Expand Down
2 changes: 1 addition & 1 deletion test_autolens/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pytest

from autoconf import conf
from autonerves import conf

directory = Path(__file__).resolve().parent

Expand Down
Loading