Miriade interface improvements (#173)

* Add test

* Add new fields to ephems

* PEP8

* Safe insertion of values

* PEP8

* Fix offending statement

* Doc

Author: JulienPeloton

fink_utils/sso/ephem.py

@@ -27,8 +27,32 @@
 
 from fink_utils.tester import spark_unit_tests
 
-
-COLUMNS = ["Dobs", "Dhelio", "Phase", "Elong.", "RA", "DEC"]
+import logging
+
+_LOG = logging.getLogger(__name__)
+
+COLUMNS = [
+    "Dobs",
+    "Dhelio",
+    "Phase",
+    "Elong.",
+    "RA",
+    "DEC",
+    "px",
+    "py",
+    "pz",
+    "vx",
+    "vy",
+    "vz",
+]
+
+
+def safe_insert(dic, k):
+    """Safely return value if the key exists"""
+    if k in dic:
+        return dic[k]
+    else:
+        return None
 
 
 def sanitize_name(col):
@@ -69,7 +93,7 @@ def expand_columns(df, col_to_expand="ephem"):
     >>> assert "a" not in df.columns, df.columns
     """
     if col_to_expand not in df.columns:
-        print(
+        _LOG.warning(
             "{} not found in the DataFrame columns. Have you computed ephemerides?".format(
                 col_to_expand
             )
@@ -194,7 +218,8 @@ def extract_ztf_ephemerides_from_miriade(ssnamenr, cjd, uid, method):
         if ephems.get("data", None) is not None:
             # Remove any "." in name
             ephems_corr = {
-                sanitize_name(k): [dic[k] for dic in ephems["data"]] for k in COLUMNS
+                sanitize_name(k): [safe_insert(dic, k) for dic in ephems["data"]]
+                for k in COLUMNS
             }
 
             # In-place transformation of RA/DEC coordinates

fink_utils/sso/miriade.py

@@ -18,6 +18,7 @@
 import subprocess
 import json
 import os
+import io
 
 from astropy.coordinates import SkyCoord
 import astropy.units as u
@@ -31,6 +32,25 @@
 from fink_utils.tester import regular_unit_tests
 
 
+def get_sso_data(ssnamenr):
+    """Wrapper for tests
+
+    Parameters
+    ----------
+    ssnamenr: str
+        SSO name
+    """
+    r = requests.post(
+        "https://api.fink-portal.org/api/v1/sso",
+        json={"n_or_d": ssnamenr, "withEphem": True, "output-format": "json"},
+    )
+
+    if r.status_code != 200:
+        raise AssertionError((r.content, ssnamenr))
+    pdf = pd.read_json(io.BytesIO(r.content))
+    return pdf
+
+
 @profile
 def query_miriade(
     ident,
@@ -289,6 +309,14 @@ def get_miriade_data(
     -------
     out: pd.DataFrame
         DataFrame of the same length, but with new columns from the ephemerides service.
+
+    Examples
+    --------
+    >>> ssnamenrs = ["33803"]
+    >>> for ssnamenr in ssnamenrs:
+    ...     pdf = get_sso_data(ssnamenr)
+    ...     pdfEphem = get_miriade_data(pdf, withecl=False)
+    ...     assert "Phase" in pdfEphem.columns, (ssnamenr)
     """
     if parameters is None:
         parameters = {}