wintertoo 1.6.0__tar.gz → 1.6.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.6.0
+Version: 1.6.2
 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.0 → wintertoo-1.6.2}/pyproject.toml

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

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

@@ -63,6 +63,7 @@ class TestSchedule(unittest.TestCase):
                 dec_deg=11.253441,
                 start_time_mjd=62721.1894969287,
                 end_time_mjd=62722.1894969452,
+                target_name="test_radec",
             ),
             program=program,
         )
@@ -81,6 +82,7 @@ class TestSchedule(unittest.TestCase):
                 dec_deg=11.253441,
                 total_exposure_time=100.0,
                 n_dither=1,
+                target_name="test_radec",
             ),
             program=program,
         )
@@ -100,6 +102,7 @@ class TestSchedule(unittest.TestCase):
 
         field_too = SummerFieldToO(
             field_id=1,
+            target_name="test_field",
         )
 
         schedule_field(
@@ -109,6 +112,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.6.2/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},"obsHistID":{"0":0,"1":1,"2":2,"3":3}}

{wintertoo-1.6.0 → wintertoo-1.6.2}/wintertoo/data/observing_request_schema.json

@@ -17,7 +17,7 @@
     "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", "default": null},
+    "targName": {"type": ["string"], "comment": "Target name e.g. GW170817"},
     "bestDetector": {"type": "boolean", "comment": "Center Ra/Dec of target on best detector", "default": true}
   },
   "required": [

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

@@ -39,12 +39,11 @@ class ToORequest(BaseModel):
         title="Priority for target",
         ge=0.0,
     )
-    target_name: Optional[str] = Field(
+    target_name: str = Field(
         title="Name of the target",
         min_length=1,
         max_length=MAX_TARGNAME_LEN,
         examples=["SN2021abc", "ZTF19aapreis"],
-        default=get_default_value("targName"),
     )
     total_exposure_time: float = Field(
         default=get_default_value("visitExpTime"),
@@ -65,11 +64,14 @@ class ToORequest(BaseModel):
         get_default_value("ditherStepSize"), ge=0.0, title="dither distance (arcsec)"
     )
     start_time_mjd: Optional[float] = Field(
-        default=Time.now().mjd + 0.01,
+        default=None,
         title="ToO validity start (MJD)",
+        example=Time.now().mjd,
     )
     end_time_mjd: Optional[float] = Field(
-        default=Time.now().mjd + 1, ge=Time.now().mjd, title="ToO validity end (MJD)"
+        default=None,
+        example=Time.now().mjd + 1,
+        title="ToO validity end (MJD)",
     )
     max_airmass: Optional[float] = Field(
         default=get_default_value("maxAirmass"),
@@ -93,6 +95,34 @@ class ToORequest(BaseModel):
         """
         return self.total_exposure_time / self.n_dither
 
+    @model_validator(mode="after")
+    def validate_date_order(self):
+        """
+        Ensure that the start date is before the end date
+
+        :return: validated field value
+        """
+        if self.start_time_mjd is None:
+            self.start_time_mjd = Time.now().mjd
+
+        if self.end_time_mjd is None:
+            self.end_time_mjd = Time.now().mjd + 7
+
+        if self.start_time_mjd > self.end_time_mjd:
+            raise WinterValidationError(
+                f"Start time ({self.start_time_mjd}) is "
+                f"after end time ({self.end_time_mjd})"
+            )
+
+        now = Time.now().mjd
+
+        if self.end_time_mjd < now:
+            raise WinterValidationError(
+                f"End date ({self.end_time_mjd}) is in the past, (time now is {now})"
+            )
+
+        return self
+
     @model_validator(mode="after")
     def validate_end_time(self):
         """

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 1.6.0
+Version: 1.6.2
 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.0/tests/testdata/test_schedule.json

@@ -1 +0,0 @@
-{"targName":{"0":null,"1":null,"2":null,"3":null},"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},"obsHistID":{"0":0,"1":1,"2":2,"3":3}}