astro-otter 0.3.5__py3-none-any.whl → 0.4.1__py3-none-any.whl

{astro_otter-0.3.5.dist-info → astro_otter-0.4.1.dist-info}/METADATA

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

{astro_otter-0.3.5.dist-info → astro_otter-0.4.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-astro_otter-0.3.5.dist-info/licenses/LICENSE,sha256=s9IPE8A3CAMEaZpDhj4eaorpmfLYGB0mIGphq301PUY,1067
+astro_otter-0.4.1.dist-info/licenses/LICENSE,sha256=s9IPE8A3CAMEaZpDhj4eaorpmfLYGB0mIGphq301PUY,1067
 otter/__init__.py,sha256=pvX-TN7nLVmvKpkDi89Zxe-jMfHNiVMD3zsd_bPEK9Y,535
-otter/_version.py,sha256=5LVB9FiBWDmYEmn6fLO_jW-OA3WAt_uN2xs5Dc4KpNY,76
+otter/_version.py,sha256=Af91-Q-wYZrx1oE0zsbFccgT2zWIHBDaWCDo8UsrNHg,76
 otter/exceptions.py,sha256=3lQF4AXVTfs9VRsVePQoIrXnramsPZbUL5crvf1s9Ng,1702
 otter/schema.py,sha256=J-iI_kEEd0aHN_Hr49HFEa8W07enh1FSDbU99NwIz3Y,11240
 otter/util.py,sha256=G5M2PdtPGKpRXCqkItyXMLj6h5F3EboBBDKWMViw04k,23333
 otter/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 otter/io/data_finder.py,sha256=M6kzqMyy-yhwQfxbOs2E7i_8bCcZFW4Zyf8z-6LCxNQ,38425
 otter/io/host.py,sha256=xv_SznZuvMoMVsZLqlcmlOyaqKCMZqlTQ_gkN4VBSTw,7139
-otter/io/otter.py,sha256=qTKTfGkBdmsWjLF1cxjiX-SvOaKOPK-nd0aK7TtPQO8,61076
-otter/io/transient.py,sha256=1yVy-9NEo9ozM4B-sqEcGlJW_1abD0sWSXYG0Ex-3Jc,58020
+otter/io/otter.py,sha256=22Wfe8Z6X3-R9XhZRCPqHp53oITXu-qfVvHX6hTpF9I,61161
+otter/io/transient.py,sha256=uWxLARaHkGgGDqmjKgDNNKDR_Mq6Tj0y9OSPCgBPLvY,58397
 otter/plotter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 otter/plotter/otter_plotter.py,sha256=yUjGHR0FcbndwC1yLQekJWqX2KBMAJXtjFKbbASG_Cc,2144
 otter/plotter/plotter.py,sha256=ni4WV63wIjhMHStDmuccltaMHSaFbwwfztYpuMdYAz8,9340
-astro_otter-0.3.5.dist-info/METADATA,sha256=CTru7txtl0-m5zmGInfuJ_qd0upiUjF1eGTU6Eo-ZEk,7046
-astro_otter-0.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-astro_otter-0.3.5.dist-info/top_level.txt,sha256=Wth72sCwBRUk3KZGknSKvLQDMFuJk6qiaAavMDOdG5k,6
-astro_otter-0.3.5.dist-info/RECORD,,
+astro_otter-0.4.1.dist-info/METADATA,sha256=1O7pvLIGNtfkM8WcnMDaBeMPb92vYNOuCcjJaxYn4PU,7046
+astro_otter-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+astro_otter-0.4.1.dist-info/top_level.txt,sha256=Wth72sCwBRUk3KZGknSKvLQDMFuJk6qiaAavMDOdG5k,6
+astro_otter-0.4.1.dist-info/RECORD,,

otter/_version.py

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

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}")
 
@@ -85,9 +85,6 @@ class Otter(Database):
 
         self.debug = debug
 
-        if gen_summary:
-            self.generate_summary_table(save=True)
-
         # make sure the data directory exists
         if not os.path.exists(self.DATADIR):
             try:
@@ -99,6 +96,9 @@ class Otter(Database):
                 )
                 pass
 
+        if gen_summary:
+            self.generate_summary_table(save=True)
+
         connection = Connection(username=username, password=password, arangoURL=url)
         super().__init__(connection, "otter", **kwargs)
 
@@ -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(
@@ -1531,7 +1531,7 @@ class Otter(Database):
             all_jsons.append(Transient(json))
 
         if db is None:
-            db = Otter(datadir=local_outpath)
+            db = Otter(datadir=local_outpath, gen_summary=True)
         else:
             db.DATADIR = local_outpath
 

otter/io/transient.py

@@ -432,6 +432,16 @@ class Transient(MutableMapping):
         if "host" in self:
             max_hosts = min([max_hosts, len(self["host"])])
             for h in self["host"][:max_hosts]:
+                # only return hosts with their ra and dec stored
+                if (
+                    "host_ra" not in h
+                    or "host_dec" not in h
+                    or "host_ra_units" not in h
+                    or "host_dec_units" not in h
+                ):
+                    continue
+
+                # now we can construct a host object from this
                 host.append(Host(transient_name=self.default_name, **dict(h)))
 
         # then try BLAST