Remove client-side demo flags

Author: stephen-riggs

src/murfey/client/analyser.py

@@ -65,7 +65,6 @@ def __init__(
                 str(environment.url.geturl()),
                 self._token,
                 instrument_name=environment.instrument_name,
-                demo=environment.demo,
             )
             if environment
             else {}

src/murfey/client/context.py

@@ -20,7 +20,6 @@ def _atlas_destination(
         str(environment.url.geturl()),
         token,
         instrument_name=environment.instrument_name,
-        demo=environment.demo,
     )
     for i, destination_part in enumerate(
         Path(environment.default_destinations[source]).parts

src/murfey/client/contexts/clem.py

@@ -28,7 +28,6 @@ def _file_transferred_to(
         str(environment.url.geturl()),
         token,
         instrument_name=environment.instrument_name,
-        demo=environment.demo,
     )
 
     # Construct destination path

src/murfey/client/contexts/spa.py

@@ -33,7 +33,6 @@ def _file_transferred_to(
         str(environment.url.geturl()),
         token,
         instrument_name=environment.instrument_name,
-        demo=environment.demo,
     )
     if environment.visit in environment.default_destinations[source]:
         return (
@@ -453,7 +452,6 @@ def post_transfer(
                             str(environment.url.geturl()),
                             self._token,
                             instrument_name=environment.instrument_name,
-                            demo=environment.demo,
                         )
                     else:
                         machine_config = {}

src/murfey/client/contexts/tomo.py

@@ -191,7 +191,6 @@ def _file_transferred_to(
             str(environment.url.geturl()),
             self._token,
             instrument_name=environment.instrument_name,
-            demo=environment.demo,
         )
         if environment.visit in environment.default_destinations[source]:
             return (
@@ -465,7 +464,6 @@ def post_transfer(
                             str(environment.url.geturl()),
                             self._token,
                             instrument_name=environment.instrument_name,
-                            demo=environment.demo,
                         )
                     else:
                         machine_config = {}

src/murfey/client/instance_environment.py

@@ -40,7 +40,6 @@ class MurfeyInstanceEnvironment(BaseModel):
     default_destinations: Dict[Path, str] = {}
     destination_registry: Dict[str, str] = {}
     watchers: Dict[Path, DirWatcher] = {}
-    demo: bool = False
     movies: Dict[Path, MovieTracker] = {}
     movie_tilt_pair: Dict[Path, str] = {}
     tilt_angles: Dict[str, List[List[str]]] = {}

src/murfey/client/multigrid_control.py

@@ -37,7 +37,6 @@ class MultigridController:
     murfey_url: str = "http://localhost:8000"
     rsync_url: str = ""
     rsync_module: str = "data"
-    demo: bool = False
     finalising: bool = False
     dormant: bool = False
     multigrid_watcher_active: bool = True
@@ -68,7 +67,6 @@ def __post_init__(self):
             client_id=0,
             murfey_session=self.session_id,
             software_versions=machine_data.get("software_versions", {}),
-            demo=self.demo,
             visit=self.visit,
             dose_per_frame=self.data_collection_parameters.get("dose_per_frame"),
             gain_ref=self.data_collection_parameters.get("gain_ref"),
@@ -80,7 +78,6 @@ def __post_init__(self):
             str(self._environment.url.geturl()),
             self.token,
             instrument_name=self._environment.instrument_name,
-            demo=self._environment.demo,
         )
         self._data_suffixes = (".mrc", ".tiff", ".tif", ".eer")
         self._data_substrings = [
@@ -430,7 +427,7 @@ def rsync_result(update: RSyncerUpdate):
                     "source": str(source),
                     "destination": destination,
                     "session_id": self.session_id,
-                    "transferring": self.do_transfer or self._environment.demo,
+                    "transferring": self.do_transfer,
                     "tag": tag,
                 }
                 capture_post(

src/murfey/instrument_server/api.py

@@ -173,7 +173,6 @@ def setup_multigrid_watcher(
         watcher_spec.instrument_name,
         session_id,
         murfey_url=_get_murfey_url(),
-        demo=True,
         do_transfer=True,
         processing_enabled=not watcher_spec.skip_existing_processing,
         _machine_config=machine_config,

src/murfey/util/client.py

@@ -52,9 +52,7 @@ def read_config() -> configparser.ConfigParser:
 
 
 @lru_cache(maxsize=1)
-def get_machine_config_client(
-    url: str, token: str, instrument_name: str = "", demo: bool = False
-) -> dict:
+def get_machine_config_client(url: str, token: str, instrument_name: str = "") -> dict:
     _instrument_name: Optional[str] = instrument_name or os.getenv("BEAMLINE")
     if not _instrument_name:
         return {}