'MachineConfig.rsync_basepath' is now no longer None

Author: tieneupin

src/murfey/server/__init__.py

@@ -1622,8 +1622,6 @@ 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:
-        if not machine_config.rsync_basepath:
-            return None
         visit_directory = (
             machine_config.rsync_basepath
             / (machine_config.rsync_module or "data")

src/murfey/server/api/__init__.py

@@ -1291,8 +1291,6 @@ def suggest_path(
         raise ValueError(
             "No machine configuration set when suggesting destination path"
         )
-    if not machine_config.rsync_basepath:
-        raise ValueError("No rsync basepath set")
 
     # Construct the full path to where the dataset is to be saved
     check_path = machine_config.rsync_basepath / base_path
@@ -1416,8 +1414,6 @@ def start_dc(
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
-    if not machine_config.rsync_basepath:
-        raise ValueError("No rsync basepath set")
     log.info(
         f"Starting data collection on microscope {get_microscope(machine_config=machine_config)} "
         f"with basepath {sanitise(str(machine_config.rsync_basepath))} and directory {sanitise(dc_params.image_directory)}"
@@ -1505,8 +1501,6 @@ async def process_gain(
         executables = machine_config.external_executables
     env = machine_config.external_environment
     safe_path_name = secure_filename(gain_reference_params.gain_ref.name)
-    if not machine_config.rsync_basepath:
-        raise ValueError("No rsync basepath set")
     filepath = (
         machine_config.rsync_basepath
         / (machine_config.rsync_module or "data")
@@ -1595,8 +1589,6 @@ async def write_eer_fractionation_file(
             )
         ) / secure_filename(fractionation_params.fractionation_file_name)
     else:
-        if not machine_config.rsync_basepath:
-            raise ValueError("rsync basepath not set")
         file_path = (
             machine_config.rsync_basepath
             / (machine_config.rsync_module or "data")
@@ -1642,8 +1634,6 @@ async def make_gif(
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
-    if not machine_config.rsync_basepath:
-        raise ValueError("rsync basepath not set")
     output_dir = (
         machine_config.rsync_basepath
         / (machine_config.rsync_module or "data")

src/murfey/server/api/clem.py

@@ -77,8 +77,6 @@ def validate_and_sanitise(
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
-    if not machine_config.rsync_basepath:
-        raise ValueError("rsync basepath not set")
     base_path = machine_config.rsync_basepath.as_posix()
 
     # Check that full file path doesn't contain unallowed characters

src/murfey/server/api/spa.py

@@ -21,8 +21,6 @@ def _cryolo_model_path(visit: str, instrument_name: str) -> Path:
         instrument_name
     ]
     # Raise error if relevant keys weren't set in MachineConfig
-    if not machine_config.rsync_basepath:
-        raise ValueError("Unable to find crYOLO model; rsync_basepath was not set")
     if not machine_config.default_model:
         raise ValueError("No default crYOLO model was set")