wintertoo 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

wintertoo/data/observing_request_schema.json

@@ -17,7 +17,7 @@
     "ditherNumber": {"type": "integer", "default": 1},
     "ditherStepSize": {"type": "number", "comment": "arcsec", "default": 600.0},
     "fieldID": {"type": "integer", "default": 999999999},
-    "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817", "default": null}
+    "targName": {"type": ["string", "null"], "comment": "Target name e.g. GW170817"}
   },
   "required": [
     "obsHistID",

wintertoo/models/too.py

@@ -62,11 +62,6 @@ class ToORequest(BaseModel):
         le=5,
         title="Allowed airmass range",
     )
-    target_name: Optional[str] = Field(
-        title="Target name",
-        default=get_default_value("targName"),
-        examples=["SN2021abc", "GW170817_A", "IC191001A_1"],
-    )
 
     @field_validator("end_time_mjd")
     @classmethod
@@ -113,6 +108,8 @@ class ToORequest(BaseModel):
                 f"while you have selected {t_per_dither} s per dither"
             )
 
+        return self
+
     model_config = ConfigDict(extra="forbid")
 
 

wintertoo/schedule.py

@@ -59,7 +59,6 @@ def make_schedule(
                     "maxAirmass": too.max_airmass,
                     "ditherNumber": too.n_dither,
                     "ditherStepSize": too.dither_distance,
-                    "targName": too.target_name,
                 }
                 all_entries.append(new)
 
@@ -80,7 +79,7 @@ def build_schedule_list(
     too: FullTooRequest,
     program: Program,
     csv_save_file: str = None,
-):
+) -> pd.DataFrame:
     """
     Generate a full schedule request for single target,
     with all of RA, Dec and Field ID provided
@@ -119,7 +118,7 @@ def schedule_ra_dec(
     else:
         field_id = get_default_value("fieldID")
 
-    full_request = FullTooRequest(field_id=field_id, **too.dict())
+    full_request = FullTooRequest(field_id=field_id, **too.model_dump())
 
     schedule = make_schedule(
         toos=[full_request],
@@ -150,7 +149,7 @@ def schedule_field(
     ra_deg = float(field_details["RA"].iloc[0])
     dec_deg = float(field_details["Dec"].iloc[0])
 
-    full_request = FullTooRequest(ra_deg=ra_deg, dec_deg=dec_deg, **too.dict())
+    full_request = FullTooRequest(ra_deg=ra_deg, dec_deg=dec_deg, **too.model_dump())
 
     schedule = make_schedule(
         toos=[full_request],
@@ -186,7 +185,7 @@ def concat_toos(
                 program=program,
             )
         else:
-            err = f"Unrecognised type {type(too)}"
+            err = f"Unrecognised type {type(too)} for {too}"
             logger.error(err)
             raise WinterValidationError(err)
 

{wintertoo-0.4.1.dist-info → wintertoo-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wintertoo
-Version: 0.4.1
+Version: 0.4.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-0.4.1.dist-info → wintertoo-0.4.2.dist-info}/RECORD

@@ -2,20 +2,20 @@ wintertoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wintertoo/database.py,sha256=I-GP76aNmO1KDNbiEdpqsbHLVvTE791QwOqab6I_BHc,3019
 wintertoo/errors.py,sha256=iAFcy0z3A3bCnkJmAt_P-77fPaPHFGS1JbrK6O2dCEM,223
 wintertoo/fields.py,sha256=xxQs-dZeBeiqemOoTtL0iihyLwzDfrRS8Dqc9N73BfI,6028
-wintertoo/schedule.py,sha256=aWyukSfGtsAEfxkcXtoXKiVqYRZi5QQ4RneAbfKnbZk,5486
+wintertoo/schedule.py,sha256=jr6pOuA89Tlonm8bM0QinoHzGtHVgRLMv2z9TZdEF3c,5475
 wintertoo/submit.py,sha256=0Ok3EiwSMB26Wp8c3Y3xfhd2MRWrWCuNpHTxwu8MbcM,2410
 wintertoo/utils.py,sha256=BWgBZoSX5xfqURb2Nkvf3i6A_IcVYU2SoXFvp6ez7Xc,3306
 wintertoo/validate.py,sha256=R8GwP8DmDTSeDGEGZ16yW_2jgZqGNxcSqjLFw0f8O9E,8963
 wintertoo/data/__init__.py,sha256=XMHBEWA9_fioEFIbYZASV1t90JFi1gIAfNKyCRk2x54,1466
-wintertoo/data/observing_request_schema.json,sha256=L-mo_3ucFk5FS0ZYVlNpSpdggRC_KhqXdoTmxIt0rCA,1620
+wintertoo/data/observing_request_schema.json,sha256=A79t4FzTeZQgK3kA_087LT2xpS7EaDcjkKtNUqAWoog,1603
 wintertoo/data/summer_fields.txt,sha256=5Sc7MBUacelzaq1KHSLmfAyZ3WB5YifMNwKRjBRBcRk,52684603
 wintertoo/data/winter_fields.txt,sha256=TxySQTmJXCCgaf-oC1gzOYQb2Vr26KEKdJxqrZHHet0,3529364
 wintertoo/models/__init__.py,sha256=ZE3R3rCgijStd36IEs620NRP9R18Ay2CvYUZyJQvreA,234
 wintertoo/models/image.py,sha256=l0gsXM68AvN5NkD1JGMbFZkLz2Qx4EjzSL9Z3YjoOes,2484
 wintertoo/models/program.py,sha256=D3UyzkedmX5L5eM3wGY398GXf3v2g27b0FlHpnRCNhc,2145
-wintertoo/models/too.py,sha256=2flgAyoGkagfRaHWA3KyHeviPCVOh3TQdeoIGYgPAGo,5047
-wintertoo-0.4.1.dist-info/LICENSE,sha256=1-4yY2S7St-8Koy4JGheNG9QPkwff7831u2JITQ2oQs,1063
-wintertoo-0.4.1.dist-info/METADATA,sha256=svxdb4LgKNhBlVLWjiIKvOuBGTbTz4ck8FJb2iDpTB0,2499
-wintertoo-0.4.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-wintertoo-0.4.1.dist-info/top_level.txt,sha256=6SMjMBzaNrD77erdCiVcRTrPZ-x98SDX43akRjWj4T8,10
-wintertoo-0.4.1.dist-info/RECORD,,
+wintertoo/models/too.py,sha256=ZQyX2ak2-EeUa_S6nEg6EZrjt6h4l5EtmZFVvmkxUOM,4885
+wintertoo-0.4.2.dist-info/LICENSE,sha256=1-4yY2S7St-8Koy4JGheNG9QPkwff7831u2JITQ2oQs,1063
+wintertoo-0.4.2.dist-info/METADATA,sha256=5qjocQ4uiVn3gllBbaab1TSkSciPGGXRtEq6N25gnH0,2499
+wintertoo-0.4.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+wintertoo-0.4.2.dist-info/top_level.txt,sha256=6SMjMBzaNrD77erdCiVcRTrPZ-x98SDX43akRjWj4T8,10
+wintertoo-0.4.2.dist-info/RECORD,,