Shouldn't need a grace period, just include when setting the end time

Author: d-j-hatton

src/murfey/client/multigrid_control.py

@@ -49,7 +49,6 @@ class MultigridController:
     token: str = ""
     _machine_config: dict = field(default_factory=lambda: {})
     visit_end_time: Optional[datetime] = None
-    end_time_grace_period: int = 0
 
     def __post_init__(self):
         if self.token:
@@ -280,7 +279,6 @@ def _start_rsyncer(
                 do_transfer=self.do_transfer,
                 remove_files=remove_files,
                 end_time=self.visit_end_time,
-                grace_period=self.end_time_grace_period,
             )
 
             def rsync_result(update: RSyncerUpdate):

src/murfey/client/rsync.py

@@ -13,7 +13,7 @@
 import subprocess
 import threading
 import time
-from datetime import datetime, timedelta
+from datetime import datetime
 from enum import Enum
 from pathlib import Path
 from typing import Awaitable, Callable, List, NamedTuple
@@ -65,7 +65,6 @@ def __init__(
         required_substrings_for_removal: List[str] = [],
         notify: bool = True,
         end_time: datetime | None = None,
-        grace_period: int = 0,
     ):
         super().__init__()
         self._basepath = basepath_local.absolute()
@@ -80,7 +79,6 @@ def __init__(
         self._notify = notify
         self._finalised = False
         self._end_time = end_time
-        self._grace_period = grace_period
 
         self._skipped_files: List[Path] = []
 
@@ -322,9 +320,7 @@ def _transfer(self, infiles: list[Path]) -> bool:
             files = [
                 f
                 for f in infiles
-                if f.is_file()
-                and f.stat().st_ctime
-                < (self._end_time + timedelta(seconds=self._grace_period)).timestamp()
+                if f.is_file() and f.stat().st_ctime < self._end_time.timestamp()
             ]
             self._skipped_files.extend(set(infiles).difference(set(files)))
         else:

src/murfey/server/api/instrument.py

@@ -130,7 +130,6 @@ async def setup_multigrid_watcher(
                     },
                     "rsync_restarts": watcher_spec.rsync_restarts,
                     "visit_end_time": session.visit_end_time,
-                    "grace_period": machine_config.grace_period,
                 },
                 headers={
                     "Authorization": f"Bearer {instrument_server_tokens[session_id]['access_token']}"

src/murfey/util/config.py

@@ -71,8 +71,6 @@ class MachineConfig(BaseModel, extra=Extra.allow):  # type: ignore
 
     notifications_queue: str = "pato_notification"
 
-    grace_period: int = 0
-
 
 def from_file(config_file_path: Path, instrument: str = "") -> Dict[str, MachineConfig]:
     with open(config_file_path, "r") as config_stream:

src/murfey/util/instrument_models.py

@@ -17,4 +17,3 @@ class MultigridWatcherSpec(BaseModel):
     destination_overrides: Dict[Path, str] = {}
     rsync_restarts: List[str] = []
     visit_end_time: Optional[datetime] = None
-    grace_period: int = 0