Add gunicorn & CMEMS

Author: svenseeberg

opendrift/Dockerfile

@@ -1,2 +1,2 @@
 FROM opendrift/opendrift
-RUN pip3 install OWSLib
+RUN pip3 install OWSLib copernicusmarine --upgrade

opendrift_leeway_webgui/core/asgi.py

@@ -0,0 +1,23 @@
+"""
+ASGI config for django_leeway project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+"""
+
+import configparser
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault(
+    "DJANGO_SETTINGS_MODULE", "opendrift_leeway_webgui.core.settings"
+)
+
+# Read config from config file
+config = configparser.ConfigParser(interpolation=None)
+config.read("/etc/opendrift-leeway-webgui.ini")
+for section in config.sections():
+    for key, value in config.items(section):
+        os.environ.setdefault(f"LEEWAY_{key.upper()}", value)
+
+application = get_asgi_application()

opendrift_leeway_webgui/core/settings.py

@@ -52,6 +52,10 @@
     x.strip() for x in os.environ.get("LEEWAY_ALLOWED_HOSTS", "").split(",") if x
 ]
 
+CSRF_TRUSTED_ORIGINS = [
+    f"https://{host}" for host in ALLOWED_HOSTS
+]
+
 #: Enabled applications (see :setting:`django:INSTALLED_APPS`)
 INSTALLED_APPS = [
     "django.contrib.admin",
@@ -240,6 +244,10 @@
             "class": "logging.StreamHandler",
             "formatter": "console-colored",
         },
