Merge pull request #47 from rodekruis/fix/various

Fix/various

Author: p-phung

retrievalpipeline/extract/extractors/api_json_extractor.py

@@ -54,6 +54,7 @@ def get_data(
             try:
                 response = self.get_response(api_url, params, headers)
                 json_data = self.get_data_from_response(response)
+                return list(self.validate_and_parse(json_data))
             except ApiResponseError as err:
                 if attempt < max_retries:
                     logger.warning(
@@ -65,10 +66,7 @@ def get_data(
                 else:
                     logger.warning(f"All {max_retries} attempts failed for {api_url}: {err}")
 
-        if json_data:
-            return list(self.validate_and_parse(json_data))
-        else:
-            return []
+        return []
 
     def get_response(
         self, api_url: str, params: dict[str, str] | None = None, headers: dict[str, str] | None = None

retrievalpipeline/extract/extractors/ecmwf.py

@@ -74,7 +74,7 @@ async def extract(self) -> None:
             logger.info(f"{self.name}: unzipped {zip_file.name}")
 
     async def _wait_on_results(
-        self, remote: Remote, offset: float = 0.1, factor: float = 1.3, max_waiting_time: int = 100
+        self, remote: Remote, offset: float = 0.1, factor: float = 1.3, max_waiting_time: int = 3600
     ) -> None:
         """Wait till job is done.