feat(server): improved the way running data is returne

apps/server/celery.service

@@ -6,7 +6,7 @@ After=network.target
 User=yourusername
 Group=yourgroupname
 WorkingDirectory=/path/to/your/flask/app
-ExecStart=/path/to/your/venv/bin/celery -A server.celery_tasks worker --loglevel=info
+ExecStart=/path/to/your/venv/bin/celery -A server.celery_tasks worker --loglevel=info -n worker@visualdynamics
 Restart=always
 RestartSec=10
 

apps/server/server/celery_tasks.py

@@ -1,12 +1,27 @@
 import os
 import shutil
+import signal
 from server.config import Config
 from server.utils.run_command import run_command
 from server.celery import celery
 
 
-@celery.task()
-def run_commands(folder):
+@celery.task(bind=True)
+def run_commands(self, folder):
+    def sigterm_handler(signl, frame):
+        with open(file_log_path, "a+") as f:
+            f.write("\n\ncanceled")
+
+        if os.path.exists(file_is_running):
+            os.remove(file_is_running)
+
+    signal.signal(signal.SIGTERM, sigterm_handler)
+
+    file_task_id = os.path.abspath(os.path.join(folder, "celery_id"))
+
+    with open(file_task_id, "w") as f:
+        f.write(self.request.id)
+
     # Get absolute path to the folder where our default MDP files are stored
     folder_mdp = os.path.abspath(Config.MDP_LOCATION_FOLDER)
 

apps/server/server/resources/celery/active_tasks.py

@@ -4,4 +4,6 @@
 
 class CeleryActiveTasks(Resource):
     def get(self):
-        return {"activeTasks": celery.control.inspect().active()}
+        return {
+            "activeTasks": celery.control.inspect(["worker@visualdynamics"]).active()
+        }

apps/server/server/resources/celery/reserved_tasks.py

@@ -4,4 +4,8 @@
 
 class CeleryReservedTasks(Resource):
     def get(self):
-        return {"reservedTasks": celery.control.inspect().reserved()}
+        return {
+            "reservedTasks": celery.control.inspect(
+                ["worker@visualdynamics"]
+            ).reserved()
+        }

apps/server/server/resources/run/__init__.py

@@ -33,27 +33,34 @@ def get(self):
             with open(file_is_running, "r") as f:
                 folder = f.readline()
                 extractable_data = folder.split("/")
-                data = {
-                    "timestamp": extractable_data[9],
-                    "type": extractable_data[7],
-                    "molecule": extractable_data[8],
-                }
 
             file_steps = os.path.abspath(os.path.join(folder, "steps.txt"))
 
             with open(file_steps, "r") as f:
-                step = f.readlines()[-1]
+                step = [l.strip().replace("#", "") for l in f.readlines()]
 
             file_gmx_log = os.path.abspath(
                 os.path.join(folder, "run", "logs", "gmx.log")
             )
 
             with open(file_gmx_log, "r") as f:
-                log_lines = f.readlines()
+                log_lines = [l.strip() for l in f.readlines()]
+
+            file_celery_id = os.path.abspath(os.path.join(folder, "celery_id"))
+
+            with open(file_celery_id, "r") as f:
+                celery_id = f.readline()
+
+            data = {
+                "timestamp": extractable_data[9],
+                "type": extractable_data[7],
+                "molecule": extractable_data[8],
+                "celeryId": celery_id,
+            }
 
             return {
-                "data": data,
-                "step": step,
+                "info": data,
+                "steps": step,
                 "log": log_lines[-30:],
                 "status": "running",
             }