+        "console-always": {
+            "class": "logging.StreamHandler",
+            "formatter": "console-colored",
+        },
         "logfile": {
             "class": "logging.FileHandler",
             "filename": LOGFILE,
@@ -249,11 +257,11 @@
     "loggers": {
         # Loggers of opendrift-leeway-webgui django apps
         "opendrift_leeway_webgui": {
-            "handlers": ["console-colored", "logfile"],
+            "handlers": ["console-always", "logfile"],
             "level": LOG_LEVEL,
         },
         # Loggers of dependencies
-        "celery": {"handlers": ["console", "logfile"], "level": DEPS_LOG_LEVEL},
+        "celery": {"handlers": ["console-always", "logfile"], "level": "INFO"},
         "django": {"handlers": ["console", "logfile"], "level": DEPS_LOG_LEVEL},
         "dms2dec": {"handlers": ["console", "logfile"], "level": DEPS_LOG_LEVEL},
         "redis": {"handlers": ["console", "logfile"], "level": DEPS_LOG_LEVEL},
@@ -365,3 +373,6 @@
 #: In most email documentation this type of TLS connection is referred to as SSL. It is generally used on port 465.
 #: (see :setting:`django:EMAIL_USE_SSL`)
 EMAIL_USE_SSL = bool(strtobool(os.environ.get("LEEWAY_EMAIL_USE_SSL", "False")))
+
+COPERNICUSMARINE_SERVICE_USERNAME = os.environ.get("LEEWAY_COPERNICUSMARINE_SERVICE_USERNAME")
+COPERNICUSMARINE_SERVICE_PASSWORD = os.environ.get("LEEWAY_COPERNICUSMARINE_SERVICE_PASSWORD")

opendrift_leeway_webgui/leeway/tasks.py

@@ -27,6 +27,14 @@ def run_leeway_simulation(request_id):
     params = [
         "docker",
         "run",
+        "-e",
+        f"COPERNICUSMARINE_SERVICE_USERNAME={settings.COPERNICUSMARINE_SERVICE_USERNAME}",
+        "-e",
+        f"COPERNICUSMARINE_SERVICE_PASSWORD={settings.COPERNICUSMARINE_SERVICE_PASSWORD}",
+        "-e",
+        f"COPERNICUSMARINE_USERNAME={settings.COPERNICUSMARINE_SERVICE_USERNAME}",
+        "-e",
+        f"COPERNICUSMARINE_PASSWORD={settings.COPERNICUSMARINE_SERVICE_PASSWORD}",
         "--volume",
         f"{settings.SIMULATION_ROOT}:/code/leeway",
         "--volume",
@@ -51,11 +59,12 @@ def run_leeway_simulation(request_id):
         "--id",
         str(simulation.uuid),
     ]
+
     with subprocess.Popen(
         params, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True
     ) as sim_proc:
         stdout, stderr = sim_proc.communicate()
-    logger.debug("Output from simulation %s: %s", simulation.uuid, stdout)
+    logger.info("Output from simulation %s: %s", simulation.uuid, stdout)
     if stderr:
         logger.error("Error during simulation %s: %s", simulation.uuid, stderr)
         simulation.traceback = stderr.strip()

opendrift_leeway_webgui/leeway/templates/leeway/leewaysimulation_form.html

@@ -3,8 +3,8 @@
     <h2>New Leeway Simulation</h2>
     <p>Please note that only simulations +/- 5 days from now are possible.</p>
     <form method="post">
+        {% csrf_token %}
         <table>
-            {% csrf_token %}
             {{ form.as_table }}
         </table>
         <button type="submit">Simulate</button>

opendrift_leeway_webgui/leeway/urls.py

@@ -5,8 +5,6 @@
 For more information on this file, see :doc:`django:topics/http/urls`.
 """
 
-from django.conf import settings
-from django.conf.urls.static import static
 from django.urls import include, path
 
 from .views import (
@@ -16,6 +14,7 @@
     LeewaySimulationDetailView,
     LeewaySimulationDocumentation,
     LeewaySimulationListView,
+    SimulationFileView,
 )
 
 #: The url patterns of this module (see :doc:`django:topics/http/urls`)
@@ -49,19 +48,6 @@
     ),
 ]
 
-# Serve simulation files in debug mode
-if settings.DEBUG:
-    urlpatterns += [
-        path(
-            "",
-            include(
-                (
-                    static(
-                        settings.SIMULATION_URL,
-                        document_root=settings.SIMULATION_OUTPUT,
-                    ),
-                    "simulation_files",
-                )
-            ),
-        )
-    ]
+urlpatterns += [
+    path("simulation-files/<path:path>", SimulationFileView.as_view(), name="simulation_file"),
+]

opendrift_leeway_webgui/leeway/views.py

@@ -1,10 +1,13 @@
+import mimetypes
+from pathlib import Path
+
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseForbidden, HttpResponseRedirect
+from django.http import FileResponse, Http404, HttpResponseForbidden, HttpResponseRedirect
 from django.urls import reverse_lazy
 from django.views.generic import TemplateView
-from django.views.generic.base import RedirectView
+from django.views.generic.base import RedirectView, View
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView, DeleteView
 from django.views.generic.list import ListView
@@ -118,3 +121,38 @@ def get(self, request, *args, **kwargs):
             self.get_object().delete()
             return HttpResponseRedirect("/simulations")
         return HttpResponseForbidden("Cannot delete other's simulations")
+
+
+class SimulationFileView(LoginRequiredMixin, View):
+    """
+    Serve simulation output files (PNG, NetCDF) with login and ownership protection.
+
+    The filename stem must match the UUID of an existing simulation owned by the
+    requesting user. Any other request is rejected with 403 or 404.
+    """
+
+    def get(self, request, path):
+        """
+        Serve the requested simulation file if the user owns it.
+        """
+        file_path = Path(settings.SIMULATION_OUTPUT) / path
+
+        # Only allow a flat filename — no directory traversal
+        if Path(path).parent != Path("."):
+            raise Http404
+
+        if not file_path.is_file():
+            raise Http404
+
+        # Extract UUID from filename stem and verify ownership
+        uuid_str = file_path.stem
+        try:
+            simulation = LeewaySimulation.objects.get(uuid=uuid_str)
+        except (LeewaySimulation.DoesNotExist, ValueError):
+            raise Http404
+
+        if simulation.user != request.user:
+            return HttpResponseForbidden("You do not have permission to access this file.")
+
+        content_type, _ = mimetypes.guess_type(str(file_path))
+        return FileResponse(file_path.open("rb"), content_type=content_type or "application/octet-stream")

opendrift_leeway_webgui/simulation.py

@@ -10,6 +10,7 @@
 
 import argparse
 import os
+import sys
 import uuid
 from datetime import datetime, timedelta
 
@@ -25,8 +26,10 @@
 from matplotlib.colors import ListedColormap
 
 # pylint: disable=import-error, disable=no-name-in-module
+import copernicusmarine
 from opendrift.models.leeway import Leeway
 from opendrift.readers import reader_global_landmask
+from opendrift.readers.reader_netCDF_CF_generic import Reader
 
 INPUTDIR = "/code/leeway/input"
 
@@ -85,23 +88,46 @@ def main():
     args = parser.parse_args()
 
     simulation = Leeway(loglevel=50)
-    sources = [
+
+    local_sources = [
         os.path.join(INPUTDIR, data_file)
         for data_file in os.listdir(INPUTDIR)
         if data_file.endswith(".nc")
     ]
-
-    if not args.no_web:
-        sources.extend(
-            (
-                "https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest",
+    if local_sources:
+        sources = local_sources
+    elif not args.no_web:
+        if "COPERNICUSMARINE_SERVICE_USERNAME" in os.environ:
+            print("Using CMEMS")
+            cmems_dataset_ids = [
+                "cmems_mod_med_phy-cur_anfc_4.2km_PT15M-i",
+                "cmems_mod_glo_phy_anfc_merged-uv_PT1H-i",
+                "cmems_obs-wind_glo_phy_nrt_l4_0.125deg_PT1H",
+            ]
+            print("Using sources:\n - {}".format("\n - ".join(cmems_dataset_ids)))
+            readers = []
+            for dataset_id in cmems_dataset_ids:
+                try:
+                    ds = copernicusmarine.open_dataset(dataset_id=dataset_id, chunk_size_limit=0)
+                    print(f"Opened {dataset_id}:")
+                    print(ds)
+                except Exception as exc:
+                    print(f"ERROR opening {dataset_id}: {exc}", file=sys.stderr)
+                    raise
+                readers.append(Reader(ds, name=dataset_id))
+            simulation.add_reader(readers)
+            sources = [
                 "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd",
-            )
-        )
-
-    print("Using sources:\n - {}".format("\n - ".join(sources)))
-
-    simulation.add_readers_from_list(sources, lazy=True)
+            ]
+            simulation.add_readers_from_list(sources, lazy=False)
+
+    else:
+        sources = [
+            "https://tds.hycom.org/thredds/dodsC/GLBy0.08/latest",
+            "https://pae-paha.pacioos.hawaii.edu/thredds/dodsC/ncep_global/NCEP_Global_Atmospheric_Model_best.ncd",
+        ]
+        print("Using sources:\n - {}".format("\n - ".join(sources)))
+        simulation.add_readers_from_list(sources, lazy=False)
 
     reader_landmask = reader_global_landmask.Reader()
     simulation.add_reader([reader_landmask])

pyproject.toml

@@ -25,6 +25,8 @@ dependencies = [
     "dms2dec",
     "drf-spectacular",
     "redis",
+    "uvicorn",
+    "gunicorn"
 ]
 
 [project.urls]