File based checkpointing and other oddities

pyproject.toml

@@ -15,6 +15,7 @@ dependencies = [
     "sorcha @ git+https://github.com/B612-Asteroid-Institute/sorcha.git@cd5be9a06c6d24e1277cf2345bda9984f7097ede",
     "adam-core>=0.3.5",
     "quivr @ git+https://github.com/B612-Asteroid-Institute/quivr@2d8ae0b40bdfb75bcceff0c73d41a52d4bffb5dc",
+    "ipdb>=0.13.13",
 ]
 requires-python = "<3.13,>=3.11"
 readme = "README.md"

src/adam_impact_study/analysis/main.py

@@ -544,3 +544,5 @@ def summarize_impact_study_results(
 
     if plot:
         make_analysis_plots(results, out_dir)
+
+    return results

src/adam_impact_study/cli/impact.py

@@ -11,7 +11,7 @@
 import pyarrow.compute as pc
 from adam_core.time import Timestamp
 
-from adam_impact_study.analysis import plot_ip_over_time
+from adam_impact_study.analysis.main import plot_ip_over_time
 from adam_impact_study.impacts_study import run_impact_study_all
 from adam_impact_study.types import ImpactorOrbits, RunConfiguration
 
@@ -24,6 +24,7 @@ def run_impact_study(
     run_config: RunConfiguration,
     pointing_file: Optional[str] = None,
     orbit_id_filter: Optional[str] = None,
+    overwrite: bool = False,
 ) -> None:
     """Run impact study on provided orbits."""
     # Load orbits directly from parquet
@@ -84,6 +85,7 @@ def run_impact_study(
         monte_carlo_samples=run_config.monte_carlo_samples,
         max_processes=run_config.max_processes,
         seed=run_config.seed,
+        overwrite=overwrite,
     )
 
     logger.info("Generating plots...")
@@ -115,6 +117,12 @@ def main():
         "--orbit-id-filter",
         help="Comma-delimited list of substrings to filter orbit id by",
     )
+    parser.add_argument(
+        "--overwrite",
+        action="store_true",
+        help="Overwrite existing results in run directory",
+        default=False,
+    )
     parser.add_argument("--debug", action="store_true", help="Enable debug logging")
 
     args = parser.parse_args()
@@ -154,6 +162,7 @@ def main():
         run_config=run_config,
         pointing_file=args.pointing_file,
         orbit_id_filter=args.orbit_id_filter,
+        overwrite=args.overwrite,
     )
 
 

src/adam_impact_study/fo_od.py

@@ -79,9 +79,9 @@ def _create_fo_tmp_directory() -> str:
     Returns:
         str: The absolute path to the temporary directory populated with necessary FO files
     """
-    base_tmp_dir = os.path.expanduser("~/.cache/adam_impact_study/ftmp")
+    base_tmp_dir = os.path.expanduser("~/.cache/adam_impact_study/")
     os.makedirs(base_tmp_dir, mode=0o770, exist_ok=True)
-    tmp_dir = tempfile.mkdtemp(dir=base_tmp_dir)
+    tmp_dir = tempfile.mkdtemp(dir=base_tmp_dir, prefix="fo_")
     os.chmod(tmp_dir, 0o770)
     tmp_dir = _populate_fo_directory(tmp_dir)
     return tmp_dir
@@ -186,7 +186,9 @@ def run_fo_od(
     shutil.rmtree(fo_tmp_dir)
 
     if result.returncode != 0:
-        logger.warning(f"Find_Orb failed with return code {result.returncode}")
+        logger.warning(
+            f"Find_Orb failed with return code {result.returncode} for {len(observations)} observations in {fo_result_dir}"
+        )
         logger.warning(f"{result.stdout}\n{result.stderr}")
         return Orbits.empty(), ADESObservations.empty(), "Find_Orb failed"