Fix datetime related problems

Author: d-j-hatton

src/murfey/instrument_server/api.py

@@ -214,11 +214,11 @@ def stop_multigrid_watcher(session_id: MurfeySessionID, label: str):
     watchers[label].request_stop()
 
 
-@router.post("/sessions/{session_id}/multigrid_controller/visit_end_time/{timestamp}")
+@router.post("/sessions/{session_id}/multigrid_controller/visit_end_time")
 def update_multigrid_controller_visit_end_time(
-    session_id: MurfeySessionID, timestamp: float
+    session_id: MurfeySessionID, end_time: datetime
 ):
-    controllers[session_id].update_visit_time(datetime.fromtimestamp(timestamp))
+    controllers[session_id].update_visit_time(end_time)
 
 
 class RsyncerSource(BaseModel):

src/murfey/server/api/instrument.py

@@ -3,6 +3,7 @@
 import asyncio
 import datetime
 import logging
+import urllib
 from pathlib import Path
 from typing import Annotated, List, Optional
 
@@ -123,7 +124,7 @@ async def setup_multigrid_watcher(
                         str(k): v for k, v in watcher_spec.destination_overrides.items()
                     },
                     "rsync_restarts": watcher_spec.rsync_restarts,
-                    "visit_end_time": session.visit_end_time,
+                    "visit_end_time": str(session.visit_end_time),
                 },
                 headers={
                     "Authorization": f"Bearer {instrument_server_tokens[session_id]['access_token']}"
@@ -394,9 +395,9 @@ async def finalise_session(session_id: MurfeySessionID, db=murfey_db):
     return data
 
 
-@router.post("/sessions/{session_id}/multigrid_controller/visit_end_time/{timestamp}")
+@router.post("/sessions/{session_id}/multigrid_controller/visit_end_time")
 async def update_visit_end_time(
-    session_id: MurfeySessionID, timestamp: float, db=murfey_db
+    session_id: MurfeySessionID, end_time: datetime.datetime, db=murfey_db
 ):
     data = {}
     instrument_name = (
@@ -408,7 +409,7 @@ async def update_visit_end_time(
     if machine_config.instrument_server_url:
         async with aiohttp.ClientSession() as clientsession:
             async with clientsession.post(
-                f"{machine_config.instrument_server_url}{url_path_for('api.router', 'update_multigrid_controller_visit_end_time', session_id=session_id, timestamp=timestamp)}",
+                f"{machine_config.instrument_server_url}{url_path_for('api.router', 'update_multigrid_controller_visit_end_time', session_id=session_id)}?end_time={urllib.parse.quote(end_time.isoformat())}",
                 headers={
                     "Authorization": f"Bearer {instrument_server_tokens[session_id]['access_token']}"
                 },

src/murfey/util/route_manifest.yaml

@@ -38,6 +38,11 @@ murfey.instrument_server.api.router:
         type: str
     methods:
       - DELETE
+  - path: /sessions/{session_id}/multigrid_controller/visit_end_time
+    function: update_multigrid_controller_visit_end_time
+    path_params: []
+    methods:
+      - POST
   - path: /sessions/{session_id}/stop_rsyncer
     function: stop_rsyncer
     path_params: []
@@ -535,6 +540,11 @@ murfey.server.api.instrument.router:
     path_params: []
     methods:
       - POST
+  - path: /instrument_server/sessions/{session_id}/multigrid_controller/visit_end_time
+    function: update_visit_end_time
+    path_params: []
+    methods:
+      - POST
   - path: /instrument_server/sessions/{session_id}/abandon_session
     function: abandon_session
     path_params: []
@@ -1065,14 +1075,14 @@ murfey.server.api.workflow.router:
     function: register_dc_group
     path_params:
       - name: visit_name
-        type: typing.Any
+        type: Any
     methods:
       - POST
   - path: /workflow/visits/{visit_name}/{session_id}/start_data_collection
     function: start_dc
     path_params:
       - name: visit_name
-        type: typing.Any
+        type: Any
     methods:
       - POST
   - path: /workflow/visits/{visit_name}/{session_id}/register_processing_job