Skip to content

Commit 77d2629

Browse files
robertdsteinrobertdstein
authored
V1.6 (#67)
* Update for SPRING * Update * Update * Update * Update * Update
1 parent 9e78934 commit 77d2629

15 files changed

+1517
-272
lines changed

‎.github/workflows/pylint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
pip install --editable ".[dev]"
2222
- name: Analysing the code with pylint
2323
run: |
24-
pylint winterapi --fail-under=10.00
24+
pylint winterapi --fail-under=9.9

‎example.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
WINTER_API_LOCAL="False"
2+
WINTER_API_PROGRAM=

‎notebooks/Example_1_Setting_Up_Credentials.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
}
5353
],
5454
"source": [
55-
"print(f\"Using server {BASE_URL}\") # Should show the URL of the API\n",
55+
"print(f\"Using server {BASE_URL}\") # Should show the URL of the API\n",
5656
"print(f\"Pinging server: {winter.ping()}\")"
5757
]
5858
},

‎notebooks/Example_2_Submitting_a_ToO.ipynb‎

Lines changed: 662 additions & 97 deletions
Large diffs are not rendered by default.

‎notebooks/Example_3_Interacting_with_Observatory_Queue.ipynb‎

Lines changed: 700 additions & 133 deletions
Large diffs are not rendered by default.

‎notebooks/Example_4_Finding_Observatory_Data.ipynb‎

Lines changed: 68 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@
6767
}
6868
],
6969
"source": [
70-
"res, images = winter.query_images_by_program(program_name, image_type=\"exposure\", start_date=start_date, end_date=end_date)"
70+
"res, images = winter.query_images_by_program(\n",
71+
" program_name, image_type=\"exposure\", start_date=start_date, end_date=end_date\n",
72+
")"
7173
]
7274
},
7375
{
@@ -415,7 +417,13 @@
415417
}
416418
],
417419
"source": [
418-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"exposure\", target_name=target_name, start_date=start_date, end_date=end_date)"
420+
"res, images = winter.query_images_by_target_name(\n",
421+
" program_name,\n",
422+
" image_type=\"exposure\",\n",
423+
" target_name=target_name,\n",
424+
" start_date=start_date,\n",
425+
" end_date=end_date,\n",
426+
")"
419427
]
420428
},
421429
{
@@ -679,7 +687,14 @@
679687
}
680688
],
681689
"source": [
682-
"res, images = winter.query_images_by_cone(program_name, image_type=\"exposure\", ra_deg=150.959309, dec_deg=17.825813, start_date=start_date, end_date=end_date)"
690+
"res, images = winter.query_images_by_cone(\n",
691+
" program_name,\n",
692+
" image_type=\"exposure\",\n",
693+
" ra_deg=150.959309,\n",
694+
" dec_deg=17.825813,\n",
695+
" start_date=start_date,\n",
696+
" end_date=end_date,\n",
697+
")"
683698
]
684699
},
685700
{
@@ -950,10 +965,14 @@
950965
],
951966
"source": [
952967
"res, images = winter.query_images_by_rectangle(\n",
953-
" program_name, start_date=start_date, end_date=end_date,\n",
954-
" ra_min_deg = 146., ra_max_deg=147.,\n",
955-
" dec_min_deg = -5., dec_max_deg = -4.,\n",
956-
" image_type=\"stack\"\n",
968+
" program_name,\n",
969+
" start_date=start_date,\n",
970+
" end_date=end_date,\n",
971+
" ra_min_deg=146.0,\n",
972+
" ra_max_deg=147.0,\n",
973+
" dec_min_deg=-5.0,\n",
974+
" dec_max_deg=-4.0,\n",
975+
" image_type=\"stack\",\n",
957976
")"
958977
]
959978
},
@@ -1302,7 +1321,13 @@
13021321
}
13031322
],
13041323
"source": [
1305-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"exposure\", target_name=target_name, start_date=start_date, end_date=end_date)\n",
1324+
"res, images = winter.query_images_by_target_name(\n",
1325+
" program_name,\n",
1326+
" image_type=\"exposure\",\n",
1327+
" target_name=target_name,\n",
1328+
" start_date=start_date,\n",
1329+
" end_date=end_date,\n",
1330+
")\n",
13061331
"images"
13071332
]
13081333
},
@@ -2253,7 +2278,13 @@
22532278
}
22542279
],
22552280
"source": [
2256-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"raw\", target_name=target_name, start_date=start_date, end_date=end_date)\n",
2281+
"res, images = winter.query_images_by_target_name(\n",
2282+
" program_name,\n",
2283+
" image_type=\"raw\",\n",
2284+
" target_name=target_name,\n",
2285+
" start_date=start_date,\n",
2286+
" end_date=end_date,\n",
2287+
")\n",
22572288
"images"
22582289
]
22592290
},
@@ -2414,7 +2445,13 @@
24142445
}
24152446
],
24162447
"source": [
2417-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"science\", target_name=target_name, start_date=start_date, end_date=end_date)\n",
2448+
"res, images = winter.query_images_by_target_name(\n",
2449+
" program_name,\n",
2450+
" image_type=\"science\",\n",
2451+
" target_name=target_name,\n",
2452+
" start_date=start_date,\n",
2453+
" end_date=end_date,\n",
2454+
")\n",
24182455
"images"
24192456
]
24202457
},
@@ -2520,7 +2557,13 @@
25202557
}
25212558
],
25222559
"source": [
2523-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"stack\", target_name=target_name, start_date=start_date, end_date=end_date)\n",
2560+
"res, images = winter.query_images_by_target_name(\n",
2561+
" program_name,\n",
2562+
" image_type=\"stack\",\n",
2563+
" target_name=target_name,\n",
2564+
" start_date=start_date,\n",
2565+
" end_date=end_date,\n",
2566+
")\n",
25242567
"images"
25252568
]
25262569
},
@@ -2625,7 +2668,13 @@
26252668
}
26262669
],
26272670
"source": [
2628-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"diff\", target_name=target_name, start_date=start_date, end_date=end_date)\n",
2671+
"res, images = winter.query_images_by_target_name(\n",
2672+
" program_name,\n",
2673+
" image_type=\"diff\",\n",
2674+
" target_name=target_name,\n",
2675+
" start_date=start_date,\n",
2676+
" end_date=end_date,\n",
2677+
")\n",
26292678
"images"
26302679
]
26312680
},
@@ -2732,7 +2781,13 @@
27322781
}
27332782
],
27342783
"source": [
2735-
"res, images = winter.query_images_by_target_name(program_name, image_type=\"avro\", target_name=target_name, start_date=start_date, end_date=end_date)\n",
2784+
"res, images = winter.query_images_by_target_name(\n",
2785+
" program_name,\n",
2786+
" image_type=\"avro\",\n",
2787+
" target_name=target_name,\n",
2788+
" start_date=start_date,\n",
2789+
" end_date=end_date,\n",
2790+
")\n",
27362791
"images"
27372792
]
27382793
}

‎notebooks/Example_5_Downloading_Observatory_Data.ipynb‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@
207207
],
208208
"source": [
209209
"# Let's start by doing an image query\n",
210-
"res, images = winter.query_images_by_program(program_name, image_type=image_type, start_date=\"20240129\")\n",
210+
"res, images = winter.query_images_by_program(\n",
211+
" program_name, image_type=image_type, start_date=\"20240129\"\n",
212+
")\n",
211213
"images"
212214
]
213215
},
@@ -278,7 +280,9 @@
278280
}
279281
],
280282
"source": [
281-
"res, output_path = winter.download_image_list(program_name, image_type=image_type, paths=savepaths)\n",
283+
"res, output_path = winter.download_image_list(\n",
284+
" program_name, image_type=image_type, paths=savepaths\n",
285+
")\n",
282286
"print(f\"Saved images to {output_path}\")\n",
283287
"print(res.headers)\n",
284288
"res.raise_for_status()"

‎notebooks/Info_2a_ToO_Parameters.ipynb‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
"from IPython.display import JSON\n",
1212
"import json\n",
1313
"from winterapi import WinterAPI\n",
14-
"from wintertoo.models import SummerFieldToO, SummerRaDecToO, WinterFieldToO, WinterRaDecToO"
14+
"from wintertoo.models import (\n",
15+
" SummerFieldToO,\n",
16+
" SummerRaDecToO,\n",
17+
" WinterFieldToO,\n",
18+
" WinterRaDecToO,\n",
19+
")"
1520
]
1621
},
1722
{
@@ -320,7 +325,7 @@
320325
],
321326
"source": [
322327
"# end time in the past\n",
323-
"too = WinterFieldToO(field_id=55, end_time_mjd=58000.)\n",
328+
"too = WinterFieldToO(field_id=55, end_time_mjd=58000.0)\n",
324329
"too"
325330
]
326331
},
@@ -531,7 +536,7 @@
531536
}
532537
],
533538
"source": [
534-
"too = WinterRaDecToO(ra_deg=300., dec_deg=51.)\n",
539+
"too = WinterRaDecToO(ra_deg=300.0, dec_deg=51.0)\n",
535540
"too"
536541
]
537542
},
@@ -563,7 +568,7 @@
563568
}
564569
],
565570
"source": [
566-
"too = WinterRaDecToO(ra_deg=300., dec_deg=51., use_field_grid=False)\n",
571+
"too = WinterRaDecToO(ra_deg=300.0, dec_deg=51.0, use_field_grid=False)\n",
567572
"too"
568573
]
569574
},

‎notebooks/Info_2b_Submitting_ToOs.ipynb‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,7 @@
333333
}
334334
],
335335
"source": [
336-
"local_schedule = winter.build_schedule_locally(\n",
337-
" program_name=\"202XA000\",\n",
338-
" data=too_list\n",
339-
")\n",
336+
"local_schedule = winter.build_schedule_locally(program_name=\"202XA000\", data=too_list)\n",
340337
"local_schedule"
341338
]
342339
},
@@ -362,9 +359,7 @@
362359
"outputs": [],
363360
"source": [
364361
"api_res, api_schedule = winter.submit_too(\n",
365-
" program_name=\"202XA000\",\n",
366-
" data=too_list,\n",
367-
" submit_trigger=False\n",
362+
" program_name=\"202XA000\", data=too_list, submit_trigger=False\n",
368363
")"
369364
]
370365
},

‎pyproject.toml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "winterapi"
7-
version = "1.5.0"
7+
version = "1.6.0"
88
description = ""
99
authors = [
1010
{name = "Robert Stein", email = "rdstein@caltech.edu"}
@@ -36,13 +36,14 @@ dependencies = [
3636
"jupyter",
3737
"backoff",
3838
"pydantic",
39-
"wintertoo>=1.8.0"
39+
"wintertoo>=1.9.1",
40+
"python-dotenv"
4041
]
4142
[project.optional-dependencies]
4243
dev = [
43-
"black == 24.4.2",
44-
"isort == 5.13.2",
45-
"pylint == 3.2.2",
44+
"black >= 26.1.0",
45+
"isort == 7.0.0",
46+
"pylint == 4.0.4",
4647
"coveralls",
4748
]
4849

0 commit comments

Comments
 (0)