wintertoo 1.6.2__tar.gz → 1.7.0__tar.gz

{wintertoo-1.6.2 → wintertoo-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.6.2
+Version: 1.7.0
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo

{wintertoo-1.6.2 → wintertoo-1.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wintertoo"
-version = "1.6.2"
+version = "1.7.0"
 description = ""
 authors = [
     {name = "Robert Stein", email = "rdstein@caltech.edu"},

{wintertoo-1.6.2 → wintertoo-1.7.0}/tests/test_schedule.py

@@ -82,6 +82,8 @@ class TestSchedule(unittest.TestCase):
                 dec_deg=11.253441,
                 total_exposure_time=100.0,
                 n_dither=1,
+                start_time_mjd=62721.1894969287,
+                end_time_mjd=62722.1894969452,
                 target_name="test_radec",
             ),
             program=program,

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/data/__init__.py

@@ -54,10 +54,6 @@ def get_default_value(key: str):
 
 
 # define location of Palomar Observatory
-PALOMAR_LOC = coords.EarthLocation(
-    lat=coords.Latitude("33d21m25.5s"),
-    lon=coords.Longitude("-116d51m58.4s"),
-    height=1696.0,
-)
+PALOMAR_LOC = coords.EarthLocation.of_site("Palomar")
 
 palomar_observer = astroplan.Observer(location=PALOMAR_LOC)

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/database.py

@@ -37,7 +37,7 @@ def get_engine(
     )
 
 
-def get_program_details(  # pylint: disable=too-many-arguments,too-many-locals
+def get_program_details(  # pylint: disable=R0913,R0914,R0917
     program_name: str,
     program_api_key: str,
     program_db_user: str = None,

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/models/too.py

@@ -2,6 +2,7 @@
 Models for ToO requests
 """
 
+import logging
 from typing import List, Optional, Union
 
 from astropy.time import Time
@@ -24,6 +25,8 @@ from wintertoo.data import (
 )
 from wintertoo.errors import WinterValidationError
 
+logger = logging.getLogger(__name__)
+
 MIN_EXPOSURE_TIME = 0.28
 MAX_EXPOSURE_TIME = 300.0
 
@@ -248,3 +251,20 @@ class WinterRaDecToO(Winter, RaDecToO):
 
 
 AllTooClasses = Union[SummerFieldToO, SummerRaDecToO, WinterFieldToO, WinterRaDecToO]
+
+
+def is_summer(too: Union[Winter, Summer]) -> bool:
+    """
+    Checks a ToO Request to ensure it is either a Summer or Winter request
+
+    :param too: ToO request
+    :return: boolean
+    """
+    if isinstance(too, Summer):
+        return True
+    if isinstance(too, Winter):
+        return False
+
+    err = f"Unrecognised ToO type {type(too)}"
+    logger.error(err)
+    raise TypeError(err)

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/schedule.py

@@ -18,8 +18,8 @@ from wintertoo.models.too import (
     SummerRaDecToO,
     WinterFieldToO,
     WinterRaDecToO,
+    is_summer,
 )
-from wintertoo.utils import is_summer
 from wintertoo.validate import validate_schedule_df
 
 logger = logging.getLogger(__name__)

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/submit.py

@@ -66,7 +66,7 @@ def export_schedule_to_sqlitedb(schedule: pd.DataFrame, base_save_path: str) ->
     return save_path
 
 
-def submit_schedule(  # pylint: disable=too-many-arguments
+def submit_schedule(  # pylint: disable=R0913,R0917
     schedule: pd.DataFrame,
     program_api_key: str,
     program_name: str,

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/utils.py

@@ -5,16 +5,16 @@ Created on Tue Jan 25 13:51:59 2022
 @author: frostig, belatedly edited by Robert Stein
 """
 import logging
-from typing import Union
 
 import astropy.time
 import numpy as np
 import pandas as pd
+from astropy import units as u
 from astropy.coordinates import AltAz, SkyCoord
 from astropy.time import Time
+from astropy.utils.masked import Masked
 
 from wintertoo.data import PALOMAR_LOC, palomar_observer
-from wintertoo.models.too import Summer, Winter
 
 logger = logging.getLogger(__name__)
 
@@ -51,8 +51,15 @@ def up_tonight(time_mjd: astropy.time.Time, ra: str, dec: str) -> tuple[bool, st
     """
     loc = SkyCoord(ra=ra, dec=dec, frame="icrs")
     time = Time(time_mjd, format="mjd")
+
+    # Rise/fade can fail if target is close to a bin edge
     sun_rise = palomar_observer.sun_rise_time(time, which="previous")
+    if isinstance(sun_rise.value, Masked):
+        sun_rise = palomar_observer.sun_rise_time(time - 0.05 * u.day, which="previous")
     sun_set = palomar_observer.sun_set_time(time, which="next")
+    if isinstance(sun_rise.value, Masked):
+        sun_set = palomar_observer.sun_rise_time(time + 0.05 * u.day, which="next")
+
     night = sun_set.jd - sun_rise.jd
     if night >= 1:
         # if next day, subtract a day
@@ -66,10 +73,12 @@ def up_tonight(time_mjd: astropy.time.Time, ra: str, dec: str) -> tuple[bool, st
     df = pd.DataFrame(data={"time": time_array, "alt": altaz.alt})
     df = df[df["alt"] >= MINIMUM_ELEVATION]
 
-    try:
-        time_up = df["time"].iloc[-1] - df["time"].iloc[0]
-    except KeyError:
-        time_up = 0
+    time_up = 0
+    if len(df) > 0:
+        try:
+            time_up = df["time"].iloc[-1] - df["time"].iloc[0]
+        except KeyError:
+            pass
 
     if time_up > 0:
         is_available = (
@@ -85,23 +94,6 @@ def up_tonight(time_mjd: astropy.time.Time, ra: str, dec: str) -> tuple[bool, st
     return avail_bool, is_available
 
 
-def is_summer(too: Union[Winter, Summer]) -> bool:
-    """
-    Checks a ToO Request to ensure it is either a Summer or Winter request
-
-    :param too: ToO request
-    :return: boolean
-    """
-    if isinstance(too, Summer):
-        return True
-    if isinstance(too, Winter):
-        return False
-
-    err = f"Unrecognised ToO type {type(too)}"
-    logger.error(err)
-    raise TypeError(err)
-
-
 def get_date(time: Time) -> int:
     """
     Get the date from a time object

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo/validate.py

@@ -20,7 +20,7 @@ from wintertoo.utils import up_tonight
 logger = logging.getLogger(__name__)
 
 
-def get_and_validate_program_details(  # pylint: disable=too-many-arguments
+def get_and_validate_program_details(  # pylint: disable=R0913,R0917
     program_name: str,
     program_api_key: str,
     program_db_user: str = None,
@@ -256,7 +256,7 @@ def validate_time_allocation(
         raise WinterValidationError(err)
 
 
-def validate_schedule_with_program(  # pylint: disable=too-many-arguments
+def validate_schedule_with_program(
     schedule_request: pd.DataFrame,
     program: Program,
 ):
@@ -297,7 +297,7 @@ def validate_schedule_with_program(  # pylint: disable=too-many-arguments
     )
 
 
-def validate_schedule_request(  # pylint: disable=too-many-arguments
+def validate_schedule_request(  # pylint: disable=R0913,R0917
     schedule_request: pd.DataFrame,
     program_name: str,
     program_api_key: str,

{wintertoo-1.6.2 → wintertoo-1.7.0}/wintertoo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.6.2
+Version: 1.7.0
 Author-email: Robert Stein <rdstein@caltech.edu>, Danielle Frostig <frostig@mit.edu>, Viraj Karambelkar <viraj@astro.caltech.edu>
 License: MIT
 Project-URL: homepage, https://github.com/winter-telescope/wintertoo