From b6429abc032cd60dda4e72012fd86a840a42e825 Mon Sep 17 00:00:00 2001
From: "Michael S. P. Kelley" <msk@astro.umd.edu>
Date: Sun, 1 Sep 2024 10:59:21 -0400
Subject: [PATCH] Save some basic metadata in Ephem tables.

---
 sbpy/data/ephem.py | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/sbpy/data/ephem.py b/sbpy/data/ephem.py
index e7f02e0b..e0cdbb5d 100644
--- a/sbpy/data/ephem.py
+++ b/sbpy/data/ephem.py
@@ -209,8 +209,9 @@ def from_horizons(
                         'lat': location.lat.deg,
                         'elevation': location.height.to('km')}
 
-        # append ephemerides table for each targetid
+        # append ephemerides table for each targetid, collect all URLs
         all_eph = None
+        urls = []
         for targetid in targetids:
 
             # load ephemerides using astroquery.jplhorizons
@@ -224,6 +225,8 @@ def from_horizons(
                      'The following query was attempted: {:s}').format(
                          str(e), obj.uri))
 
+            urls.append(obj.uri)
+
             if _sorted:
                 # restore user's original order
                 eph = eph[_unsort]
@@ -273,7 +276,12 @@ def from_horizons(
             all_eph['locapp_hourangle'] = u.Quantity(Angle(
                 all_eph['locapp_hourangle'], 'hr'), u.hourangle)
 
-        return cls.from_table(all_eph)
+        meta = {
+            "targetids": targetids,
+            "location": location,
+            "urls": urls,
+        }
+        return cls.from_table(all_eph, meta=meta)
 
     @classmethod
     @requires("astroquery")
@@ -447,8 +455,9 @@ def from_mpc(cls, targetids, epochs=None, location='500', ra_format=None,
         else:
             raise ValueError('Invalid `epochs` parameter')
 
-        # append ephemerides table for each targetid
+        # append ephemerides table for each targetid and collect URLs
         all_eph = None
+        urls = []
         for targetid in targetids:
             try:
                 # get ephemeris
@@ -461,12 +470,14 @@ def from_mpc(cls, targetids, epochs=None, location='500', ra_format=None,
                                               number=1, **kwargs)
                         e['Date'] = e['Date'].iso  # for vstack to work
                         eph.append(e)
+                        urls.append(e.uri)
                     eph = QTable(vstack(eph))
                     eph['Date'] = Time(eph['Date'], scale='utc')
                 else:
                     eph = MPC.get_ephemeris(targetid, location=location,
                                             start=start, step=step,
                                             number=number, **kwargs)
+                    urls.append(e.uri)
             except InvalidQueryError as e:
                 raise QueryError(
                     'Error raised by astroquery.mpc: {:s}'.format(str(e)))
@@ -492,7 +503,12 @@ def from_mpc(cls, targetids, epochs=None, location='500', ra_format=None,
         if dec_format is not None:
             all_eph['Dec'].info.format = lambda x: x.to_string(**dec_format)
 
-        return cls.from_table(all_eph)
+        meta = {
+            "targetids": targetids,
+            "location": location,
+            "urls": urls,
+        }
+        return cls.from_table(all_eph, meta=meta)
 
     @classmethod
     @requires("astroquery")
@@ -627,6 +643,7 @@ def from_miriade(cls, targetids, objtype='asteroid',
 
         # append ephemerides table for each targetid
         all_eph = None
+        urls = []
         for targetid in targetids:
             query = Miriade()
             try:
@@ -638,6 +655,7 @@ def from_miriade(cls, targetids, objtype='asteroid',
                                                     location=location,
                                                     epoch=_epochs['start'],
                                                     **kwargs)
+                        urls.append(eph.uri)
                     else:
                         # multiple epochs
                         eph = []
@@ -650,6 +668,7 @@ def from_miriade(cls, targetids, objtype='asteroid',
                                 **kwargs
                             )
                             eph.append(e)
+                            urls.append(eph.uri)
                         eph = vstack(eph)
                 else:
                     # dictionary
@@ -659,6 +678,7 @@ def from_miriade(cls, targetids, objtype='asteroid',
                         epoch_step=_epochs['step'],
                         epoch_nsteps=_epochs['number'],
                         **kwargs)
+                    urls.append(eph.uri)
             except RuntimeError as e:
                 raise QueryError(
                     ('Error raised by astroquery.imcce: {:s}\n'
@@ -672,7 +692,12 @@ def from_miriade(cls, targetids, objtype='asteroid',
 
         all_eph = QTable(all_eph)
         all_eph['epoch'] = Time(all_eph['epoch'], scale='utc', format='jd')
-        return cls.from_table(all_eph)
+        meta = {
+            "targetids": targetids,
+            "location": location,
+            "urls": urls,
+        }
+        return cls.from_table(all_eph, meta=meta)
 
     @classmethod
     @requires("pyoorb")
@@ -885,6 +910,10 @@ def from_oo(cls, orbit, epochs=None, location='500', scope='full',
         ephem.table['epoch'].format = 'jd'
         ephem.table.remove_column('MJD')
 
+        ephem.meta["location"] = location
+        ephem.meta["ephfile"] = ephfile
+        ephem.meta["dynmodel"] = dynmodel
+
         return ephem