Merge pull request #14 from B612-Asteroid-Institute/adam-fo

Adam fo

pyproject.toml

@@ -13,8 +13,9 @@ dependencies = [
     "adam_assist>=0.2.0",
     "ray[default]==2.39.0",
     "sorcha @ git+https://github.com/B612-Asteroid-Institute/sorcha@23a3392f0145f7dbbdbb7b17687b69902716bde8",
-    "adam-core>=0.3.5",
+    "adam-core @ git+https://github.com/B612-Asteroid-Institute/adam_core@ee57577ff786c573c856d591b1e993d1649576f3",
     "quivr @ git+https://github.com/B612-Asteroid-Institute/quivr@2d8ae0b40bdfb75bcceff0c73d41a52d4bffb5dc",
+    "adam-fo @ git+https://github.com/B612-Asteroid-Institute/adam_fo@1a900ad69577c9cf4ce2190156280e80d70f9ca1",
     "ipdb>=0.13.13",
 ]
 requires-python = "<3.13,>=3.11"
@@ -53,7 +54,7 @@ lint = { composite = [
 fix = "ruff ./src/adam_impact_study --fix"
 typecheck = "mypy --strict ./src/adam_impact_study"
 
-test = "pytest --benchmark-disable {args}"
+test = "pytest --benchmark-disable {args} -rs"
 doctest = "pytest --doctest-plus --doctest-only"
 benchmark = "pytest --benchmark-only"
 coverage = "pytest --cov=adam_impact_study --cov-report=xml"

src/adam_impact_study/analysis/__init__.py

@@ -1,2 +1,11 @@
 # ruff: noqa F401
-from .main import summarize_impact_study_results
+from .main import (
+    DiscoveryDates,
+    RealizationTimes,
+    WarningTimes,
+    compute_discovery_dates,
+    compute_realization_time,
+    compute_warning_time,
+    plot_ip_over_time,
+    summarize_impact_study_results,
+)

src/adam_impact_study/analysis/tests/test_analysis.py

@@ -145,7 +145,7 @@ def test_compute_discovery_dates():
     )
 
     # Compute discovery dates
-    discovery_dates = compute_discovery_dates(impactor_orbits, results)
+    discovery_dates = compute_discovery_dates(results)
 
     # Check we got results for all objects
     assert len(discovery_dates) == 3

src/adam_impact_study/cli/impact.py

@@ -10,6 +10,7 @@
 import pyarrow as pa
 import pyarrow.compute as pc
 from adam_core.time import Timestamp
+from adam_fo.config import check_build_exists
 
 from adam_impact_study.analysis.main import plot_ip_over_time
 from adam_impact_study.impacts_study import run_impact_study_all
@@ -26,6 +27,9 @@ def run_impact_study(
     overwrite: bool = False,
 ) -> None:
     """Run impact study on provided orbits."""
+    # Test that the build fo script has been run
+    check_build_exists()
+
     # Load orbits directly from parquet
     logger.info(f"Loading orbits from {orbit_file}")
     impactor_orbits = ImpactorOrbits.from_parquet(orbit_file)