Merge pull request #25 from synthesizer-project/qdev

switching over to synference-download, cleaning up files

Author: tHarvey303

.github/workflows/docs.yml

@@ -44,15 +44,16 @@ jobs:
           sudo apt install pandoc
           pip install "cosmos-synthesizer@git+https://github.com/synthesizer-project/synthesizer.git"
           pip install .[test,docs]
-          pip install "dense_basis@git+https://github.com/kartheikiyer/dense_basis"
+          pip install "dense_basis@git+https://github.com/kartheikiyer/dense_basis.git"
           pip install "ltu_ili@git+https://github.com/maho3/ltu-ili.git"
+          pip install "cosmos-synthesizer@git+https://github.com/synthesizer-project/synthesizer.git#egg=synthesizer"
           pip install pytest-xdist  # enable parallel pytest execution
       - name: Download test data
         run: |
           # Download test grid data 
           mkdir -p data/libraries/
           synthesizer-download --test-grids --dust-grid
-          synference-download --test
+          python -c "from synference.utils import download_test_data; download_test_data()"
       - name: Sphinx Build
         run: |
           # Test sphinx build (runs all notebooks)

.github/workflows/python-app.yml

@@ -31,9 +31,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        WITH_OPENMP=1 pip install .
+        pip install .
         pip install ruff pytest
         pip install "ltu_ili@git+https://github.com/maho3/ltu-ili.git"
+        pip install "cosmos-synthesizer@git+https://github.com/synthesizer-project/synthesizer.git#egg=synthesizer"
+        python -c "from synference.utils import download_test_data; download_test_data()"
     
     - name: Test import
       run: |

docs/source/posterior_inference/intro.rst

@@ -4,6 +4,5 @@ Posterior Inference
 .. toctree::
    :maxdepth: 2
 
-   using_your_model
+   catalogue_fitting
    sed_recovery
-   catalogue_fitting

pyproject.toml

@@ -52,6 +52,7 @@ dependencies = [
     "lampe",
     "cosmos-synthesizer",
     "scikit-learn",
+    "tarp",
     "sbi>=0.22.0",
     "h5py",
     "optuna",
@@ -107,6 +108,10 @@ docs = [
 "Source" = "https://github.com/synthesizer-project/synference"
 "Documentation" = "https://synthesizer-project.github.io/synference/"
 
+# Entry points
+[project.scripts]
+synference-download-data="synference.utils:download_test_data"
+
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

src/synference/__init__.py

@@ -10,7 +10,7 @@
     timeout_handler, TimeoutException, create_sqlite_db, f_jy_err_to_asinh, create_database_universal,
     f_jy_to_asinh, check_scaling, detect_outliers, compare_methods_feature_importance,
     analyze_feature_contributions, optimize_sfh_xlimit, make_serializable, setup_mpi_named_logger, move_to_device,
-    asinh_err_to_f_jy
+    asinh_err_to_f_jy, download_test_data, test_data_dir
 )
 # Set up logging
 logger = setup_mpi_named_logger("synference", level=logging.INFO)
@@ -110,4 +110,6 @@
     "setup_mpi_named_logger",
     "move_to_device",
     "create_database_universal",
+    "download_test_data",
+    "test_data_dir",
 ]

src/synference/library.py

@@ -5352,7 +5352,7 @@ def from_library(
                 emission_model_name = em_group.attrs["name"]
                 import synthesizer.emission_models as em
                 import synthesizer.emission_models.attenuation as dm
-                import synthesizer.emission_models.dust.emission as dem
+                import synthesizer.emission_models.dust as dem
                 from synthesizer.emission_models.stellar.pacman_model import (
                     PacmanEmissionNoEscapedNoDust,
                     PacmanEmissionNoEscapedWithDust,

src/synference/utils.py

@@ -23,6 +23,10 @@
 except (ImportError, RuntimeError):
     spectres = None
 
+try:
+    from synthesizer import get_data_dir
+except ImportError:
+    get_data_dir = lambda: os.path.dirname(__file__)  # noqa: E731
 
 try:
     import plotext as plo
@@ -2779,3 +2783,23 @@ def interval_sharpness(
 
     # Return negative interval score so tighter intervals are closer to zero
     return -float(np.mean(scores))
+
+
+def download_test_data():
+    """Downloads test data for Synference using the synference-download CLI tool."""
+    import subprocess
+
+    data_dir = get_data_dir() / "synference"
+    data_dir.mkdir(parents=True, exist_ok=True)
+
+    # Download the test data
+    subprocess.run(
+        ["synference-download", "--test", "-d", str(data_dir)],
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    print(f"Test data downloaded to {data_dir}")
+
+
+test_data_dir = get_data_dir() / "synference"

tests/conftest.py

@@ -21,6 +21,7 @@
     calculate_muv,
     draw_from_hypercube,
     generate_sfh_basis,
+    test_data_dir,
 )
 
 
@@ -31,9 +32,9 @@ def test_dir():
 
 
 @pytest.fixture
-def library_dir(test_dir):
-    """Fixture to get the grid directory path."""
-    return test_dir / "test_libraries"
+def library_dir():
+    """Fixture to get the library directory path."""
+    return test_data_dir
 
 
 @pytest.fixture