astro-otter 0.3.5__tar.gz → 0.4.0__tar.gz

{astro_otter-0.3.5/src/astro_otter.egg-info → astro_otter-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astro-otter
-Version: 0.3.5
+Version: 0.4.0
 Author-email: Noah Franz <nfranz@arizona.edu>
 License: MIT License
         

{astro_otter-0.3.5 → astro_otter-0.4.0/src/astro_otter.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astro-otter
-Version: 0.3.5
+Version: 0.4.0
 Author-email: Noah Franz <nfranz@arizona.edu>
 License: MIT License
         

{astro_otter-0.3.5 → astro_otter-0.4.0}/src/otter/_version.py

@@ -2,4 +2,4 @@
 Just define the package version in one place
 """
 
-__version__ = "0.3.5"
+__version__ = "0.4.0"

{astro_otter-0.3.5 → astro_otter-0.4.0}/src/otter/io/otter.py

@@ -63,15 +63,15 @@ class Otter(Database):
 
     def __init__(
         self,
-        url: str = "http://127.0.0.1:8529",
+        url: str = "https://otter.idies.jhu.edu/api",
         username: str = os.environ.get("ARANGO_USER_USERNAME", "user-guest"),
-        password: str = os.environ.get("ARANGO_USER_PASSWORD", ""),
+        password: str = os.environ.get("ARANGO_USER_PASSWORD", "test"),
         gen_summary: bool = False,
         datadir: str = None,
         debug: bool = False,
         **kwargs,
     ) -> None:
-        print("Attempting to login with the following credentials:")
+        print(f"Attempting to login to {url} with the following credentials:")
         print(f"username: {username}")
         print(f"password: {password}")
 
@@ -943,7 +943,7 @@ class Otter(Database):
 
         # merge the meta and phot data
         if phot is not None:
-            data = pd.merge(phot, meta, on="name", how="inner")
+            data = pd.merge(phot, meta, on="name", how="outer")
         else:
             data = meta
 
@@ -951,11 +951,11 @@ class Otter(Database):
         assert (
             len(data[pd.isna(data.ra)].name.unique()) == 0
         ), "Missing some RA and Decs, please check the input files!"
-        if phot is not None:
-            for name in meta.name:
-                assert len(data[data.name == name]) == len(
-                    phot[phot.name == name]
-                ), f"failed on {name}"
+        # if phot is not None:
+        #    for name in meta.name:
+        #        assert len(data[data.name == name]) == len(
+        #            phot[phot.name == name]
+        #        ), f"failed on {name}"
 
         # actually do the data conversion to OTTER
         all_jsons = []
@@ -1084,7 +1084,7 @@ class Otter(Database):
             # skip the photometry code if there is no photometry file
             # if there is a photometry file then we want to convert it below
             phot_sources = []
-            if phot is not None:
+            if phot is not None and not np.all(pd.isna(tde["flux"])):
                 tde["obs_type"] = [
                     freq_to_obstype(vv * u.Unit(uu))
                     for vv, uu in zip(

{astro_otter-0.3.5 → astro_otter-0.4.0}/tests/test_data_finder.py

@@ -98,7 +98,7 @@ def test_query_simbad():
     df1 = construct_data_finder()
     res = df1.query_simbad()
 
-    assert len(res) == 3
+    assert len(res) == 1
 
 
 def test_query_vizier():