Move session deletion to the point where the multigrid controller becomes dormant and make it asynchronous

Author: d-j-hatton

pyproject.toml

@@ -53,6 +53,7 @@ developer = [
     "pytest", # Test code functionality
 ]
 instrument-server = [
+    "aiohttp",
     "fastapi[standard]",
     "python-jose[cryptography]",
     "uvicorn[standard]",

src/murfey/client/multigrid_control.py

@@ -9,6 +9,7 @@
 from typing import Dict, List, Optional
 from urllib.parse import urlparse
 
+import aiohttp
 import requests
 
 import murfey.client.websocket
@@ -101,7 +102,7 @@ def _multigrid_watcher_finalised(self):
         self.multigrid_watcher_active = False
         self.dormancy_check()
 
-    def dormancy_check(self):
+    async def dormancy_check(self):
         if not self.multigrid_watcher_active:
             if (
                 all(r._finalised for r in self.rsync_processes.values())
@@ -110,6 +111,14 @@ def dormancy_check(self):
                     w.thread.is_alive() for w in self._environment.watchers.values()
                 )
             ):
+                async with aiohttp.ClientSession() as clientsession:
+                    async with clientsession.delete(
+                        f"{self._environment.url.geturl()}/sessions/{self.session_id}",
+                        json={"access_token": self.token, "token_type": "bearer"},
+                    ) as response:
+                        success = response.status == 200
+                if not success:
+                    log.warning(f"Could not delete database data for {self.session_id}")
                 self.dormant = True
 
     def finalise(self):

src/murfey/instrument_server/api.py

@@ -147,10 +147,6 @@ def start_multigrid_watcher(
     for sid, controller in controllers.items():
         if controller.dormant:
             del controllers[sid]
-            requests.delete(
-                f"{_get_murfey_url()}/sessions/{sanitise_nonpath(str(sid))}",
-                headers={"Authorization": f"Bearer {tokens[sid]}"},
-            )
     controllers[session_id] = MultigridController(
         [],
         watcher_spec.visit,