Merge pull request #10 from B612-Asteroid-Institute/ak/update-assist

Update assist and adam core

.gitignore

@@ -0,0 +1,2 @@
+.pdm-python
+find_orb/*

README.md

@@ -23,14 +23,6 @@ pip install .
 
 However, using PDM is recommended to ensure consistent and reproducible environments.
 
-### Download Ephemeris Files
-
-If using pdm, first activate the environement with: `eval $(pdm venv activate)`, then to download the assist ephemeris files, run:
-
-```
-python set_up_assist.py
-```
-
 You will also need to decide which OD platform you want to use. Currently only Find Orb is available.
 
 ### Install Find Orb

pyproject.toml

@@ -7,14 +7,11 @@ authors = [
 ]
 dependencies = [
     "matplotlib",
-    "adam_core",
-    "adam_assist",
+    "adam_core>=0.3.4",
+    "adam_assist>=0.2.0",
     "sorcha",
-    "jax",
-    "jaxlib",
-    "numpy>=1.24.4",
 ]
-requires-python = ">=3.11"
+requires-python = "<3.13,>=3.11"
 readme = "README.md"
 license = {text = "MIT"}
 
@@ -55,6 +52,8 @@ coverage = "pytest --cov=adam_impact_study --cov-report=xml"
 
 [tool.pdm]
 distribution = true
+# We use our fork but sorcha wants to install vanilla assist
+resolution.excludes = ["assist"]
 
 [tool.black]
 line-length = 88

src/adam_impact_study/impacts_study.py

@@ -3,8 +3,8 @@
 
 import pyarrow.compute as pc
 import quivr as qv
+from adam_assist import ASSISTPropagator
 from adam_core.dynamics.impacts import calculate_impact_probabilities, calculate_impacts
-from adam_core.propagator.adam_assist import ASSISTPropagator
 
 from adam_impact_study.conversions import od_observations_to_ades_file
 from adam_impact_study.fo_od import run_fo_od

tests/test_impact_study.py

@@ -6,7 +6,7 @@
 from adam_core.dynamics.impacts import ImpactProbabilities
 from adam_core.observers import Observers
 from adam_core.orbits import Orbits
-from adam_core.propagator.adam_assist import ASSISTPropagator
+from adam_assist import ASSISTPropagator
 from adam_core.time import Timestamp
 
 from adam_impact_study.conversions import (