[wip]

Author: siiptuo

scripts/cloudnet.py

@@ -213,7 +213,7 @@ def process_main(args):
     date = args.start
     while date <= args.stop:
         for site_id in args.sites:
-            site = processor.get_site(site_id)
+            site = processor.get_site(site_id, date)
             for product_id in args.products:
                 product = processor.get_product(product_id)
                 try:

scripts/worker.py

@@ -85,8 +85,8 @@ def process_task(self) -> bool:
         self.logger.clear_memory()
         logging.info(f"Processing task: {task}")
         try:
-            site = self.processor.get_site(task["siteId"])
             date = datetime.date.fromisoformat(task["measurementDate"])
+            site = self.processor.get_site(task["siteId"], date)
             product = self.processor.get_product(task["productId"])
             params: ProcessParams
             with TemporaryDirectory() as directory:

src/processing/processor.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 from typing import Literal
 
+import requests
 from cloudnetpy.exceptions import PlottingError
 from cloudnetpy.model_evaluation.plotting.plotting import generate_L3_day_plots
 from cloudnetpy.plotting import Dimensions, PlotParameters, generate_figure
@@ -93,8 +94,20 @@ def __init__(
         self.pid_utils = pid_utils
         self.dvas = dvas
 
-    def get_site(self, site_id: str) -> Site:
+    def get_site(self, site_id: str, date: datetime.date | None = None) -> Site:
         site = self.md_api.get(f"api/sites/{site_id}")
+        if site["latitude"] is None and site["longitude"] is None:
+            if date is None:
+                raise ValueError("Date and latitude/longitude not specified")
+            try:
+                location = self.md_api.get(
+                    f"api/sites/{site_id}/locations/{date.isoformat()}"
+                )
+                site["latitude"] = location["latitude"]
+                site["longitude"] = location["longitude"]
+            except requests.exceptions.HTTPError as err:
+                if err.response.status_code != 404:
+                    raise err
         return Site(
             id=site["id"],
             name=site["humanReadableName"],