wintertoo 1.1.0__tar.gz → 1.9.0__tar.gz

{wintertoo-1.1.0 → wintertoo-1.9.0}/.github/workflows/continuous_integration.yml

@@ -22,7 +22,7 @@ jobs:
     # Specify the python versions to test
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -71,7 +71,7 @@ jobs:
           .
 
       - name: Publish distribution 📦 to PyPI
-        if: ${{ startsWith(github.ref, 'refs/tags/') && success() && matrix.python-version == 3.9 && github.event_name == 'push'}}
+        if: ${{ startsWith(github.ref, 'refs/tags/') && success() && matrix.python-version == 3.11 && github.event_name == 'push'}}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}

{wintertoo-1.1.0 → wintertoo-1.9.0}/PKG-INFO

@@ -1,11 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wintertoo
-Version: 1.1.0
+Version: 1.9.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
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Intended Audience :: Science/Research
@@ -18,12 +17,12 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Operating System :: MacOS
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: astropy
-Requires-Dist: astroplan
+Requires-Dist: pandas<3.0.0
+Requires-Dist: astropy>=6.0.0
+Requires-Dist: astroplan>=0.10
 Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pytz
@@ -35,10 +34,11 @@ Requires-Dist: bcrypt
 Requires-Dist: psycopg
 Requires-Dist: psycopg-binary
 Provides-Extra: dev
-Requires-Dist: black>=24.1.0; extra == "dev"
-Requires-Dist: isort>=5.13.0; extra == "dev"
+Requires-Dist: black==26.1.0; extra == "dev"
+Requires-Dist: isort>=7.0.0; extra == "dev"
 Requires-Dist: pylint>=3.0.0; extra == "dev"
 Requires-Dist: coveralls; extra == "dev"
