Execute unstarted simulations, fix #50

opendrift_leeway_webgui/leeway/celery.py

@@ -10,7 +10,8 @@
 from celery import Celery
 from django.conf import settings
 
-from .utils import mail_to_simulation
+from .models import LeewaySimulation
+from .utils import mail_to_simulation, run_leeway_simulation
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "opendrift_leeway_webgui.core.settings")
 app = Celery("leeway")
@@ -33,6 +34,20 @@ def setup_periodic_tasks(sender, **kwargs):
     Set up periodic tasks, i.e. retrieving mails from the mailbox
     """
     sender.add_periodic_task(60, check_mailbox.s(), name="check_mailbox")
+    sender.add_periodig_task(
+        60, run_unstarted_simulations.s(), name="run_unstarted_simulations"
+    )
+
+
+@app.task
+def run_unstarted_simulations():
+    """
+    Get the next unstarted simulation and create a new simulation job
+    """
+    next_simulation = LeewaySimulation.objects.filter(
+        simulation_started__isnull=True
+    ).first()
+    run_leeway_simulation.apply_async([next_simulation.uuid])
 
 
 @app.task

opendrift_leeway_webgui/leeway/utils.py

@@ -154,16 +154,13 @@ def send_result_mail(simulation):
     """
     Create mail parts for result mail
     """
-    # Initialize mail
     email = EmailMessage(
         subject="Leeway Drift Simulation Result",
         body=mail_result_text(simulation),
         to=[simulation.user.email],
     )
-    # Attach result image
     if simulation.img:
         email.attach_file(simulation.img.path)
-    # Send email
     return email.send()