Switch to ignoring the rsync module and require the full rsync module base path in the machine configuration

Author: d-j-hatton

src/murfey/client/contexts/clem.py

@@ -34,9 +34,6 @@ def _file_transferred_to(
     # rsync basepath and modules are set in the microscope's configuration YAML file
     return (
         Path(machine_config.get("rsync_basepath", ""))
-        / (
-            machine_config.get("rsync_module", "data") or "data"
-        )  # Add "data" if it wasn't set
         / str(datetime.now().year)
         / source.name
         / file_path.relative_to(source)

src/murfey/client/contexts/spa.py

@@ -46,7 +46,7 @@ def _file_transferred_to(
         return (
             Path(machine_config.get("rsync_basepath", ""))
             / Path(environment.default_destinations[source])
-            / file_path.relative_to(source)
+            / file_path.relative_to(source)  # need to strip out the rsync_module name
         )
     return (
         Path(machine_config.get("rsync_basepath", ""))

src/murfey/client/multigrid_control.py

@@ -64,7 +64,7 @@ def __post_init__(self):
             client_id=0,
             murfey_session=self.session_id,
             software_versions=machine_data.get("software_versions", {}),
-            default_destination=f"{machine_data.get('rsync_module') or 'data'}/{datetime.now().year}",
+            default_destination=f"{datetime.now().year}",
             demo=self.demo,
             visit=self.visit,
             data_collection_parameters=self.data_collection_parameters,
@@ -118,7 +118,7 @@ def _start_rsyncer_multigrid(
                     break
             else:
                 self._environment.default_destinations[source] = (
-                    f"{machine_data.get('rsync_module') or 'data'}/{datetime.now().year}"
+                    f"{datetime.now().year}"
                 )
                 destination = determine_default_destination(
                     self._environment.visit,

src/murfey/client/rsync.py

@@ -190,6 +190,7 @@ 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

@@ -164,7 +164,7 @@ def _start_rsyncer_multigrid(
                     break
             else:
                 self._environment.default_destinations[source] = (
-                    f"{machine_data.get('rsync_module') or 'data'}/{datetime.now().year}"
+                    f"{datetime.now().year}"
                 )
                 destination = determine_default_destination(
                     self._visit,

src/murfey/client/tui/screens.py

@@ -310,12 +310,7 @@ def _add_directory(self, directory: str, add_destination: bool = True):
                 if source.is_relative_to(s):
                     return
             self.app._environment.sources.append(source)
-            machine_data = requests.get(
-                f"{self.app._environment.url.geturl()}/machine"
-            ).json()
-            self.app._default_destinations[source] = (
-                f"{machine_data.get('rsync_module') or 'data'}/{datetime.now().year}"
-            )
+            self.app._default_destinations[source] = f"{datetime.now().year}"
         if self._launch_btn:
             self._launch_btn.disabled = False
         self.query_one("#selected-directories").write(str(source) + "\n")
@@ -1011,13 +1006,10 @@ def compose(self):
                             and d.name
                             not in machine_config["create_directories"].values()
                         ):
-                            machine_data = requests.get(
-                                f"{self.app._environment.url.geturl()}/machine"
-                            ).json()
                             dest = determine_default_destination(
                                 self.app._visit,
                                 s,
-                                f"{machine_data.get('rsync_module') or 'data'}/{datetime.now().year}",
+                                f"{datetime.now().year}",
                                 self.app._environment,
                                 self.app.analysers,
                                 touch=True,

src/murfey/server/__init__.py

@@ -1628,10 +1628,7 @@ def _register_class_selection(message: dict, _db=murfey_db, demo: bool = False):
 def _find_initial_model(visit: str, machine_config: MachineConfig) -> Path | None:
     if machine_config.initial_model_search_directory:
         visit_directory = (
-            machine_config.rsync_basepath
-            / (machine_config.rsync_module or "data")
-            / str(datetime.now().year)
-            / visit
+            machine_config.rsync_basepath / str(datetime.now().year) / visit
         )
         possible_models = [
             p

src/murfey/server/api/__init__.py

@@ -1453,7 +1453,6 @@ async def process_gain(
     safe_path_name = secure_filename(gain_reference_params.gain_ref.name)
     filepath = (
         Path(machine_config.rsync_basepath)
-        / (machine_config.rsync_module or "data")
         / str(datetime.datetime.now().year)
         / secure_filename(visit_name)
         / machine_config.gain_directory_name
@@ -1464,7 +1463,6 @@ async def process_gain(
         filepath_prev = filepath
         filepath = (
             Path(machine_config.rsync_basepath)
-            / (machine_config.rsync_module or "data")
             / str(datetime.datetime.now().year - 1)
             / secure_filename(visit_name)
             / machine_config.gain_directory_name
@@ -1541,7 +1539,6 @@ async def write_eer_fractionation_file(
     else:
         file_path = (
             Path(machine_config.rsync_basepath)
-            / (machine_config.rsync_module or "data")
             / str(datetime.datetime.now().year)
             / secure_filename(visit_name)
             / "processing"
@@ -1586,7 +1583,6 @@ async def make_gif(
     ]
     output_dir = (
         Path(machine_config.rsync_basepath)
-        / (machine_config.rsync_module or "data")
         / secure_filename(year)
         / secure_filename(visit_name)
         / "processed"

src/murfey/server/api/instrument.py

@@ -234,7 +234,7 @@ async def request_gain_reference_upload(
         instrument_name
     ]
     visit = db.exec(select(Session).where(Session.id == session_id)).one().visit
-    visit_path = f"{machine_config.rsync_module or 'data'}/{datetime.datetime.now().year}/{visit}"
+    visit_path = f"{datetime.datetime.now().year}/{visit}"
     data = {}
     if machine_config.instrument_server_url:
         async with aiohttp.ClientSession() as session:

src/murfey/server/api/spa.py

@@ -22,10 +22,7 @@ def _cryolo_model_path(visit: str, instrument_name: str) -> Path:
     ]
     if machine_config.model_search_directory:
         visit_directory = (
-            machine_config.rsync_basepath
-            / (machine_config.rsync_module or "data")
-            / str(datetime.now().year)
-            / visit
+            machine_config.rsync_basepath / str(datetime.now().year) / visit
         )
         possible_models = list(
             (visit_directory / machine_config.model_search_directory).glob("*.h5")