From f973938f53cc0bb309e43c09462ed484f7e4b831 Mon Sep 17 00:00:00 2001 From: Kai Vogelgesang Date: Thu, 18 May 2023 03:10:34 +0200 Subject: [PATCH] Run autoformat, Add readme --- README.md | 1 + sat_kalender/__main__.py | 4 +++- sat_kalender/n2yo.py | 3 ++- sat_kalender/satellites.py | 7 +++---- sat_kalender/settings.py | 8 ++++++-- 5 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..bd737e3 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# 🛰️ Sat-Kalender \ No newline at end of file diff --git a/sat_kalender/__main__.py b/sat_kalender/__main__.py index ad4dac7..740e833 100644 --- a/sat_kalender/__main__.py +++ b/sat_kalender/__main__.py @@ -34,7 +34,9 @@ class Pass: summary += " [!]" description = [] - description.append(f"Azimuth: {self.start_az} ({self.start_compass}) to {self.end_az} ({self.end_compass})") + description.append( + f"Azimuth: {self.start_az} ({self.start_compass}) to {self.end_az} ({self.end_compass})" + ) description.append("") description.append("Downlinks:") for downlink in self.downlinks: diff --git a/sat_kalender/n2yo.py b/sat_kalender/n2yo.py index db087bf..811e8f5 100644 --- a/sat_kalender/n2yo.py +++ b/sat_kalender/n2yo.py @@ -86,10 +86,11 @@ class N2YO: return RadioPasses.parse_obj(response) + @asynccontextmanager async def n2yo_api(key: str): api = N2YO(key) try: yield api finally: - await api.client.close() \ No newline at end of file + await api.client.close() diff --git a/sat_kalender/satellites.py b/sat_kalender/satellites.py index d2a77ed..5415586 100644 --- a/sat_kalender/satellites.py +++ b/sat_kalender/satellites.py @@ -4,10 +4,12 @@ from pydantic import BaseModel from .settings import settings + class Downlink(BaseModel): proto: str freq: float + class Satellite(BaseModel): name: str downlink: list[Downlink] @@ -17,7 +19,4 @@ def read_satellites() -> dict[int, Satellite]: with open(settings.satellites_file, "rb") as f: data = tomllib.load(f) - return { - int(k): Satellite.parse_obj(v) - for k, v in data.items() - } + return {int(k): Satellite.parse_obj(v) for k, v in data.items()} diff --git a/sat_kalender/settings.py b/sat_kalender/settings.py index 62ef2a9..bf4f3e0 100644 --- a/sat_kalender/settings.py +++ b/sat_kalender/settings.py @@ -1,5 +1,6 @@ from pydantic import BaseSettings, BaseModel + class Observer(BaseModel): latitude: float longitude: float @@ -7,19 +8,22 @@ class Observer(BaseModel): min_elevation: int = 15 good_elevation: int = 50 + class CalDav(BaseModel): uri: str username: str password: str + class Settings(BaseSettings): n2yo_api_key: str satellites_file: str = "satellites.toml" observer: Observer caldav: CalDav - + class Config: env_file = ".env" - env_nested_delimiter = '_' + env_nested_delimiter = "_" + settings = Settings()