Catch and ignore space launch API errors
This commit is contained in:
parent
0c36591e2f
commit
d1898686e9
|
@ -16,7 +16,7 @@ Summary = dict[str, typing.Any]
|
||||||
ttl = 60 * 60 * 2 # two hours
|
ttl = 60 * 60 * 2 # two hours
|
||||||
|
|
||||||
|
|
||||||
def next_launch_api_data(rocket_dir: str, limit: int = 200) -> StrDict:
|
def next_launch_api_data(rocket_dir: str, limit: int = 200) -> StrDict | None:
|
||||||
"""Get the next upcoming launches from the API."""
|
"""Get the next upcoming launches from the API."""
|
||||||
now = datetime.now()
|
now = datetime.now()
|
||||||
filename = os.path.join(rocket_dir, now.strftime("%Y-%m-%d_%H:%M:%S.json"))
|
filename = os.path.join(rocket_dir, now.strftime("%Y-%m-%d_%H:%M:%S.json"))
|
||||||
|
@ -24,14 +24,19 @@ def next_launch_api_data(rocket_dir: str, limit: int = 200) -> StrDict:
|
||||||
|
|
||||||
params: dict[str, str | int] = {"limit": limit}
|
params: dict[str, str | int] = {"limit": limit}
|
||||||
r = requests.get(url, params=params)
|
r = requests.get(url, params=params)
|
||||||
data: StrDict = r.json()
|
try:
|
||||||
|
data: StrDict = r.json()
|
||||||
|
except requests.exceptions.JSONDecodeError:
|
||||||
|
return None
|
||||||
open(filename, "w").write(r.text)
|
open(filename, "w").write(r.text)
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
def next_launch_api(rocket_dir: str, limit: int = 200) -> list[Launch]:
|
def next_launch_api(rocket_dir: str, limit: int = 200) -> list[Launch] | None:
|
||||||
"""Get the next upcoming launches from the API."""
|
"""Get the next upcoming launches from the API."""
|
||||||
data = next_launch_api_data(rocket_dir, limit)
|
data = next_launch_api_data(rocket_dir, limit)
|
||||||
|
if not data:
|
||||||
|
return None
|
||||||
return [summarize_launch(launch) for launch in data["results"]]
|
return [summarize_launch(launch) for launch in data["results"]]
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -114,6 +114,7 @@ def update_thespacedevs(config: flask.config.Config) -> None:
|
||||||
rocket_dir = os.path.join(config["DATA_DIR"], "thespacedevs")
|
rocket_dir = os.path.join(config["DATA_DIR"], "thespacedevs")
|
||||||
|
|
||||||
existing_data = agenda.thespacedevs.load_cached_launches(rocket_dir)
|
existing_data = agenda.thespacedevs.load_cached_launches(rocket_dir)
|
||||||
|
assert existing_data
|
||||||
prev_launches = {
|
prev_launches = {
|
||||||
slug: get_launch_by_slug(existing_data, slug)
|
slug: get_launch_by_slug(existing_data, slug)
|
||||||
for slug in config["FOLLOW_LAUNCHES"]
|
for slug in config["FOLLOW_LAUNCHES"]
|
||||||
|
@ -121,6 +122,8 @@ def update_thespacedevs(config: flask.config.Config) -> None:
|
||||||
|
|
||||||
t0 = time()
|
t0 = time()
|
||||||
data = agenda.thespacedevs.next_launch_api_data(rocket_dir)
|
data = agenda.thespacedevs.next_launch_api_data(rocket_dir)
|
||||||
|
if not data:
|
||||||
|
return # thespacedevs API call failed
|
||||||
cur_launches = {
|
cur_launches = {
|
||||||
slug: get_launch_by_slug(data, slug) for slug in config["FOLLOW_LAUNCHES"]
|
slug: get_launch_by_slug(data, slug) for slug in config["FOLLOW_LAUNCHES"]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue