Directly put the rsync module in to the paths used in rsync commands

Author: d-j-hatton

src/murfey/client/multigrid_control.py

@@ -32,6 +32,7 @@ class MultigridController:
     session_id: int
     murfey_url: str = "http://localhost:8000"
     rsync_url: str = ""
+    rsync_module: str = "data"
     demo: bool = False
     processing_enabled: bool = True
     do_transfer: bool = True
@@ -59,6 +60,7 @@ def __post_init__(self):
             f"{self.murfey_url}/instruments/{self.instrument_name}/machine"
         ).json()
         self.rsync_url = machine_data.get("rsync_url", "")
+        self.rsync_module = machine_data.get("rsync_module", "data")
         self._environment = MurfeyInstanceEnvironment(
             url=urlparse(self.murfey_url, allow_fragments=False),
             client_id=0,
@@ -200,7 +202,7 @@ def _start_rsyncer(
                 rsync_cmd = [
                     "rsync",
                     f"{posix_path(self._environment.gain_ref)!r}",  # '!r' will print strings in ''
-                    f"{self._environment.url.hostname}::{visit_path}/processing",
+                    f"{self._environment.url.hostname}::{self.rsync_module}/{visit_path}/processing",
                 ]
                 # Wrap in bash shell
                 cmd = [
@@ -218,6 +220,7 @@ def _start_rsyncer(
             self.rsync_processes[source] = RSyncer(
                 source,
                 basepath_remote=Path(destination),
+                rsync_module=self.rsync_module,
                 server_url=(
                     urlparse(self.rsync_url)
                     if self.rsync_url

src/murfey/client/rsync.py

@@ -54,6 +54,7 @@ def __init__(
         self,
         basepath_local: Path,
         basepath_remote: Path,
+        rsync_module: str,
         server_url: ParseResult,
         stop_callback: Callable = lambda *args, **kwargs: None,
         local: bool = False,
@@ -66,6 +67,7 @@ def __init__(
         super().__init__()
         self._basepath = basepath_local.absolute()
         self._basepath_remote = basepath_remote
+        self._rsync_module = rsync_module
         self._do_transfer = do_transfer
         self._remove_files = remove_files
         self._required_substrings_for_removal = required_substrings_for_removal
@@ -76,7 +78,9 @@ def __init__(
         if local:
             self._remote = str(basepath_remote)
         else:
-            self._remote = f"{server_url.hostname}::{basepath_remote}/"
+            self._remote = (
+                f"{server_url.hostname}::{self._rsync_module}/{basepath_remote}/"
+            )
         # For local tests you can use something along the lines of
         # self._remote = f"wra62962@ws133:/dls/tmp/wra62962/junk/{basepath_remote}"
         # to avoid having to set up an rsync daemon
@@ -116,6 +120,7 @@ def from_rsyncer(cls, rsyncer: RSyncer, **kwargs):
         return cls(
             rsyncer._basepath,
             rsyncer._basepath_remote,
+            rsyncer._rsync_module,
             rsyncer._server_url,
             local=kwarguments_from_rsyncer["local"],
             status_bar=kwarguments_from_rsyncer["status_bar"],
@@ -190,7 +195,6 @@ def finalise(self, thread: bool = True):
 
     def enqueue(self, file_path: Path):
         if not self._stopping:
-            file_path = Path("/".join(file_path.parts[1:]))
             absolute_path = (self._basepath / file_path).resolve()
             self.queue.put(absolute_path)
 

src/murfey/client/tui/app.py

@@ -214,7 +214,7 @@ def _start_rsyncer(
                 rsync_cmd = [
                     "rsync",
                     f"{posix_path(self._environment.gain_ref)!r}",
-                    f"{self._url.hostname}::{visit_path}/processing",
+                    f"{self._url.hostname}::{self._machine_config.get('rsync_module', 'data')}/{visit_path}/processing",
                 ]
                 # Encase in bash shell
                 cmd = [
@@ -232,6 +232,7 @@ def _start_rsyncer(
             self.rsync_processes[source] = RSyncer(
                 source,
                 basepath_remote=Path(destination),
+                rsync_module=self._machine_config.get("rsync_module", "data"),
                 server_url=urlparse(rsync_url) if rsync_url else self._url,
                 # local=self._environment.demo,
                 status_bar=self._statusbar,

src/murfey/client/tui/screens.py

@@ -91,7 +91,10 @@ def determine_default_destination(
     elif machine_data.get("data_directories"):
         for data_dir in machine_data["data_directories"]:
             if source.resolve() == Path(data_dir):
-                _default = destination + f"/{visit}"
+                _default = (
+                    destination
+                    + f"{machine_data.get('rsync_module') or 'data'}/{visit}"
+                )
                 break
             else:
                 try:
@@ -884,7 +887,7 @@ def on_button_pressed(self, event):
             rsync_cmd = [
                 "rsync",
                 f"{posix_path(self._dir_tree._gain_reference)!r}",
-                f"{self.app._environment.url.hostname}::{visit_path}/processing/{secure_filename(self._dir_tree._gain_reference.name)}",
+                f"{self.app._environment.url.hostname}::{self.app._machine_config.get('rsync_module', 'data')}/{visit_path}/processing/{secure_filename(self._dir_tree._gain_reference.name)}",
             ]
             # Encase in bash shell
             cmd = ["bash", "-c", " ".join(rsync_cmd)]

src/murfey/instrument_server/api.py

@@ -276,15 +276,23 @@ class GainReference(BaseModel):
     gain_destination_dir: str = "processing"
 
 
-@router.post("/sessions/{session_id}/upload_gain_reference")
-def upload_gain_reference(session_id: MurfeySessionID, gain_reference: GainReference):
+@router.post(
+    "/instruments/{instrument_name}/sessions/{session_id}/upload_gain_reference"
+)
+def upload_gain_reference(
+    instrument_name: str, session_id: MurfeySessionID, gain_reference: GainReference
+):
     safe_gain_path = sanitise(str(gain_reference.gain_path))
     safe_visit_path = sanitise(gain_reference.visit_path)
     safe_destination_dir = sanitise(gain_reference.gain_destination_dir)
+    machine_config = requests.get(
+        f"{_get_murfey_url()}/instruments/{instrument_name}/machine",
+        headers={"Authorization": f"Bearer {tokens[session_id]}"},
+    ).json()
     cmd = [
         "rsync",
         safe_gain_path,
-        f"{urlparse(_get_murfey_url(), allow_fragments=False).hostname}::{safe_visit_path}/{safe_destination_dir}/{secure_filename(gain_reference.gain_path.name)}",
+        f"{urlparse(_get_murfey_url(), allow_fragments=False).hostname}::{machine_config.get('rsync_module', 'data')}/{safe_visit_path}/{safe_destination_dir}/{secure_filename(gain_reference.gain_path.name)}",
     ]
     gain_rsync = subprocess.run(cmd)
     if gain_rsync.returncode:

src/murfey/server/api/instrument.py

@@ -239,7 +239,7 @@ async def request_gain_reference_upload(
     if machine_config.instrument_server_url:
         async with aiohttp.ClientSession() as session:
             async with session.post(
-                f"{machine_config.instrument_server_url}/sessions/{session_id}/upload_gain_reference",
+                f"{machine_config.instrument_server_url}/instruments/{instrument_name}/sessions/{session_id}/upload_gain_reference",
                 json={
                     "gain_path": str(gain_reference_request.gain_path),
                     "visit_path": visit_path,