Update

Author: robertdstein

example.env

@@ -1 +1,2 @@
-WINTER_API_LOCAL="False"
+WINTER_API_LOCAL="False"
+WINTER_API_PROGRAM=

notebooks/Info_2a_ToO_Parameters.ipynb

@@ -11,7 +11,12 @@
     "from IPython.display import JSON\n",
     "import json\n",
     "from winterapi import WinterAPI\n",
-    "from wintertoo.models import SummerFieldToO, SummerRaDecToO, WinterFieldToO, WinterRaDecToO"
+    "from wintertoo.models import (\n",
+    "    SummerFieldToO,\n",
+    "    SummerRaDecToO,\n",
+    "    WinterFieldToO,\n",
+    "    WinterRaDecToO,\n",
+    ")"
    ]
   },
   {
@@ -320,7 +325,7 @@
    ],
    "source": [
     "# end time in the past\n",
-    "too = WinterFieldToO(field_id=55, end_time_mjd=58000.)\n",
+    "too = WinterFieldToO(field_id=55, end_time_mjd=58000.0)\n",
     "too"
    ]
   },
@@ -531,7 +536,7 @@
     }
    ],
    "source": [
-    "too = WinterRaDecToO(ra_deg=300., dec_deg=51.)\n",
+    "too = WinterRaDecToO(ra_deg=300.0, dec_deg=51.0)\n",
     "too"
    ]
   },
@@ -563,7 +568,7 @@
     }
    ],
    "source": [
-    "too = WinterRaDecToO(ra_deg=300., dec_deg=51., use_field_grid=False)\n",
+    "too = WinterRaDecToO(ra_deg=300.0, dec_deg=51.0, use_field_grid=False)\n",
     "too"
    ]
   },

notebooks/Info_2b_Submitting_ToOs.ipynb

@@ -333,10 +333,7 @@
     }
    ],
    "source": [
-    "local_schedule = winter.build_schedule_locally(\n",
-    "    program_name=\"202XA000\",\n",
-    "    data=too_list\n",
-    ")\n",
+    "local_schedule = winter.build_schedule_locally(program_name=\"202XA000\", data=too_list)\n",
     "local_schedule"
    ]
   },
@@ -362,9 +359,7 @@
    "outputs": [],
    "source": [
     "api_res, api_schedule = winter.submit_too(\n",
-    "    program_name=\"202XA000\",\n",
-    "    data=too_list,\n",
-    "    submit_trigger=False\n",
+    "    program_name=\"202XA000\", data=too_list, submit_trigger=False\n",
     ")"
    ]
   },

tests/testdata/test_schedule.csv

@@ -1,7 +1,7 @@
-targName,raDeg,decDeg,fieldID,filter,visitExpTime,singleExpTime,priority,progPI,progName,progID,validStart,validStop,observed,maxAirmass,ditherNumber,ditherStepSize,bestDetector,obsHistID
-test_field,211.56398,54.0,3944,Y,300.0,33.333333333333336,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,9,90.0,True,0
-test_field,211.56398,54.0,3944,J,300.0,33.333333333333336,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,9,90.0,True,1
-test_field,211.56398,54.0,3944,Hs,300.0,33.333333333333336,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,9,90.0,True,2
-test_radec,210.910674637,54.3116510708,999999999,Y,300.0,37.5,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,8,90.0,True,3
-test_radec,210.910674637,54.3116510708,999999999,J,300.0,37.5,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,8,90.0,True,4
-test_radec,210.910674637,54.3116510708,999999999,Hs,300.0,37.5,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,8,90.0,True,5
+targName,raDeg,decDeg,fieldID,filter,visitExpTime,singleExpTime,priority,progPI,progName,progID,validStart,validStop,observed,maxAirmass,ditherNumber,ditherStepSize,bestDetector,camera,obsHistID
+test_field,211.56398,54.0,3944,Y,300.0,33.333333333333336,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,9,90.0,True,winter,0
+test_field,211.56398,54.0,3944,J,300.0,33.333333333333336,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,9,90.0,True,winter,1
+test_field,211.56398,54.0,3944,Hs,300.0,33.333333333333336,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,9,90.0,True,winter,2
+test_radec,210.910674637,54.3116510708,999999999,Y,300.0,37.5,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,8,90.0,True,winter,3
+test_radec,210.910674637,54.3116510708,999999999,J,300.0,37.5,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,8,90.0,True,winter,4
+test_radec,210.910674637,54.3116510708,999999999,Hs,300.0,37.5,50.0,Stein,2023A999,0,62721.1894969287,62722.1894969452,False,2.0,8,90.0,True,winter,5

winterapi/base_api.py

@@ -41,13 +41,13 @@ def clean_data(data):
         if isinstance(data, list):
             convert = json.dumps(
                 [
-                    x.model_dump(exclude=set(x.model_computed_fields.keys()))
+                    x.model_dump(exclude=set(x.__class__.model_computed_fields.keys()))
                     for x in data
                 ]
             )
         elif isinstance(data, BaseModel):
             convert = json.dumps(
-                [data.model_dump(exclude=set(data.model_computed_fields.keys()))]
+                [data.model_dump(exclude=set(data.__class__.model_computed_fields.keys()))]
             )
         else:
             err = f"Unrecognised data type {type(data)}"

winterapi/configure_tests.py

@@ -3,9 +3,12 @@
 """
 
 import os
+from dotenv import load_dotenv
 
 from winterapi import WinterAPI
 
+load_dotenv()
+
 winter = WinterAPI()