wintertoo 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

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/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.dist-info → wintertoo-1.6.2.dist-info}/METADATA

@@ -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.dist-info → wintertoo-1.6.2.dist-info}/RECORD

@@ -7,15 +7,15 @@ wintertoo/submit.py,sha256=kd6_aziOf5QcemsyyhSRSnbXlLj8OWsY1_Gj0ZXsUuo,3201
 wintertoo/utils.py,sha256=BWgBZoSX5xfqURb2Nkvf3i6A_IcVYU2SoXFvp6ez7Xc,3306
 wintertoo/validate.py,sha256=YpSABluVXxl33j_ht7TwfC-0SlN4IC0BnbbQiTwUk4c,10476
 wintertoo/data/__init__.py,sha256=OPsHalwB9mTMBHp-W-iAbsP39hrgQ4myNt1Daxkwz2s,1602
-wintertoo/data/observing_request_schema.json,sha256=PsQmSre-VpfCTwoo3Fc9VoPV4-mByLs6KYKZ7x5zzco,1733
+wintertoo/data/observing_request_schema.json,sha256=HyPcP2ABRDdPmgdnPX4XP4H97DhnSqVhHUk9uDmUnos,1708
 wintertoo/data/summer_fields.txt,sha256=5Sc7MBUacelzaq1KHSLmfAyZ3WB5YifMNwKRjBRBcRk,52684603
 wintertoo/data/winter_fields.txt,sha256=TxySQTmJXCCgaf-oC1gzOYQb2Vr26KEKdJxqrZHHet0,3529364
 wintertoo/models/__init__.py,sha256=c2GEbIHvOT34IhpiMyqA7Tn83hEmnwx6Q7BuxURp97k,379
 wintertoo/models/image.py,sha256=VdlyF_goBMzmAmMHSIevEbheQOLMzFdxz10AK5Wwmqw,4066
 wintertoo/models/program.py,sha256=mtewVnt7NxSK0hxX8aUO8qehEtOi_Cieli4voCCRh4I,1804
-wintertoo/models/too.py,sha256=SXaAx_nkPyqYaUS7UChA86TkeKrIOqvxccrNXaXXvbo,6098
-wintertoo-1.6.0.dist-info/LICENSE,sha256=1-4yY2S7St-8Koy4JGheNG9QPkwff7831u2JITQ2oQs,1063
-wintertoo-1.6.0.dist-info/METADATA,sha256=ZR_BamQRW2Ie9JUYgvPrso09yzidNa46pC-D6_PIoGo,2513
-wintertoo-1.6.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wintertoo-1.6.0.dist-info/top_level.txt,sha256=6SMjMBzaNrD77erdCiVcRTrPZ-x98SDX43akRjWj4T8,10
-wintertoo-1.6.0.dist-info/RECORD,,
+wintertoo/models/too.py,sha256=HIiTA8Ky9z6lheJHAgO2bitdC2j_CvVj2dLfTQgnAWQ,6891
+wintertoo-1.6.2.dist-info/LICENSE,sha256=1-4yY2S7St-8Koy4JGheNG9QPkwff7831u2JITQ2oQs,1063
+wintertoo-1.6.2.dist-info/METADATA,sha256=ZD6yQr5SMqwy0ZPGKSIsqB8EfCWv62YpxFlkVWBvAD4,2513
+wintertoo-1.6.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wintertoo-1.6.2.dist-info/top_level.txt,sha256=6SMjMBzaNrD77erdCiVcRTrPZ-x98SDX43akRjWj4T8,10
+wintertoo-1.6.2.dist-info/RECORD,,