+Dynamic: license-file
 
 # wintertoo
 [![PyPI version](https://badge.fury.io/py/wintertoo.svg)](https://badge.fury.io/py/wintertoo)

{wintertoo-1.1.0 → wintertoo-1.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wintertoo"
-version = "1.1.0"
+version = "1.9.0"
 description = ""
 authors = [
     {name = "Robert Stein", email = "rdstein@caltech.edu"},
@@ -13,10 +13,9 @@ authors = [
 ]
 license = {text = "MIT"}
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
-    'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Intended Audience :: Science/Research',
@@ -31,9 +30,9 @@ classifiers = [
     'Operating System :: MacOS',
 ]
 dependencies = [
-    "pandas",
-    "astropy",
-    "astroplan",
+    "pandas<3.0.0",
+    "astropy>=6.0.0",
+    "astroplan>=0.10",
     "matplotlib",
     "numpy",
     "pytz",
@@ -47,8 +46,8 @@ dependencies = [
 ]
 [project.optional-dependencies]
 dev = [
-    "black >= 24.1.0",
-    "isort >= 5.13.0",
+    "black == 26.1.0",
+    "isort >= 7.0.0",
     "pylint >= 3.0.0",
     "coveralls",
 ]
@@ -96,3 +95,6 @@ disable=["logging-fstring-interpolation"]
 good-names=["ax", "ra", "df", "pi", "i"]
 exclude-too-few-public-methods=["pydantic.*"]
 extension-pkg-whitelist=["pydantic"]
+
+[tool.pylint.typecheck]
+generated-members=["u.*"]

{wintertoo-1.1.0 → wintertoo-1.9.0}/tests/test_schedule.py

@@ -9,7 +9,13 @@ from datetime import date
 
 import pandas as pd
 
-from wintertoo.models import Program, SummerFieldToO, SummerRaDecToO
+from wintertoo.models import (
+    Program,
+    SpringRaDecToO,
+    SummerFieldToO,
+    SummerRaDecToO,
+    WinterRaDecToO,
+)
 from wintertoo.schedule import concat_toos, schedule_field, schedule_ra_dec
 from wintertoo.submit import export_schedule_to_sqlitedb
 from wintertoo.validate import (
@@ -28,6 +34,7 @@ program = Program(
     pi_name="Stein",
     progname="2021A000",
     prog_key="763244309190298696786072636901190268976229595667748695826878",
+    pi_email="fake@nowhere.com",
     maxpriority=100,
     startdate=date(2021, 1, 1),
     enddate=date(3023, 12, 31),
@@ -57,13 +64,16 @@ class TestSchedule(unittest.TestCase):
         """
         logger.info("Testing schedule generation")
 
+        kwargs = {
+            "ra_deg": 173.7056754,
+            "dec_deg": 11.253441,
+            "start_time_mjd": 62721.1894969287,
+            "end_time_mjd": 62722.1894969452,
+            "target_name": "test_radec",
+        }
+
         schedule = schedule_ra_dec(
-            too=SummerRaDecToO(
-                ra_deg=173.7056754,
-                dec_deg=11.253441,
-                start_time_mjd=62721.1894969287,
-                end_time_mjd=62722.1894969452,
-            ),
+            too=SummerRaDecToO(**kwargs),
             program=program,
         )
 
@@ -79,13 +89,26 @@ class TestSchedule(unittest.TestCase):
             too=SummerRaDecToO(
                 ra_deg=173.7056754,
                 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,
         )
 
         validate_schedule_with_program(schedule, program)
 
-        export_schedule_to_sqlitedb(schedule, "test_schedule.db")
+        output_path = export_schedule_to_sqlitedb(schedule, test_data_dir)
+        output_path.unlink()
+
+        for too_class in [WinterRaDecToO, SpringRaDecToO]:
+            schedule = schedule_ra_dec(
+                too=too_class(**kwargs),
+                program=program,
+            )
+            validate_schedule_with_program(schedule, program)
 
     def test_schedule_utils(self):
         """
@@ -97,6 +120,7 @@ class TestSchedule(unittest.TestCase):
 
         field_too = SummerFieldToO(
             field_id=1,
+            target_name="test_field",
         )
 
         schedule_field(
@@ -106,6 +130,11 @@ class TestSchedule(unittest.TestCase):
         )
 
         concat_toos(
-            [field_too, SummerRaDecToO(ra_deg=173.7056754, dec_deg=11.253441)],
+            [
+                field_too,
+                SummerRaDecToO(
+                    ra_deg=173.7056754, dec_deg=11.253441, target_name="test_radec"
+                ),
+            ],
             program=program,
         )

wintertoo-1.9.0/tests/testdata/test_schedule.json

@@ -0,0 +1 @@
+{"targName":{"0":"test_radec","1":"test_radec","2":"test_radec","3":"test_radec"},"raDeg":{"0":173.7056754,"1":173.7056754,"2":173.7056754,"3":173.7056754},"decDeg":{"0":11.253441,"1":11.253441,"2":11.253441,"3":11.253441},"fieldID":{"0":999999999,"1":999999999,"2":999999999,"3":999999999},"filter":{"0":"u","1":"g","2":"r","3":"i"},"visitExpTime":{"0":960.0,"1":960.0,"2":960.0,"3":960.0},"singleExpTime":{"0":120.0,"1":120.0,"2":120.0,"3":120.0},"priority":{"0":50.0,"1":50.0,"2":50.0,"3":50.0},"progPI":{"0":"Stein","1":"Stein","2":"Stein","3":"Stein"},"progName":{"0":"2021A000","1":"2021A000","2":"2021A000","3":"2021A000"},"progID":{"0":1,"1":1,"2":1,"3":1},"validStart":{"0":62721.1894969287,"1":62721.1894969287,"2":62721.1894969287,"3":62721.1894969287},"validStop":{"0":62722.1894969452,"1":62722.1894969452,"2":62722.1894969452,"3":62722.1894969452},"observed":{"0":false,"1":false,"2":false,"3":false},"maxAirmass":{"0":2.0,"1":2.0,"2":2.0,"3":2.0},"ditherNumber":{"0":8,"1":8,"2":8,"3":8},"ditherStepSize":{"0":90.0,"1":90.0,"2":90.0,"3":90.0},"bestDetector":{"0":true,"1":true,"2":true,"3":true},"camera":{"0":"summer","1":"summer","2":"summer","3":"summer"},"obsHistID":{"0":0,"1":1,"2":2,"3":3}}

{wintertoo-1.1.0 → wintertoo-1.9.0}/wintertoo/data/__init__.py

@@ -17,18 +17,28 @@ summer_fields_path = data_dir.joinpath("summer_fields.txt")
 summer_fields = pd.read_csv(summer_fields_path, sep=r"\s+")
 
 winter_fields_path = data_dir.joinpath("winter_fields.txt")
-winter_fields = pd.read_csv(winter_fields_path, sep=r"\s+")
+all_winter_fields = pd.read_csv(winter_fields_path, sep=r"\s+")
+winter_fields = all_winter_fields[all_winter_fields["ID"] < 41170]
+winter_secondary_fields = all_winter_fields[all_winter_fields["ID"] >= 41170]
 
 SummerFilters = Literal["u", "g", "r", "i"]
-
 WinterFilters = Literal["dark", "Y", "J", "Hs"]
+SpringFilters = Literal["dark", "Y", "J", "Hs"]
 
 SUMMER_FILTERS = list(typing.get_args(SummerFilters))
 WINTER_FILTERS = list(typing.get_args(WinterFilters))
 WINTER_SCIENCE_FILTERS = ["Y", "J", "Hs"]
+SPRING_FILTERS = list(typing.get_args(SpringFilters))
+SPRING_SCIENCE_FILTERS = ["Y", "J", "Hs"]
 
 SUMMER_BASE_WIDTH = 0.26112
 WINTER_BASE_WIDTH = 1.0
+SPRING_BASE_WIDTH = 1.0
+
+MAX_TARGNAME_LEN = 30
+
+WinterImageTypes = Literal["exposure", "raw", "science", "stack", "diff", "avro"]
+DEFAULT_IMAGE_TYPE = "stack"
 
 PROGRAM_DB_HOST = "jagati.caltech.edu"
 
@@ -49,10 +59,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", refresh_cache=True)
 
 palomar_observer = astroplan.Observer(location=PALOMAR_LOC)

{wintertoo-1.1.0 → wintertoo-1.9.0}/wintertoo/data/observing_request_schema.json

@@ -5,7 +5,7 @@
     "raDeg": {"type": "number", "comment": "Degrees (decimal)"},
     "decDeg": {"type": "number", "comment": "Degrees (decimal)"},
     "filter": {"type": "string", "comment": "'u'/'g'/'r'/'i'/'Y'/'J'/'H'/'dark'"},
-    "visitExpTime": {"type": "number", "comment": "Total observation time (seconds)", "default": 30.0},
+    "visitExpTime": {"type": "number", "comment": "Total observation time (seconds)", "default": 960.0},
     "priority": {"type": "number", "comment": "Priority of observation"},
     "progPI": {"type": "string", "comment": "PI of observation"},
     "progID": {"type": "integer", "comment": "Between 0 and 4 (0-Calibration, 1-Survey, 2-MIT, 3-Caltech, 4-Engineering)"},
@@ -14,10 +14,12 @@
     "validStop": {"type": "number", "comment": "Format: MJD"},
     "observed": {"anyOf": [{"type":  "boolean", "default":  false}, {"type" : "integer", "minimum" : 0, "maximum" : 1}]},
     "maxAirmass": {"type":  "number", "comment": "Maximum airmass for observation", "default":  2.0},
-    "ditherNumber": {"type": "integer", "default": 1},
-    "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 30.0},
+    "ditherNumber": {"type": "integer", "default": 8},
+    "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 90.0},
     "fieldID": {"type": "integer", "default": 999999999},
-    "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817"}
+    "targName": {"type": ["string"], "comment": "Target name e.g. GW170817"},
+    "bestDetector": {"type": "boolean", "comment": "Center Ra/Dec of target on best detector", "default": true},
+    "camera": {"type":  "string", "comment": "'winter' or 'spring'", "default":  "winter"}
   },
   "required": [
     "obsHistID",