From 7766dd875638f9b077ebd8c33a3575929c899a19 Mon Sep 17 00:00:00 2001
From: Aymeric Galan <aymeric.galan@gmail.com>
Date: Fri, 15 Nov 2024 18:55:42 +0100
Subject: [PATCH 1/3] Add imports in __init__.py to simplify access to common
 classes and functions

---
 herculens/__init__.py | 49 ++++++++++++++++++++++++++++++-------------
 setup.py              |  2 +-
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/herculens/__init__.py b/herculens/__init__.py
index 116f244..3545440 100644
--- a/herculens/__init__.py
+++ b/herculens/__init__.py
@@ -1,19 +1,38 @@
-"""
+from .info import version_info, __version__, __author__, __license__
 
-This file initializes the coolest module
-and provides some basic information about the package.
+from .Coordinates.pixel_grid import PixelGrid
+from .Instrument.psf import PSF
+from .Instrument.noise import Noise
 
-"""
+from .LightModel.light_model import LightModel
+from .LightModel.Profiles.gaussian import Gaussian
+from .LightModel.Profiles.multipole import Multipole
+from .LightModel.Profiles.sersic import Sersic, SersicElliptic  # NOTE: the Sersic class will be suppressed in the future
+from .LightModel.Profiles.shapelets import Shapelets
+from .LightModel.Profiles.uniform import Uniform
+from .LightModel.Profiles.pixelated import Pixelated
 
-# Set the package release version
-version_info = (0, 1, 0)
-__version__ = '.'.join(str(c) for c in version_info)
+from .MassModel.mass_model import MassModel
+from .MassModel.Profiles.sis import SIS  # NOTE: this will be suppressed in the future
+from .MassModel.Profiles.sie import SIE
+from .MassModel.Profiles.nie import NIE
+from .MassModel.Profiles.epl import EPL
+from .MassModel.Profiles.shear import ShearGammaPsi
+from .MassModel.Profiles.gaussian_potential import Gaussian
+from .MassModel.Profiles.point_mass import PointMass
+from .MassModel.Profiles.multipole import Multipole
+from .MassModel.Profiles.pixelated import (
+    PixelatedPotential, PixelatedPotentialDirac, PixelatedFixed
+)
 
-# Set the package details
-__author__ = 'Aymeric Galan, Austin Peel, Giorgos Vernardos & Herculens contributors'
-__email__ = 'aymeric.galan@gmail.com'
-__year__ = '2021-2024'
-__credits__ = 'Herculens contributors, EPFL (see AUTHORS.md)'
-__url__ = 'https://github.com/Herculens/herculens'
-__description__ = 'Auto-differentiable strong lens modelling'
-__license__ = 'MIT'
+from .PointSourceModel.point_source_model import PointSourceModel
+
+from .LensImage.lens_image import LensImage, LensImage3D
+from .Inference.loss import Loss
+from .Inference.ProbModel.numpyro import NumpyroModel
+from .Inference.Optimization.jaxopt import JaxoptOptimizer
+from .Analysis.plot import Plotter
+
+from .Util import param_util as prmu
+from .Util import plot_util as pltu
+from .Util import jifty_util as jftu
diff --git a/setup.py b/setup.py
index 9e57cc8..3f8dce6 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 release_info = {}
 infopath = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                           name, '__init__.py'))
+                           name, 'info.py'))
 with open(infopath) as open_file:
     exec(open_file.read(), release_info)
 

From 78a8b858cc40f995c710809b37d7602f933dd2d8 Mon Sep 17 00:00:00 2001
From: Aymeric Galan <aymeric.galan@gmail.com>
Date: Fri, 15 Nov 2024 18:57:11 +0100
Subject: [PATCH 2/3] Push missing file

---
 herculens/info.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 herculens/info.py

diff --git a/herculens/info.py b/herculens/info.py
new file mode 100644
index 0000000..116f244
--- /dev/null
+++ b/herculens/info.py
@@ -0,0 +1,19 @@
+"""
+
+This file initializes the coolest module
+and provides some basic information about the package.
+
+"""
+
+# Set the package release version
+version_info = (0, 1, 0)
+__version__ = '.'.join(str(c) for c in version_info)
+
+# Set the package details
+__author__ = 'Aymeric Galan, Austin Peel, Giorgos Vernardos & Herculens contributors'
+__email__ = 'aymeric.galan@gmail.com'
+__year__ = '2021-2024'
+__credits__ = 'Herculens contributors, EPFL (see AUTHORS.md)'
+__url__ = 'https://github.com/Herculens/herculens'
+__description__ = 'Auto-differentiable strong lens modelling'
+__license__ = 'MIT'

From 7c9edab4549da4431bed6548cf5d21e43d80f929 Mon Sep 17 00:00:00 2001
From: Aymeric Galan <aymeric.galan@gmail.com>
Date: Fri, 15 Nov 2024 19:06:52 +0100
Subject: [PATCH 3/3] Remove imports that require non-standard package

---
 herculens/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/herculens/__init__.py b/herculens/__init__.py
index 3545440..e84faed 100644
--- a/herculens/__init__.py
+++ b/herculens/__init__.py
@@ -35,4 +35,4 @@
 
 from .Util import param_util as prmu
 from .Util import plot_util as pltu
-from .Util import jifty_util as jftu
+# from .Util import jifty_util as jftu