Cleanup, logging and formatting with ruff

metno · Sep 16, 2024 · eabe83c · eabe83c
1 parent 354910e
commit eabe83c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/pyaro_readers/eeareader/EEATimeseriesReader.py b/src/pyaro_readers/eeareader/EEATimeseriesReader.py
@@ -29,7 +29,6 @@
 FLAGS_VALID = {-99: False, -1: False, 1: True, 2: False, 3: False, 4: True}
 VERIFIED_LVL = [1, 2, 3]
 DATA_TOML = path.join(path.dirname(__file__), "data.toml")
-# Path(__file__).parent / "data.toml"
 FILL_COUNTRY_FLAG = False
 
 TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
@@ -75,7 +74,6 @@ def __init__(
         self,
         filename,
         filters={},
-        fill_country_flag: bool = FILL_COUNTRY_FLAG,
     ):
         self._filename = filename
         self._stations = {}
@@ -146,6 +144,7 @@ def _read_polars(self, filters, filename) -> None:
                         polars.read_parquet(file), (start_date, end_date)
                     )
                     if lf.is_empty():
+                        logger.info(f"Data for file {file} is empty. Skipping")
                         continue
                 else:
                     lf = polars.read_parquet(file)
@@ -176,6 +175,9 @@ def _read_polars(self, filters, filename) -> None:
                 try:
                     station_metadata = self.metadata[df.row(0)[0].split("/")[-1]]
                 except:
+                    logger.info(
+                        f"Could not extract the metadata for {df.row(0)[0].split("/")[-1]}"
+                    )
                     continue
 
                 file_unit = self._convert_unit(df.row(0)[df.get_column_index("Unit")])
@@ -249,6 +251,9 @@ def _read_metadata(self, folder: str) -> dict:
                     lat = float(words[4])
                     alt = float(words[5])
                 except:
+                    logger.info(
+                        f"Could not interpret lat, lon, alt for line {line} in metadata. Skipping"
+                    )
                     continue
                 metadata[words[0]] = {
                     "lon": lon,

diff --git a/src/pyaro_readers/eeareader/eeadownloader.py b/src/pyaro_readers/eeareader/eeadownloader.py
@@ -133,7 +133,10 @@ def make_pollutant_url_list(self, pollutants: list[str]) -> list[str]:
 
     @app.command(name="download")
     def download_default(
-        self, save_loc: Path, dataset: int = DATABASES["VERIFIED"], pollutants: list | None= None,
+        self,
+        save_loc: Path,
+        dataset: int = DATABASES["VERIFIED"],
+        pollutants: list | None = None,
     ) -> None:
         if not save_loc.is_dir():
             save_loc.mkdir(parents=True, exist_ok=True)
@@ -265,21 +268,15 @@ def postprocess(
 
 
 if __name__ == "__main__":
-    #app()
+    # app()
 
     pollutants = [
         "SO2",
         "SO4--",
         "SO4 (H2SO4 aerosols) (SO4--)",
     ]
     eead = EEADownloader()
-    eead.download_default(
-        Path(
-            "/nird/home/dulte/data/EEA"
-        ),
-        pollutants = pollutants
-
-    )
+    eead.download_default(Path("/nird/home/dulte/data/EEA"), pollutants=pollutants)
 
 # eead.postprocess_all_files(
 #     Path(

diff --git a/src/pyaro_readers/eeareader/utils/generate_data_toml.py b/src/pyaro_readers/eeareader/utils/generate_data_toml.py
@@ -31,9 +31,7 @@
     "HNO3",
 ]
 
-changeunit = {
-    "SO4--" : '{ unit = "µg /m3", factor = 2995.82 }'
-}
+changeunit = {"SO4--": '{ unit = "µg /m3", factor = 2995.82 }'}
 
 with open("response.json", "r") as f:
     properties = {}
@@ -60,7 +58,7 @@
         target.write(f'"{poll}",\n')
     target.write("]\n\n")
 
-    target.write('[changeunits]\n')
+    target.write("[changeunits]\n")
     for s in changeunit:
         target.write(f'"{s}" = {changeunit[s]}\n')
     target.write("]\n\n")