<<2025-08-11 11:39>> Bugfix: Fixed issue with the endpoints containing the Enum name, rather than the value.

CHANGES:
- Aforementioned bugfix
- Updated dependencies
- Changed the Dockerfile to use Python 3.11
- Dropped Python 3.10

Author: rflinnenbank

.github/workflows/pull-request-workflow.yml

@@ -9,7 +9,7 @@ jobs:
   tests-and-sonarcloud:
     strategy:
       matrix:
-        version: ["3.10", "3.11"]  # TODO: Get Python versions from the project
+        version: ["3.11"]
     name: Testing and updating SonarCloud
     runs-on: ubuntu-latest
     steps:
@@ -42,11 +42,11 @@ jobs:
           poetry run coverage run -m pytest
           poetry run coverage report
       # Generate XML Coverage result file
-      - if: matrix.version == '3.10'
+      - if: matrix.version == '3.11'
         name: Generate Coverage XML file
         run: poetry run coverage xml
       # Upload coverage data to SonarCloud.io
-      - if: matrix.version == '3.10'
+      - if: matrix.version == '3.11'
         name: Update SonarCloud.io
         uses: SonarSource/sonarcloud-github-action@master
         env:

.github/workflows/release-candidate-workflow.yml

@@ -10,7 +10,7 @@ jobs:
   tests-and-sonarcloud:
     strategy:
       matrix:
-        version: ["3.10", "3.11"]  # TODO: Get Python versions from the project
+        version: ["3.11"]  # TODO: Get Python versions from the project
     name: Testing and updating SonarCloud
     runs-on: ubuntu-latest
     steps:
@@ -43,11 +43,11 @@ jobs:
           poetry run coverage run -m pytest
           poetry run coverage report
       # Generate XML Coverage result file
-      - if: matrix.version == '3.10'
+      - if: matrix.version == '3.11'
         name: Generate Coverage XML file
         run: poetry run coverage xml
       # Upload coverage data to SonarCloud.io
-      - if: matrix.version == '3.10'
+      - if: matrix.version == '3.11'
         name: Update SonarCloud.io
         uses: SonarSource/sonarcloud-github-action@master
         env:

.github/workflows/version-update-workflow.yml

@@ -10,7 +10,7 @@ jobs:
   tests-and-sonarcloud:
     strategy:
       matrix:
-        version: ["3.10", "3.11"]  # TODO: Get Python versions from the project
+        version: ["3.11"]  # TODO: Get Python versions from the project
     name: Testing and updating SonarCloud
     runs-on: ubuntu-latest
     steps:
@@ -43,11 +43,11 @@ jobs:
           poetry run coverage run -m pytest
           poetry run coverage report
       # Generate XML Coverage result file
-      - if: matrix.version == '3.10'
+      - if: matrix.version == '3.11'
         name: Generate Coverage XML file
         run: poetry run coverage xml
       # Upload coverage data to SonarCloud.io
-      - if: matrix.version == '3.10'
+      - if: matrix.version == '3.11'
         name: Update SonarCloud.io
         uses: SonarSource/sonarcloud-github-action@master
         env:
@@ -75,7 +75,7 @@ jobs:
       - name: Python setup
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       # Install required dependencies
       - name: Install dependencies
         run: poetry install -vv --no-interaction --without dev

Dockerfile

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 
-FROM python:3.10.18-bullseye AS base-image
+FROM python:3.11.13-bullseye AS base-image
 
 RUN apt-get update &&  \
     apt-get -y install libeccodes-dev &&  \
@@ -38,7 +38,6 @@ ENV PATH="$APP_HOME/.venv/bin:$PATH"
 
 # --- DEV image --
 FROM base-image AS dev-image
-# TODO: Hookup SSH interface
 
 USER $APP_USER
 CMD ["ls", "-l"]

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "weather_provider_api"
-version = "2.73.0"
+version = "2.74.0"
 description = "Weather Provider Libraries and API"
 authors = ["Verbindingsteam", "Raoul Linnenbank <[email protected]>"]
 license = "MPL-2.0"
@@ -11,18 +11,18 @@ include = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
-fastapi = "^0.115.12"
+python = ">=3.11,<3.12"
+fastapi = "^0.116.1"
 requests = "^2.32.3"
 geopy = "^2.4.1"
-numpy = "^2.2.4"
+numpy = "^2.3.2"
 gunicorn = "^23.0.0"
-lxml = "^5.3.1"
+lxml = "^6.0.0"
 starlette-prometheus = "^0.10.0"
 pandas = "^2.2.3"
 xarray = "^2025.3.0"
 cfgrib = "^0.9.15.0"
-uvicorn = "^0.34.0"
+uvicorn = "^0.35.0"
 slowapi = "^0.1.9"
 loguru = "^0.7.3"
 email-validator = "^2.2.0"

pyproject.toml

@@ -126,7 +126,7 @@ def _era5_update_month(
         month_file_name = month_file.with_suffix(Era5FileSuffixes.UNFORMATTED)
 
         # Only the first day of each month in test mode, otherwise all days:
-        day = [str(i) for i in list(range(1, 32))] if not test_mode else ["1"]
+        day = [str(i) for i in range(1, 32)] if not test_mode else ["1"]
 
         try:
             download_era5_data(
@@ -346,15 +346,13 @@ def _recombine_multiple_files(unformatted_file: Path) -> None:
     with zipfile.ZipFile(unformatted_file, "r") as zip_ref:
         zip_ref.extractall(temp_dir)
 
-    concatenated_dataset = xr.Dataset()
     files_to_load_in_order = [
         "data_stream-oper_stepType-instant",
         "data_stream-oper_stepType-accum",
         # TODO: Add the following file back in when we can properly handle it
         # "data_stream-wave_stepType-instant",  # Something about this data doesn't mesh well anymore with the rest...
     ]
 
-    # TODO: Load, convert to dataframe, merge, convert back to xarray
     concatenated_dataset = xr.Dataset()
     for filename in files_to_load_in_order:
         file_path = Path(temp_dir).joinpath(f"{filename}.nc")
@@ -373,7 +371,6 @@ def _recombine_multiple_files(unformatted_file: Path) -> None:
             )
 
     concatenated_dataset.to_netcdf(unformatted_file, format="NETCDF4", engine="netcdf4")
-    # raise ValueError("This is not working yet")
 
 
 def download_era5_data(
@@ -384,9 +381,9 @@ def download_era5_data(
     """A function to download ERA5 data."""
     try:
         CDS_CLIENT.retrieve(
-            dataset,
-            cds_request.request_parameters,
-            target_location,
+            name=dataset.value,
+            request=cds_request.request_parameters,
+            target=target_location,
         )
 
     except Exception as e: