From bbbfaf860261246f08df56b9d0963aaac5e98a28 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 11:33:03 +0000
Subject: [PATCH 01/21] Get fallback server working again

---
 src/openflexure_microscope_server/server/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openflexure_microscope_server/server/__init__.py b/src/openflexure_microscope_server/server/__init__.py
index ea343596..2533ad20 100644
--- a/src/openflexure_microscope_server/server/__init__.py
+++ b/src/openflexure_microscope_server/server/__init__.py
@@ -12,6 +12,7 @@ import uvicorn
 from uvicorn.main import Server
 
 import labthings_fastapi as lt
+from labthings_fastapi.server import fallback
 
 from openflexure_microscope_server.utilities import load_patched_config
 
@@ -87,9 +88,9 @@ def serve_from_cli(argv: Optional[list[str]] = None) -> None:
     server = None
     try:
         config = _full_config_from_args(args)
-        log_folder = config.get("log_folder", "./openflexure/logs")
+        log_folder = config.pop("log_folder", "./openflexure/logs")
         scans_folder = _get_scans_dir(config)
-        server = lt.cli.server_from_config(config)
+        server = lt.ThingServer.from_config(config)
         customise_server(server, log_folder, scans_folder)
 
         def shutdown_call() -> None:
@@ -119,9 +120,8 @@ def serve_from_cli(argv: Optional[list[str]] = None) -> None:
             # Allow printing to the terminal for fallback errors so they are not
             # presented in the fallback logs.
             print(f"Error: {e}")  # noqa: T201
-            fallback_server = "labthings_fastapi.server.fallback:app"
-            print(f"Starting fallback server {fallback_server}.")  # noqa: T201
-            app = lt.cli.object_reference_to_object(fallback_server)
+            print("Starting fallback server.")  # noqa: T201
+            app = fallback.app
             app.labthings_config = config
             app.labthings_server = server
             app.labthings_error = e

From 5eea78cac766ad0ba095821436c21cfb84f47899 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 11:52:07 +0000
Subject: [PATCH 02/21] update action, property, and setting syntax for
 labthings-fastapi 0.0.12

---
 pyproject.toml                                |  2 +-
 .../things/autofocus.py                       | 22 ++----
 .../things/camera/__init__.py                 | 52 ++++++-------
 .../things/camera/opencv.py                   |  6 +-
 .../things/camera/picamera.py                 | 75 ++++++++-----------
 .../things/camera/simulation.py               | 24 +++---
 .../things/camera_stage_mapping.py            | 22 +++---
 .../things/smart_scan.py                      | 55 +++++---------
 .../things/stage/__init__.py                  | 29 +++----
 .../things/stage/dummy.py                     |  8 +-
 .../things/stage/sangaboard.py                | 10 +--
 .../things/stage_measure.py                   |  8 +-
 .../things/system.py                          | 14 ++--
 tests/test_stage.py                           |  4 +-
 14 files changed, 139 insertions(+), 192 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 34d723be..b285de51 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -161,7 +161,7 @@ ignore = [
 [tool.ruff.lint.pydocstyle]
 # This lets the D401 checker understand that decorated thing properties and thing
 # settings act like properties so should be documented as such.
-property-decorators = ["labthings_fastapi.thing_property", "labthings_fastapi.thing_setting"]
+property-decorators = ["labthings_fastapi.property", "labthings_fastapi.setting"]
 
 [tool.ruff.lint.pylint]
 max-args = 7
diff --git a/src/openflexure_microscope_server/things/autofocus.py b/src/openflexure_microscope_server/things/autofocus.py
index 44098957..ee023ddb 100644
--- a/src/openflexure_microscope_server/things/autofocus.py
+++ b/src/openflexure_microscope_server/things/autofocus.py
@@ -350,7 +350,7 @@ class AutofocusThing(lt.Thing):
     field of view to assess focus (autofocus and testing the success of a z-stack)
     """
 
-    @lt.thing_action
+    @lt.action
     def fast_autofocus(
         self,
         sharpness_monitor: SharpnessMonitorDep,
@@ -381,7 +381,7 @@ class AutofocusThing(lt.Thing):
             # Return all focus data
             return sharpness_monitor.data_dict()
 
-    @lt.thing_action
+    @lt.action
     def z_move_and_measure_sharpness(
         self,
         sharpness_monitor: SharpnessMonitorDep,
@@ -407,7 +407,7 @@ class AutofocusThing(lt.Thing):
                 sharpness_monitor.focus_rel(current_dz)
             return sharpness_monitor.data_dict()
 
-    @lt.thing_action
+    @lt.action
     def looping_autofocus(
         self,
         stage: Stage,
@@ -455,19 +455,13 @@ class AutofocusThing(lt.Thing):
             "Looping autofocus couldn't converge on a focus location."
         )
 
-    stack_images_to_save = lt.ThingSetting(
-        initial_value=1,
-        model=int,
-    )
+    stack_images_to_save: int = lt.setting(default=1)
     """The number of images to save in a stack.
 
     Defaults to 1 unless you need to see either side of focus
     """
 
-    stack_min_images_to_test = lt.ThingSetting(
-        initial_value=9,
-        model=int,
-    )
+    stack_min_images_to_test: int = lt.setting(default=9)
     """The minimum number of images to capture in a stack.
 
     This many images are captures and tested for focus, if the focus is not central
@@ -477,7 +471,7 @@ class AutofocusThing(lt.Thing):
     Defaults to 9 which balances reliability and speed.
     """
 
-    stack_dz = lt.ThingSetting(initial_value=50, model=int)
+    stack_dz: int = lt.setting(default=50)
     """Distance in steps between images in a z-stack.
 
     Suggested values:
@@ -487,7 +481,7 @@ class AutofocusThing(lt.Thing):
     * 200 for 20x
     """
 
-    @lt.thing_action
+    @lt.action
     def create_stack_params(
         self,
         images_dir: str,
@@ -560,7 +554,7 @@ class AutofocusThing(lt.Thing):
             save_resolution=save_resolution,
         )
 
-    @lt.thing_action
+    @lt.action
     def run_smart_stack(
         self,
         cam: CameraClient,
diff --git a/src/openflexure_microscope_server/things/camera/__init__.py b/src/openflexure_microscope_server/things/camera/__init__.py
index 9cda7723..70660b21 100644
--- a/src/openflexure_microscope_server/things/camera/__init__.py
+++ b/src/openflexure_microscope_server/things/camera/__init__.py
@@ -203,7 +203,7 @@ class BaseCamera(lt.Thing):
         """Close hardware connection when the Thing context manager is closed."""
         raise NotImplementedError("CameraThings must define their own __exit__ method")
 
-    @lt.thing_property
+    @lt.property
     def calibration_required(self) -> bool:
         """Whether the camera needs calibrating.
 
@@ -212,7 +212,7 @@ class BaseCamera(lt.Thing):
         """
         return False
 
-    @lt.thing_action
+    @lt.action
     def start_streaming(
         self, main_resolution: tuple[int, int], buffer_count: int
     ) -> None:
@@ -239,21 +239,21 @@ class BaseCamera(lt.Thing):
             self.mjpeg_stream._streaming = False
             self.lores_mjpeg_stream._streaming = False
 
-    @lt.thing_property
+    @lt.property
     def stream_active(self) -> bool:
         """Whether the MJPEG stream is active."""
         raise NotImplementedError(
             "CameraThings must define their own stream_active method"
         )
 
-    @lt.thing_action
+    @lt.action
     def discard_frames(self) -> None:
         """Discard frames so that the next frame captured is fresh."""
         raise NotImplementedError(
             "CameraThings must define their own discard_frames method"
         )
 
-    @lt.thing_action
+    @lt.action
     def capture_array(
         self,
         stream_name: Literal["main", "lores", "raw", "full"] = "main",
@@ -264,10 +264,10 @@ class BaseCamera(lt.Thing):
             "CameraThings must define their own capture_array method"
         )
 
-    downsampled_array_factor = lt.ThingProperty(int, 2)
+    downsampled_array_factor: int = lt.property(default=2)
     """The downsampling factor when calling capture_downsampled_array."""
 
-    @lt.thing_action
+    @lt.action
     def capture_downsampled_array(self) -> ArrayModel:
         """Acquire one image from the camera, downsample, and return as an array.
 
@@ -279,7 +279,7 @@ class BaseCamera(lt.Thing):
         img = self.capture_array()
         return downsample(self.downsampled_array_factor, img)
 
-    @lt.thing_action
+    @lt.action
     def capture_jpeg(
         self,
         metadata_getter: lt.deps.GetThingStates,
@@ -316,7 +316,7 @@ class BaseCamera(lt.Thing):
 
         return JPEGBlob.from_temporary_directory(directory, fname)
 
-    @lt.thing_action
+    @lt.action
     def grab_jpeg(
         self,
         portal: lt.deps.BlockingPortal,
@@ -340,7 +340,7 @@ class BaseCamera(lt.Thing):
         frame = portal.call(stream.grab_frame)
         return JPEGBlob.from_bytes(frame)
 
-    @lt.thing_action
+    @lt.action
     def grab_as_array(
         self,
         portal: lt.deps.BlockingPortal,
@@ -367,7 +367,7 @@ class BaseCamera(lt.Thing):
                 tries += 1
         raise OSError("Could not open frames from MJPEG stream.")
 
-    @lt.thing_action
+    @lt.action
     def grab_jpeg_size(
         self,
         portal: lt.deps.BlockingPortal,
@@ -389,7 +389,7 @@ class BaseCamera(lt.Thing):
             "CameraThings must define their own capture_image method"
         )
 
-    @lt.thing_action
+    @lt.action
     def capture_and_save(
         self,
         jpeg_path: str,
@@ -420,7 +420,7 @@ class BaseCamera(lt.Thing):
             save_resolution,
         )
 
-    @lt.thing_action
+    @lt.action
     def capture_to_memory(
         self,
         logger: lt.deps.InvocationLogger,
@@ -444,7 +444,7 @@ class BaseCamera(lt.Thing):
         image, metadata = self._robust_image_capture(metadata_getter, logger)
         return self._memory_buffer.add_image(image, metadata, buffer_max=buffer_max)
 
-    @lt.thing_action
+    @lt.action
     def save_from_memory(
         self,
         jpeg_path: str,
@@ -473,7 +473,7 @@ class BaseCamera(lt.Thing):
             save_resolution=save_resolution,
         )
 
-    @lt.thing_action
+    @lt.action
     def clear_buffers(self) -> None:
         """Clear all images in memory."""
         self._memory_buffer.clear()
@@ -600,10 +600,10 @@ class BaseCamera(lt.Thing):
         except Exception as e:
             raise IOError(f"An error occurred while saving {jpeg_path}") from e
 
-    settling_time = lt.ThingSetting(float, 0.2)
+    settling_time: float = lt.setting(default=0.2)
     """The settling time when calling the ``settle()`` method."""
 
-    @lt.thing_action
+    @lt.action
     def settle(self) -> None:
         """Sleep for the settling time, ready to provide a fresh frame.
 
@@ -616,24 +616,24 @@ class BaseCamera(lt.Thing):
         time.sleep(self.settling_time)
         self.discard_frames()
 
-    @lt.thing_property
+    @lt.property
     def primary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions for both calibration wizard and settings panel."""
         return []
 
-    @lt.thing_property
+    @lt.property
     def secondary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions that appear only in settings panel."""
         return []
 
-    @lt.thing_property
+    @lt.property
     def manual_camera_settings(self) -> list[PropertyControl]:
         """The camera settings to expose as property controls in the settings panel."""
         return []
 
     # Note that the default detector name is set at init. This is over written if
     # setting is loaded from disk.
-    @lt.thing_setting
+    @lt.setting
     def detector_name(self) -> str:
         """The name of the active background selector."""
         return self._detector_name
@@ -650,12 +650,12 @@ class BaseCamera(lt.Thing):
         """The active background detector instance."""
         return self.background_detectors[self.detector_name]
 
-    @lt.thing_property
+    @lt.property
     def background_detector_status(self) -> BackgroundDetectorStatus:
         """The status of the active detector for the UI."""
         return self.active_detector.status
 
-    @lt.thing_action
+    @lt.action
     def update_detector_settings(self, data: dict[str, Any]) -> None:
         """Update the settings of the current detector.
 
@@ -671,7 +671,7 @@ class BaseCamera(lt.Thing):
         # Manually save settings as the setter is not called.
         self.save_settings()
 
-    @lt.thing_setting
+    @lt.setting
     def background_detector_data(self) -> dict:
         """The data for each background detector, used to save to disk."""
         data = {}
@@ -704,13 +704,13 @@ class BaseCamera(lt.Thing):
                     f"No background detector named {name}, settings will be discarded."
                 )
 
-    @lt.thing_action
+    @lt.action
     def image_is_sample(self, portal: lt.deps.BlockingPortal) -> tuple[bool, str]:
         """Label the current image as either background or sample."""
         current_image = self.grab_as_array(portal, stream_name="lores")
         return self.active_detector.image_is_sample(current_image)
 
-    @lt.thing_action
+    @lt.action
     def set_background(self, portal: lt.deps.BlockingPortal) -> None:
         """Grab an image, and use its statistics to set the background.
 
diff --git a/src/openflexure_microscope_server/things/camera/opencv.py b/src/openflexure_microscope_server/things/camera/opencv.py
index 644b4cfa..421b3a6e 100644
--- a/src/openflexure_microscope_server/things/camera/opencv.py
+++ b/src/openflexure_microscope_server/things/camera/opencv.py
@@ -60,7 +60,7 @@ class OpenCVCamera(BaseCamera):
             self._capture_thread.join()
         self.cap.release()
 
-    @lt.thing_property
+    @lt.property
     def stream_active(self) -> bool:
         """Whether the MJPEG stream is active."""
         if self._capture_enabled and self._capture_thread:
@@ -81,12 +81,12 @@ class OpenCVCamera(BaseCamera):
             ].tobytes()
             self.lores_mjpeg_stream.add_frame(jpeg_lores, portal)
 
-    @lt.thing_action
+    @lt.action
     def discard_frames(self) -> None:
         """Discard frames so that the next frame captured is fresh."""
         self.capture_array()
 
-    @lt.thing_action
+    @lt.action
     def capture_array(
         self,
         stream_name: Literal["main", "full"] = "full",
diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 86b5241a..14a9b723 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -169,30 +169,19 @@ class StreamingPiCamera2(BaseCamera):
         # trigger a NotConnectedToServerError
         self._colour_gains = tf_utils.get_colour_gains_from_lst(self.tuning)
 
-    stream_resolution = lt.ThingProperty(
-        tuple[int, int],
-        initial_value=(820, 616),
-    )
+    stream_resolution: tuple[int, int] = lt.property(default=(820, 616))
     """Resolution to use for the MJPEG stream."""
 
-    mjpeg_bitrate = lt.ThingProperty(
-        Optional[int],
-        initial_value=100000000,
-    )
+    mjpeg_bitrate: Optional[int] = lt.property(default=100000000)
     """Bitrate for MJPEG stream (None for default)."""
 
-    stream_active = lt.ThingProperty(
-        bool,
-        initial_value=False,
-        observable=True,
-        readonly=True,
-    )
+    stream_active: bool = lt.property(default=False, observable=True, readonly=True)
     """Whether the MJPEG stream is active."""
 
     def save_settings(self) -> None:
         """Override save_settings to ensure that camera properties don't recurse.
 
-        This method is run by any Thing when a ThingSetting is saved. However, the
+        This method is run by any Thing when a setting is saved. However, the
         method reads the thing_setting. As reading the thing setting talks to the
         camera and calls save_settings if the value is not as expected, this could
         cause recursion. Also this means that saving one setting causes all others
@@ -204,7 +193,7 @@ class StreamingPiCamera2(BaseCamera):
         finally:
             self._setting_save_in_progress = False
 
-    @lt.thing_property
+    @lt.property
     def calibration_required(self) -> bool:
         """Whether the camera needs calibrating."""
         # Check if the lens shading table is calibrated.
@@ -214,7 +203,7 @@ class StreamingPiCamera2(BaseCamera):
 
     _analogue_gain: float = 1.0
 
-    @lt.thing_setting
+    @lt.setting
     def analogue_gain(self) -> float:
         """The Analogue gain applied by the camera sensor."""
         if not self._setting_save_in_progress and self.streaming:
@@ -234,7 +223,7 @@ class StreamingPiCamera2(BaseCamera):
 
     _colour_gains: tuple[float, float] = (1.0, 1.0)
 
-    @lt.thing_setting
+    @lt.setting
     def colour_gains(self) -> tuple[float, float]:
         """The red and blue colour gains, must be between 0.0 and 32.0."""
         if not self._setting_save_in_progress and self.streaming:
@@ -254,7 +243,7 @@ class StreamingPiCamera2(BaseCamera):
 
     _exposure_time: int = 500
 
-    @lt.thing_setting
+    @lt.setting
     def exposure_time(self) -> int:
         """The camera exposure time in microseconds.
 
@@ -296,7 +285,7 @@ class StreamingPiCamera2(BaseCamera):
 
     _sensor_modes = None
 
-    @lt.thing_property
+    @lt.property
     def sensor_modes(self) -> list[SensorMode]:
         """All the available modes the current sensor supports."""
         if not self._sensor_modes:
@@ -306,7 +295,7 @@ class StreamingPiCamera2(BaseCamera):
 
     _sensor_mode: Optional[dict] = None
 
-    @lt.thing_property
+    @lt.property
     def sensor_mode(self) -> Optional[SensorModeSelector]:
         """The intended sensor mode of the camera."""
         if self._sensor_mode is None:
@@ -329,13 +318,13 @@ class StreamingPiCamera2(BaseCamera):
         with self._streaming_picamera(pause_stream=True):
             pass
 
-    @lt.thing_property
+    @lt.property
     def sensor_resolution(self) -> Optional[tuple[int, int]]:
         """The native resolution of the camera's sensor."""
         with self._streaming_picamera() as cam:
             return cam.sensor_resolution
 
-    tuning = lt.ThingSetting(Optional[dict], None, readonly=True)
+    tuning: Optional[dict] = lt.setting(default=None, readonly=True)
     """The Raspberry PiCamera Tuning File JSON."""
 
     def _initialise_picamera(self, check_sensor_model: bool = False) -> None:
@@ -437,7 +426,7 @@ class StreamingPiCamera2(BaseCamera):
             cam.close()
         del self._picamera
 
-    @lt.thing_action
+    @lt.action
     def start_streaming(
         self, main_resolution: tuple[int, int] = (820, 616), buffer_count: int = 6
     ) -> None:
@@ -509,7 +498,7 @@ class StreamingPiCamera2(BaseCamera):
                     "Started MJPEG stream at %s on port %s", self.stream_resolution, 1
                 )
 
-    @lt.thing_action
+    @lt.action
     def stop_streaming(self, stop_web_stream: bool = True) -> None:
         """Stop the MJPEG stream."""
         with self._streaming_picamera() as picam:
@@ -529,7 +518,7 @@ class StreamingPiCamera2(BaseCamera):
             # Adding a sleep to prevent camera getting confused by rapid commands
             time.sleep(self._sensor_info.short_pause)
 
-    @lt.thing_action
+    @lt.action
     def discard_frames(self) -> None:
         """Discard frames so that the next frame captured is fresh."""
         with self._streaming_picamera() as cam:
@@ -587,7 +576,7 @@ class StreamingPiCamera2(BaseCamera):
         else:
             raise ValueError(f'Unknown stream name "{stream_name}"')
 
-    @lt.thing_action
+    @lt.action
     def capture_array(
         self,
         stream_name: Literal["main", "lores", "raw", "full"] = "main",
@@ -620,7 +609,7 @@ class StreamingPiCamera2(BaseCamera):
         # as array
         return np.array(self.capture_image(stream_name, wait))
 
-    @lt.thing_property
+    @lt.property
     def camera_configuration(self) -> Mapping:
         """The "configuration" dictionary of the picamera2 object.
 
@@ -635,13 +624,13 @@ class StreamingPiCamera2(BaseCamera):
         with self._streaming_picamera() as cam:
             return cam.camera_configuration()
 
-    @lt.thing_property
+    @lt.property
     def capture_metadata(self) -> dict:
         """Return the metadata from the camera."""
         with self._streaming_picamera() as cam:
             return cam.capture_metadata()
 
-    @lt.thing_action
+    @lt.action
     def auto_expose_from_minimum(
         self,
         target_white_level: Optional[int] = None,
@@ -671,7 +660,7 @@ class StreamingPiCamera2(BaseCamera):
                 percentile=percentile,
             )
 
-    @lt.thing_action
+    @lt.action
     def calibrate_lens_shading(self) -> None:
         """Take an image and use it for flat-field correction.
 
@@ -699,7 +688,7 @@ class StreamingPiCamera2(BaseCamera):
 
         self.colour_gains = tf_utils.get_colour_gains_from_lst(self.tuning)
 
-    @lt.thing_property
+    @lt.property
     def colour_correction_matrix(
         self,
     ) -> tuple[float, float, float, float, float, float, float, float, float]:
@@ -724,7 +713,7 @@ class StreamingPiCamera2(BaseCamera):
             with self._streaming_picamera(pause_stream=True):
                 self._initialise_picamera()
 
-    @lt.thing_action
+    @lt.action
     def reset_ccm(self) -> None:
         """Overwrite the colour correction matrix in camera tuning with default values."""
         self.tuning = tf_utils.copy_algo_from_other_tuning(
@@ -733,7 +722,7 @@ class StreamingPiCamera2(BaseCamera):
             copy_from=self.default_tuning,
         )
 
-    @lt.thing_action
+    @lt.action
     def set_static_green_equalisation(self, offset: int = 65535) -> None:
         """Set the green equalisation to a static value.
 
@@ -748,7 +737,7 @@ class StreamingPiCamera2(BaseCamera):
             self.tuning = tf_utils.set_static_geq(self.tuning, offset)
             self._initialise_picamera()
 
-    @lt.thing_action
+    @lt.action
     def set_ce_enable_to_off(self) -> None:
         """Set the contrast enhancement to disabled.
 
@@ -759,7 +748,7 @@ class StreamingPiCamera2(BaseCamera):
             self.tuning = tf_utils.set_ce_to_disabled(self.tuning)
             self._initialise_picamera()
 
-    @lt.thing_action
+    @lt.action
     def full_auto_calibrate(self, portal: lt.deps.BlockingPortal) -> None:
         """Perform a full auto-calibration.
 
@@ -787,7 +776,7 @@ class StreamingPiCamera2(BaseCamera):
                 pass
         raise RuntimeError("Couldn't set background")
 
-    @lt.thing_property
+    @lt.property
     def primary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions for both calibration wizard and settings panel."""
         return [
@@ -805,7 +794,7 @@ class StreamingPiCamera2(BaseCamera):
             ),
         ]
 
-    @lt.thing_property
+    @lt.property
     def secondary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions that appear only in settings panel."""
         return [
@@ -847,7 +836,7 @@ class StreamingPiCamera2(BaseCamera):
             ),
         ]
 
-    @lt.thing_property
+    @lt.property
     def manual_camera_settings(self) -> list[PropertyControl]:
         """The camera settings to expose as property controls in the settings panel."""
         return [
@@ -874,7 +863,7 @@ class StreamingPiCamera2(BaseCamera):
             ),
         ]
 
-    @lt.thing_property
+    @lt.property
     def lens_shading_tables(self) -> Optional[tf_utils.LensShading]:
         """The current lens shading (i.e. flat-field correction).
 
@@ -901,7 +890,7 @@ class StreamingPiCamera2(BaseCamera):
             )
             self._initialise_picamera()
 
-    @lt.thing_action
+    @lt.action
     def flat_lens_shading(self) -> None:
         """Disable flat-field correction.
 
@@ -916,7 +905,7 @@ class StreamingPiCamera2(BaseCamera):
             self.tuning = tf_utils.flatten_lst(self.tuning)
             self._initialise_picamera()
 
-    @lt.thing_action
+    @lt.action
     def flat_lens_shading_chrominance(self) -> None:
         """Disable flat-field correction for colour only.
 
@@ -928,7 +917,7 @@ class StreamingPiCamera2(BaseCamera):
             self.tuning = tf_utils.flatten_lst(self.tuning, keep_luminance=True)
             self._initialise_picamera()
 
-    @lt.thing_action
+    @lt.action
     def reset_lens_shading(self) -> None:
         """Revert to default lens shading settings.
 
diff --git a/src/openflexure_microscope_server/things/camera/simulation.py b/src/openflexure_microscope_server/things/camera/simulation.py
index f0b80d0a..b26e69bb 100644
--- a/src/openflexure_microscope_server/things/camera/simulation.py
+++ b/src/openflexure_microscope_server/things/camera/simulation.py
@@ -86,7 +86,7 @@ class SimulatedCamera(BaseCamera):
         self.generate_blobs()
         self.generate_canvas()
 
-    @lt.thing_property
+    @lt.property
     def calibration_required(self) -> bool:
         """Whether the camera needs calibrating."""
         return not self.background_detector_status.ready
@@ -274,7 +274,7 @@ class SimulatedCamera(BaseCamera):
             self._capture_enabled = False
             self._capture_thread.join()
 
-    @lt.thing_action
+    @lt.action
     def start_streaming(
         self, main_resolution: tuple[int, int] = (820, 616), buffer_count: int = 1
     ) -> None:
@@ -300,14 +300,14 @@ class SimulatedCamera(BaseCamera):
             self._capture_thread = Thread(target=self._capture_frames)
             self._capture_thread.start()
 
-    @lt.thing_property
+    @lt.property
     def stream_active(self) -> bool:
         """Whether the MJPEG stream is active."""
         if self._capture_enabled and self._capture_thread:
             return self._capture_thread.is_alive()
         return False
 
-    noise_level = lt.ThingProperty(float, 2.0)
+    noise_level: float = lt.property(default=2.0)
 
     def _capture_frames(self) -> None:
         portal = lt.get_blocking_portal(self)
@@ -326,14 +326,14 @@ class SimulatedCamera(BaseCamera):
             except Exception as e:
                 LOGGER.exception(f"Failed to capture frame: {e}, retrying...")
 
-    @lt.thing_action
+    @lt.action
     def discard_frames(self) -> None:
         """Discard frames so that the next frame captured is fresh.
 
         There is nothing to do as this is a simulation!
         """
 
-    @lt.thing_action
+    @lt.action
     def capture_array(
         self,
         stream_name: Literal["main", "full"] = "full",
@@ -370,7 +370,7 @@ class SimulatedCamera(BaseCamera):
         LOGGER.warning(f"Simulation camera camera doesn't respect {stream_name=}")
         return self.generate_frame()
 
-    @lt.thing_action
+    @lt.action
     def full_auto_calibrate(self, portal: lt.deps.BlockingPortal) -> None:
         """Perform a full auto-calibration.
 
@@ -386,21 +386,21 @@ class SimulatedCamera(BaseCamera):
         time.sleep(0.2)
         self.load_sample()
 
-    @lt.thing_action
+    @lt.action
     def remove_sample(self) -> None:
         """Show the simulated background with no sample."""
         if not self._show_sample:
             raise RuntimeError("Sample is already removed.")
         self._show_sample = False
 
-    @lt.thing_action
+    @lt.action
     def load_sample(self) -> None:
         """Show the simulated sample."""
         if self._show_sample:
             raise RuntimeError("Sample is already in place.")
         self._show_sample = True
 
-    @lt.thing_property
+    @lt.property
     def primary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions for both calibration wizard and settings panel."""
         return [
@@ -409,7 +409,7 @@ class SimulatedCamera(BaseCamera):
             ),
         ]
 
-    @lt.thing_property
+    @lt.property
     def secondary_calibration_actions(self) -> list[ActionButton]:
         """The calibration actions that appear only in settings panel."""
         return [
@@ -417,7 +417,7 @@ class SimulatedCamera(BaseCamera):
             action_button_for(self.remove_sample, submit_label="Remove Sample"),
         ]
 
-    @lt.thing_property
+    @lt.property
     def manual_camera_settings(self) -> list[PropertyControl]:
         """The camera settings to expose as property controls in the settings panel."""
         return [property_control_for(self, "noise_level", label="Noise Level")]
diff --git a/src/openflexure_microscope_server/things/camera_stage_mapping.py b/src/openflexure_microscope_server/things/camera_stage_mapping.py
index 88a3393d..3c0f624c 100644
--- a/src/openflexure_microscope_server/things/camera_stage_mapping.py
+++ b/src/openflexure_microscope_server/things/camera_stage_mapping.py
@@ -118,7 +118,7 @@ class CameraStageMapper(lt.Thing):
     override the ``get_xyz_position()`` and ``move_to_xyz_position()`` methods.
     """
 
-    @lt.thing_action
+    @lt.action
     def calibrate_1d(
         self,
         camera: CameraClient,
@@ -154,7 +154,7 @@ class CameraStageMapper(lt.Thing):
         result["image_resolution"] = camera.capture_downsampled_array().shape[:2]
         return result
 
-    @lt.thing_action
+    @lt.action
     def calibrate_xy(
         self, camera: CameraClient, stage: Stage, logger: lt.deps.InvocationLogger
     ) -> DenumpifyingDict:
@@ -200,7 +200,7 @@ class CameraStageMapper(lt.Thing):
 
         return data
 
-    @lt.thing_property
+    @lt.property
     def image_to_stage_displacement_matrix(
         self,
     ) -> Optional[List[List[float]]]:  # 2x2 integer array
@@ -230,19 +230,17 @@ class CameraStageMapper(lt.Thing):
         ]
         return np.array(displacement_matrix).tolist()
 
-    last_calibration = lt.ThingSetting(
-        initial_value=None, model=Optional[dict], readonly=True
-    )
+    last_calibration: Optional[dict] = lt.setting(default=None, readonly=True)
     """The most recent CSM calibration."""
 
-    @lt.thing_property
+    @lt.property
     def image_resolution(self) -> Optional[Tuple[float, float]]:
         """The image size used to calibrate the image_to_stage_displacement_matrix."""
         if self.last_calibration is None:
             return None
         return self.last_calibration["image_resolution"]
 
-    @lt.thing_property
+    @lt.property
     def calibration_required(self) -> bool:
         """Whether the camera stage mapper needs calibrating."""
         return self.image_to_stage_displacement_matrix is None
@@ -254,7 +252,7 @@ class CameraStageMapper(lt.Thing):
             # added by CSMUncalibratedError
             raise CSMUncalibratedError()  # noqa: RSE102
 
-    @lt.thing_action
+    @lt.action
     def move_in_image_coordinates(
         self,
         stage: Stage,
@@ -275,7 +273,7 @@ class CameraStageMapper(lt.Thing):
         self.assert_calibrated()
         stage.move_relative(**self.convert_image_to_stage_coordinates(x=x, y=y))
 
-    @lt.thing_action
+    @lt.action
     def convert_image_to_stage_coordinates(
         self, x: float, y: float, **_kwargs: float
     ) -> Mapping[str, int]:
@@ -283,7 +281,7 @@ class CameraStageMapper(lt.Thing):
         self.assert_calibrated()
         return csm_img_to_stage(self.image_to_stage_displacement_matrix, x=x, y=y)
 
-    @lt.thing_action
+    @lt.action
     def convert_stage_to_image_coordinates(
         self, x: int, y: int, **_kwargs: int
     ) -> Mapping[str, float]:
@@ -291,7 +289,7 @@ class CameraStageMapper(lt.Thing):
         self.assert_calibrated()
         return csm_stage_to_img(self.image_to_stage_displacement_matrix, x=x, y=y)
 
-    @lt.thing_property
+    @lt.property
     def thing_state(self) -> Mapping[str, Any]:
         """Summary metadata describing the current state of the Thing."""
         return {
diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py
index eefa6b65..0704da71 100644
--- a/src/openflexure_microscope_server/things/smart_scan.py
+++ b/src/openflexure_microscope_server/things/smart_scan.py
@@ -117,7 +117,7 @@ class SmartScanThing(lt.Thing):
         self._latest_scan_name: Optional[str] = None
 
         # Scan logger is the invocation logger labthings-fastapi creates
-        # when the `sample_scan` lt.thing_action is called. It is saved as
+        # when the `sample_scan` lt.action is called. It is saved as
         # private class variable along with many others here.
         # Access to these variables requires a scan to be running,
         # any method that calls these should be decorated with
@@ -133,7 +133,7 @@ class SmartScanThing(lt.Thing):
         self._scan_data: Optional[scan_directories.ScanData] = None
         self._preview_stitcher: Optional[stitching.PreviewStitcher] = None
 
-    @lt.thing_action
+    @lt.action
     def sample_scan(
         self,
         cancel: lt.deps.CancelHook,
@@ -231,7 +231,7 @@ class SmartScanThing(lt.Thing):
                 "of motion."
             )
 
-    @lt.thing_property
+    @lt.property
     def latest_scan_name(self) -> Optional[str]:
         """The name of the last scan to be started."""
         return self._latest_scan_name
@@ -546,48 +546,27 @@ class SmartScanThing(lt.Thing):
             raise HTTPException(404, "File not found")
         return FileResponse(preview_path)
 
-    save_resolution = lt.ThingSetting(
-        initial_value=(1640, 1232),
-        model=tuple[int, int],
-    )
+    save_resolution: tuple[int, int] = lt.setting(default=(1640, 1232))
     """A tuple of the image resolution to capture."""
 
-    max_range = lt.ThingSetting(
-        initial_value=45000,
-        model=int,
-    )
+    max_range: int = lt.setting(default=45000)
     """The maximum distance in steps from the centre of the scan."""
 
-    stitch_tiff = lt.ThingSetting(
-        initial_value=False,
-        model=bool,
-    )
+    stitch_tiff: bool = lt.setting(default=False)
     """Whether or not to also produce a pyramidal tiff at the end of a scan."""
 
-    skip_background = lt.ThingSetting(
-        initial_value=True,
-        model=bool,
-    )
+    skip_background: bool = lt.setting(default=True)
     """Whether to detect and skip empty fields of view.
 
     This uses the settings from the ``BackgroundDetectThing``."""
 
-    autofocus_dz = lt.ThingSetting(
-        initial_value=1000,
-        model=int,
-    )
+    autofocus_dz: int = lt.setting(default=1000)
     """The z distance to perform an autofocus in steps."""
 
-    overlap = lt.ThingSetting(
-        initial_value=0.45,
-        model=float,
-    )
+    overlap: float = lt.setting(default=0.45)
     """The fraction (0-1) that adjacent images should overlap in x or y."""
 
-    stitch_automatically = lt.ThingSetting(
-        initial_value=True,
-        model=bool,
-    )
+    stitch_automatically: bool = lt.setting(default=True)
     """Whether to run a final stitch at the end of a successful scan."""
 
     def _get_all_scan_info(self) -> list[scan_directories.ScanInfo]:
@@ -600,7 +579,7 @@ class SmartScanThing(lt.Thing):
         ongoing_name = None if self._ongoing_scan is None else self._ongoing_scan.name
         return self._scan_dir_manager.all_scans_info(ongoing=ongoing_name)
 
-    @lt.thing_property
+    @lt.property
     def scans(self) -> ScanListInfo:
         """All the available scans.
 
@@ -675,7 +654,7 @@ class SmartScanThing(lt.Thing):
         for scan_name in self._scan_dir_manager.all_scans:
             self._delete_scan(scan_name, logger)
 
-    @lt.thing_action
+    @lt.action
     def purge_empty_scans(self, logger: lt.deps.InvocationLogger) -> None:
         """Delete all scan folders containing no images at the top level."""
         # JSON is ignored as it's created before any images are captured
@@ -712,7 +691,7 @@ class SmartScanThing(lt.Thing):
             scan_name=self.latest_scan_name, filename="preview.jpg", check_exists=True
         )
 
-    @lt.thing_property
+    @lt.property
     def latest_preview_stitch_time(self) -> Optional[float]:
         """The modification time of the latest preview image, to allow live updating.
 
@@ -746,7 +725,7 @@ class SmartScanThing(lt.Thing):
             raise HTTPException(404, "File not found")
         return FileResponse(preview_path)
 
-    @lt.thing_action
+    @lt.action
     def stitch_scan(
         self,
         logger: lt.deps.InvocationLogger,
@@ -757,7 +736,7 @@ class SmartScanThing(lt.Thing):
     ) -> None:
         """Generate a stitched image based on stage position metadata.
 
-        Note that as this is a lt.thing_action it needs the logger passed as
+        Note that as this is a lt.action it needs the logger passed as
         a variable if called from another thing action
         """
         scan_data_dict = self._scan_dir_manager.get_scan_data_dict(scan_name)
@@ -780,7 +759,7 @@ class SmartScanThing(lt.Thing):
         except SubprocessError as e:
             self._scan_logger.error(f"Stitching failed: {e}", exc_info=e)
 
-    @lt.thing_action
+    @lt.action
     def download_zip(
         self,
         scan_name: str,
@@ -792,7 +771,7 @@ class SmartScanThing(lt.Thing):
         zip_fname = self._scan_dir_manager.zip_scan(scan_name, final_version=True)
         return ZipBlob.from_file(zip_fname)
 
-    @lt.thing_action
+    @lt.action
     def stitch_all_scans(
         self, logger: lt.deps.InvocationLogger, cancel: lt.deps.CancelHook
     ) -> None:
diff --git a/src/openflexure_microscope_server/things/stage/__init__.py b/src/openflexure_microscope_server/things/stage/__init__.py
index 0e92c2c6..1d2377cd 100644
--- a/src/openflexure_microscope_server/things/stage/__init__.py
+++ b/src/openflexure_microscope_server/things/stage/__init__.py
@@ -68,28 +68,21 @@ class BaseStage(lt.Thing):
                 "_hardware_move_relative and/or _hardware_move_absolute instead."
             )
 
-    @lt.thing_property
+    @lt.property
     def axis_names(self) -> Sequence[str]:
         """The names of the stage's axes, in order."""
         return self._axis_names
 
-    @lt.thing_property
+    @lt.property
     def position(self) -> Mapping[str, int]:
         """Current position of the stage."""
         return self._apply_axis_direction(self._hardware_position)
 
-    moving = lt.ThingProperty(
-        bool,
-        False,
-        readonly=True,
-        observable=True,
-    )
+    moving: bool = lt.property(bool, default=False, readonly=True, observable=True)
     """Whether the stage is in motion."""
 
-    axis_inverted = lt.ThingSetting(
-        initial_value={"x": False, "y": False, "z": False},
-        model=Mapping[str, bool],
-        readonly=True,
+    axis_inverted: Mapping[str, bool] = lt.setting(
+        default={"x": False, "y": False, "z": False}, readonly=True
     )
     """Used to convert coordinates between the program frame and the hardware frame."""
 
@@ -124,7 +117,7 @@ class BaseStage(lt.Thing):
         """Summary metadata describing the current state of the stage."""
         return {"position": self.position}
 
-    @lt.thing_action
+    @lt.action
     def invert_axis_direction(self, axis: Literal["x", "y", "z"]) -> None:
         """Invert the direction setting of the given axis.
 
@@ -138,7 +131,7 @@ class BaseStage(lt.Thing):
             raise KeyError(f"The axis {axis} is not defined.") from e
         self.axis_inverted = direction
 
-    @lt.thing_action
+    @lt.action
     def move_relative(
         self,
         cancel: lt.deps.CancelHook,
@@ -166,7 +159,7 @@ class BaseStage(lt.Thing):
             "StageThings must define their own _hardware_move_relative method"
         )
 
-    @lt.thing_action
+    @lt.action
     def move_absolute(
         self,
         cancel: lt.deps.CancelHook,
@@ -194,7 +187,7 @@ class BaseStage(lt.Thing):
             "StageThings must define their own move_absolute method"
         )
 
-    @lt.thing_action
+    @lt.action
     def set_zero_position(self) -> None:
         """Make the current position zero in all axes.
 
@@ -206,7 +199,7 @@ class BaseStage(lt.Thing):
             "StageThings must define their own set_zero_position method"
         )
 
-    @lt.thing_action
+    @lt.action
     def get_xyz_position(self) -> tuple[int, int, int]:
         """Return a tuple containing (x, y, z) position.
 
@@ -217,7 +210,7 @@ class BaseStage(lt.Thing):
         position_dict = self.position
         return (position_dict["x"], position_dict["y"], position_dict["z"])
 
-    @lt.thing_action
+    @lt.action
     def move_to_xyz_position(
         self, cancel: lt.deps.CancelHook, xyz_pos: tuple[int, int, int]
     ) -> None:
diff --git a/src/openflexure_microscope_server/things/stage/dummy.py b/src/openflexure_microscope_server/things/stage/dummy.py
index a2572908..ff83dddb 100644
--- a/src/openflexure_microscope_server/things/stage/dummy.py
+++ b/src/openflexure_microscope_server/things/stage/dummy.py
@@ -43,10 +43,8 @@ class DummyStage(BaseStage):
     ) -> None:
         """Nothing to do when the Thing context manager is closed."""
 
-    axis_inverted = lt.ThingSetting(
-        initial_value={"x": True, "y": False, "z": False},
-        model=Mapping[str, bool],
-        readonly=True,
+    axis_inverted: Mapping[str, bool] = lt.setting(
+        default={"x": True, "y": False, "z": False}, readonly=True
     )
     """Used to convert coordinates between the program frame and the hardware frame."""
 
@@ -104,7 +102,7 @@ class DummyStage(BaseStage):
             cancel, block_cancellation=block_cancellation, **displacement
         )
 
-    @lt.thing_action
+    @lt.action
     def set_zero_position(self) -> None:
         """Make the current position zero in all axes.
 
diff --git a/src/openflexure_microscope_server/things/stage/sangaboard.py b/src/openflexure_microscope_server/things/stage/sangaboard.py
index 7432480b..7748ca28 100644
--- a/src/openflexure_microscope_server/things/stage/sangaboard.py
+++ b/src/openflexure_microscope_server/things/stage/sangaboard.py
@@ -78,10 +78,8 @@ class SangaboardThing(BaseStage):
         with self._sangaboard_lock:
             yield self._sangaboard
 
-    axis_inverted = lt.ThingSetting(
-        initial_value={"x": True, "y": False, "z": True},
-        model=Mapping[str, bool],
-        readonly=True,
+    axis_inverted: Mapping[str, bool] = lt.setting(
+        default={"x": True, "y": False, "z": True}, readonly=True
     )
     """Used to convert coordinates between the program frame and the hardware frame."""
 
@@ -164,7 +162,7 @@ class SangaboardThing(BaseStage):
                 cancel, block_cancellation=block_cancellation, **displacement
             )
 
-    @lt.thing_action
+    @lt.action
     def set_zero_position(self) -> None:
         """Make the current position zero in all axes.
 
@@ -176,7 +174,7 @@ class SangaboardThing(BaseStage):
             sb.zero_position()
         self.update_position()
 
-    @lt.thing_action
+    @lt.action
     def flash_led(
         self,
         number_of_flashes: int = 10,
diff --git a/src/openflexure_microscope_server/things/stage_measure.py b/src/openflexure_microscope_server/things/stage_measure.py
index c4dd9613..84cabe36 100644
--- a/src/openflexure_microscope_server/things/stage_measure.py
+++ b/src/openflexure_microscope_server/things/stage_measure.py
@@ -136,9 +136,7 @@ class ParasiticMotionError(Exception):
 class RangeofMotionThing(lt.Thing):
     """A class used to measure the range of motion of the stage in X and Y."""
 
-    calibrated_range = lt.ThingSetting(
-        initial_value=None, model=Optional[list[int, int]], readonly=True
-    )
+    calibrated_range: int = lt.setting(default=None, readonly=True)
 
     def __init__(self) -> None:
         """Initialise and create the lock."""
@@ -147,7 +145,7 @@ class RangeofMotionThing(lt.Thing):
         self._stream_resolution: Optional[tuple[int, int]] = None
         self._rom_data = RomDataTracker()
 
-    @lt.thing_action
+    @lt.action
     def perform_rom_test(
         self,
         autofocus: AutofocusDep,
@@ -214,7 +212,7 @@ class RangeofMotionThing(lt.Thing):
             "Step Range": step_range,
         }
 
-    @lt.thing_action
+    @lt.action
     def perform_recentre(
         self,
         autofocus: AutofocusDep,
diff --git a/src/openflexure_microscope_server/things/system.py b/src/openflexure_microscope_server/things/system.py
index d8a785e6..2d5fa63a 100644
--- a/src/openflexure_microscope_server/things/system.py
+++ b/src/openflexure_microscope_server/things/system.py
@@ -43,7 +43,7 @@ class OpenFlexureSystem(lt.Thing):
 
     _microscope_id: Optional[str] = None
 
-    @lt.thing_setting
+    @lt.setting
     def microscope_id(self) -> UUID:
         """A unique identifier for this microscope."""
         if self._microscope_id is None:
@@ -54,14 +54,14 @@ class OpenFlexureSystem(lt.Thing):
     def microscope_id(self, uuid: UUID) -> None:
         self._microscope_id = uuid
 
-    @lt.thing_property
+    @lt.property
     def hostname(self) -> str:
         """The hostname of the microscope, as reported by its operating system."""
         return socket.gethostname()
 
     _version_data: Optional[VersionData] = None
 
-    @lt.thing_property
+    @lt.property
     def version_data(self) -> VersionData:
         """The version string and version source for the server.
 
@@ -76,12 +76,12 @@ class OpenFlexureSystem(lt.Thing):
             self._version_data = robust_version_strings()
         return self._version_data
 
-    @lt.thing_property
+    @lt.property
     def is_raspberrypi(self) -> bool:
         """Return True if running on a Raspberry Pi."""
         return os.path.exists("/usr/bin/raspi-config")
 
-    @lt.thing_action
+    @lt.action
     def shutdown(self) -> CommandOutput:
         """Attempt to shutdown the device."""
         if not self.is_raspberrypi:
@@ -103,7 +103,7 @@ class OpenFlexureSystem(lt.Thing):
         out, err = p.communicate()
         return CommandOutput(output=out, error=err)
 
-    @lt.thing_action
+    @lt.action
     def reboot(self) -> CommandOutput:
         """Attempt to reboot the device."""
         if not self.is_raspberrypi:
@@ -120,7 +120,7 @@ class OpenFlexureSystem(lt.Thing):
         out, err = p.communicate()
         return CommandOutput(output=out, error=err)
 
-    @lt.thing_action
+    @lt.action
     def get_things_state(self, metadata_getter: lt.deps.GetThingStates) -> Mapping:
         """Metadata summarising the current state of all Things in the server."""
         return metadata_getter()
diff --git a/tests/test_stage.py b/tests/test_stage.py
index b735ab4c..a95d0b33 100644
--- a/tests/test_stage.py
+++ b/tests/test_stage.py
@@ -63,7 +63,7 @@ def test_override_base_movement():
     """
 
     class BadStage1(BaseStage):
-        @lt.thing_action
+        @lt.action
         def move_relative(
             self,
             cancel: lt.deps.CancelHook,
@@ -76,7 +76,7 @@ def test_override_base_movement():
         BadStage1()
 
     class BadStage2(BaseStage):
-        @lt.thing_action
+        @lt.action
         def move_absolute(
             self,
             cancel: lt.deps.CancelHook,

From a0b8a71477bbf06d6dbffa27eba70814477ff032 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 13:06:42 +0000
Subject: [PATCH 03/21] Update config files to use names not paths

---
 ofm_config_full.json       | 14 +++++++-------
 ofm_config_manual.json     |  4 ++--
 ofm_config_simulation.json | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ofm_config_full.json b/ofm_config_full.json
index 2be08676..5b4d5f0f 100644
--- a/ofm_config_full.json
+++ b/ofm_config_full.json
@@ -1,22 +1,22 @@
 {
     "things": {
-        "/camera/": {
+        "camera": {
             "class": "openflexure_microscope_server.things.camera.picamera:StreamingPiCamera2",
             "kwargs": {
                 "camera_board": "picamera_v2"
             }
         },
-        "/stage/": "openflexure_microscope_server.things.stage.sangaboard:SangaboardThing",
-        "/autofocus/": "openflexure_microscope_server.things.autofocus:AutofocusThing",
-        "/camera_stage_mapping/": "openflexure_microscope_server.things.camera_stage_mapping:CameraStageMapper",
-        "/system/": "openflexure_microscope_server.things.system:OpenFlexureSystem",
-        "/smart_scan/": {
+        "stage": "openflexure_microscope_server.things.stage.sangaboard:SangaboardThing",
+        "autofocus": "openflexure_microscope_server.things.autofocus:AutofocusThing",
+        "camera_stage_mapping": "openflexure_microscope_server.things.camera_stage_mapping:CameraStageMapper",
+        "system": "openflexure_microscope_server.things.system:OpenFlexureSystem",
+        "smart_scan": {
             "class": "openflexure_microscope_server.things.smart_scan:SmartScanThing",
             "kwargs": {
                 "scans_folder": "/var/openflexure/scans/"
             }
         },
-        "/stage_measure/":"openflexure_microscope_server.things.stage_measure:RangeofMotionThing"
+        "stage_measure":"openflexure_microscope_server.things.stage_measure:RangeofMotionThing"
     },
     "settings_folder": "/var/openflexure/settings/",
     "log_folder": "/var/openflexure/logs/"
diff --git a/ofm_config_manual.json b/ofm_config_manual.json
index 03cae49e..c8b878ec 100644
--- a/ofm_config_manual.json
+++ b/ofm_config_manual.json
@@ -1,10 +1,10 @@
 {
     "things": {
-        "/camera/": {
+        "camera": {
             "class": "openflexure_microscope_server.things.camera.opencv:OpenCVCamera",
             "kwargs": {"camera_index": 0}
         },
-        "/system/": "openflexure_microscope_server.things.system:OpenFlexureSystem"
+        "system": "openflexure_microscope_server.things.system:OpenFlexureSystem"
     },
     "settings_folder": "./openflexure/settings/",
     "log_folder": "./openflexure/logs/"
diff --git a/ofm_config_simulation.json b/ofm_config_simulation.json
index 4ea1a7ec..a28e71c9 100644
--- a/ofm_config_simulation.json
+++ b/ofm_config_simulation.json
@@ -1,11 +1,11 @@
 {
     "things": {
-        "/camera/": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
-        "/stage/": "openflexure_microscope_server.things.stage.dummy:DummyStage",
-        "/autofocus/": "openflexure_microscope_server.things.autofocus:AutofocusThing",
-        "/camera_stage_mapping/": "openflexure_microscope_server.things.camera_stage_mapping:CameraStageMapper",
-        "/system/": "openflexure_microscope_server.things.system:OpenFlexureSystem",
-        "/smart_scan/": {
+        "camera": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
+        "stage": "openflexure_microscope_server.things.stage.dummy:DummyStage",
+        "autofocus": "openflexure_microscope_server.things.autofocus:AutofocusThing",
+        "camera_stage_mapping": "openflexure_microscope_server.things.camera_stage_mapping:CameraStageMapper",
+        "system": "openflexure_microscope_server.things.system:OpenFlexureSystem",
+        "smart_scan": {
             "class": "openflexure_microscope_server.things.smart_scan:SmartScanThing",
             "kwargs": {
                 "scans_folder": "./openflexure/scans/"

From 5d3aa71b4f3cc1b89e0db91e36ec92a087e4aee3 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 13:07:50 +0000
Subject: [PATCH 04/21] Update things to have thing_server_interface, and
 further fixes to properties

---
 .../things/camera/__init__.py                         |  4 ++--
 .../things/camera/opencv.py                           |  6 ++++--
 .../things/camera/picamera.py                         | 11 ++++++++---
 .../things/camera/simulation.py                       |  3 ++-
 .../things/smart_scan.py                              |  5 ++++-
 .../things/stage/__init__.py                          |  5 +++--
 .../things/stage/dummy.py                             |  9 +++++++--
 .../things/stage/sangaboard.py                        |  9 +++++++--
 .../things/stage_measure.py                           |  4 ++--
 9 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/__init__.py b/src/openflexure_microscope_server/things/camera/__init__.py
index 70660b21..67f00b32 100644
--- a/src/openflexure_microscope_server/things/camera/__init__.py
+++ b/src/openflexure_microscope_server/things/camera/__init__.py
@@ -175,7 +175,7 @@ class BaseCamera(lt.Thing):
     lores_mjpeg_stream = lt.outputs.MJPEGStreamDescriptor()
     _memory_buffer = CameraMemoryBuffer()
 
-    def __init__(self) -> None:
+    def __init__(self, thing_server_interface: lt.ThingServerInterface) -> None:
         """Initialise the base camera, this creates the background detectors.
 
         This must be run by all child camera classes.
@@ -183,7 +183,7 @@ class BaseCamera(lt.Thing):
         To add a new background detector to the server it must be added to the
         dictionary in this function. Configuration will be added at a later date.
         """
-        super().__init__()
+        super().__init__(thing_server_interface)
         self.background_detectors = {
             "Colour Channels (LUV)": ColourChannelDetectLUV(),
             "Channel Deviations (LUV)": ChannelDeviationLUV(),
diff --git a/src/openflexure_microscope_server/things/camera/opencv.py b/src/openflexure_microscope_server/things/camera/opencv.py
index 421b3a6e..5a6a1675 100644
--- a/src/openflexure_microscope_server/things/camera/opencv.py
+++ b/src/openflexure_microscope_server/things/camera/opencv.py
@@ -27,12 +27,14 @@ LOGGER = logging.getLogger(__name__)
 class OpenCVCamera(BaseCamera):
     """A Thing that provides and interface to an OpenCV Camera."""
 
-    def __init__(self, camera_index: int = 0) -> None:
+    def __init__(
+        self, thing_server_interface: lt.ThingServerInterface, camera_index: int = 0
+    ) -> None:
         """Iniatilise the thing storing the index of the camera to use.
 
         :param camera_index: The index of the camera to use for the microscope.
         """
-        super().__init__()
+        super().__init__(thing_server_interface)
         self.camera_index = camera_index
         self._capture_thread: Optional[Thread] = None
         self._capture_enabled = False
diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 14a9b723..c7b5ec0b 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -128,7 +128,12 @@ class StreamingPiCamera2(BaseCamera):
     generalisation.
     """
 
-    def __init__(self, camera_num: int = 0, camera_board: str = "picamera_v2") -> None:
+    def __init__(
+        self,
+        thing_server_interface: lt.ThingServerInterface,
+        camera_num: int = 0,
+        camera_board: str = "picamera_v2",
+    ) -> None:
         """Initialise the camera with the given camera number.
 
         This makes no connection to the camera (except to get the default tuning file).
@@ -138,7 +143,7 @@ class StreamingPiCamera2(BaseCamera):
         :param camera_board: The camera board used. Supported options are "picamera_v2"
            and "picamera_hq".
         """
-        super().__init__()
+        super().__init__(thing_server_interface)
         self._setting_save_in_progress = False
         self._camera_num = camera_num
         self._camera_board = camera_board
@@ -175,7 +180,7 @@ class StreamingPiCamera2(BaseCamera):
     mjpeg_bitrate: Optional[int] = lt.property(default=100000000)
     """Bitrate for MJPEG stream (None for default)."""
 
-    stream_active: bool = lt.property(default=False, observable=True, readonly=True)
+    stream_active: bool = lt.property(default=False, readonly=True)
     """Whether the MJPEG stream is active."""
 
     def save_settings(self) -> None:
diff --git a/src/openflexure_microscope_server/things/camera/simulation.py b/src/openflexure_microscope_server/things/camera/simulation.py
index b26e69bb..f64131cb 100644
--- a/src/openflexure_microscope_server/things/camera/simulation.py
+++ b/src/openflexure_microscope_server/things/camera/simulation.py
@@ -52,6 +52,7 @@ class SimulatedCamera(BaseCamera):
 
     def __init__(
         self,
+        thing_server_interface: lt.ThingServerInterface,
         shape: tuple[int, int, int] = (616, 820, 3),
         glyph_shape: tuple[int, int, int] = (121, 121, 3),
         canvas_shape: tuple[int, int, int] = (3000, 4000, 3),
@@ -71,7 +72,7 @@ class SimulatedCamera(BaseCamera):
         :param frame_interval: Nominally the time between frames on the MJPEG stream,
             however the rate may be slower due to calculation time for focus.
         """
-        super().__init__()
+        super().__init__(thing_server_interface)
         self.shape = shape
         self.glyph_shape = glyph_shape
         self.canvas_shape = canvas_shape
diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py
index 0704da71..6523e59f 100644
--- a/src/openflexure_microscope_server/things/smart_scan.py
+++ b/src/openflexure_microscope_server/things/smart_scan.py
@@ -103,13 +103,16 @@ class SmartScanThing(lt.Thing):
     past scans.
     """
 
-    def __init__(self, scans_folder: str) -> None:
+    def __init__(
+        self, thing_server_interface: lt.ThingServerInterface, scans_folder: str
+    ) -> None:
         """Initialise a SmartScanThing saving to and loading from the input directory.
 
         :param scans_folder: This is the path to the directory where all scans will be
             saved. Any scans already in this directory will be accessible through the
             HTTP interface.
         """
+        super().__init__(thing_server_interface)
         self._scan_dir_manager = scan_directories.ScanDirectoryManager(scans_folder)
         self._scan_lock = threading.Lock()
 
diff --git a/src/openflexure_microscope_server/things/stage/__init__.py b/src/openflexure_microscope_server/things/stage/__init__.py
index 1d2377cd..f6ae2526 100644
--- a/src/openflexure_microscope_server/things/stage/__init__.py
+++ b/src/openflexure_microscope_server/things/stage/__init__.py
@@ -46,7 +46,7 @@ class BaseStage(lt.Thing):
 
     _axis_names = ("x", "y", "z")
 
-    def __init__(self) -> None:
+    def __init__(self, thing_server_interface: lt.ThingServerInterface) -> None:
         """Initialise the stage.
 
         :raises RedefinedBaseMovementError: if ``move_relative`` and/or
@@ -54,6 +54,7 @@ class BaseStage(lt.Thing):
             ``_hardware_move_relative`` and/or ``_hardware_move_absolute`` instead so
             that all code in the child class uses the hardware reference frame.
         """
+        super().__init__(thing_server_interface)
         self._hardware_position = dict.fromkeys(self._axis_names, 0)
 
         # This must be the last thing the function does in case it is caught in a try.
@@ -78,7 +79,7 @@ class BaseStage(lt.Thing):
         """Current position of the stage."""
         return self._apply_axis_direction(self._hardware_position)
 
-    moving: bool = lt.property(bool, default=False, readonly=True, observable=True)
+    moving: bool = lt.property(default=False, readonly=True)
     """Whether the stage is in motion."""
 
     axis_inverted: Mapping[str, bool] = lt.setting(
diff --git a/src/openflexure_microscope_server/things/stage/dummy.py b/src/openflexure_microscope_server/things/stage/dummy.py
index ff83dddb..47eca648 100644
--- a/src/openflexure_microscope_server/things/stage/dummy.py
+++ b/src/openflexure_microscope_server/things/stage/dummy.py
@@ -19,7 +19,12 @@ class DummyStage(BaseStage):
     hardware attached.
     """
 
-    def __init__(self, step_time: float = 0.001, **kwargs: Any) -> None:
+    def __init__(
+        self,
+        thing_server_interface: lt.ThingServerInterface,
+        step_time: float = 0.001,
+        **kwargs: Any,
+    ) -> None:
         """Initialise the Dummy stage, setting the step_time to adjust the speed.
 
         :param step_time: The time in seconds per "motor" step. The default of 0.001
@@ -27,7 +32,7 @@ class DummyStage(BaseStage):
             so the speed can be increased. Increasing it too far is problematic if
             also doing computationally heavy tasks like simulated image blurring.
         """
-        super().__init__(**kwargs)
+        super().__init__(thing_server_interface, **kwargs)
         self.step_time = step_time
         self.instantaneous_position = self._hardware_position
 
diff --git a/src/openflexure_microscope_server/things/stage/sangaboard.py b/src/openflexure_microscope_server/things/stage/sangaboard.py
index 7748ca28..92ef8d5c 100644
--- a/src/openflexure_microscope_server/things/stage/sangaboard.py
+++ b/src/openflexure_microscope_server/things/stage/sangaboard.py
@@ -33,7 +33,12 @@ class SangaboardThing(BaseStage):
     functionality is accessed by directly querying the serial interface.
     """
 
-    def __init__(self, port: str = None, **kwargs: Any) -> None:
+    def __init__(
+        self,
+        thing_server_interface: lt.ThingServerInterface,
+        port: str = None,
+        **kwargs: Any,
+    ) -> None:
         """Initialise SangaboardThing.
 
         Initialise the "Thing", but do not initialise an underlying
@@ -49,7 +54,7 @@ class SangaboardThing(BaseStage):
         self.sangaboard_kwargs = copy(kwargs)
         self.sangaboard_kwargs["port"] = port
         self._sangaboard_lock = threading.RLock()
-        super().__init__(**kwargs)
+        super().__init__(thing_server_interface, **kwargs)
 
     def __enter__(self) -> None:
         """Connect to the sangaboard when the Thing context manager is opened."""
diff --git a/src/openflexure_microscope_server/things/stage_measure.py b/src/openflexure_microscope_server/things/stage_measure.py
index 84cabe36..439561e7 100644
--- a/src/openflexure_microscope_server/things/stage_measure.py
+++ b/src/openflexure_microscope_server/things/stage_measure.py
@@ -138,9 +138,9 @@ class RangeofMotionThing(lt.Thing):
 
     calibrated_range: int = lt.setting(default=None, readonly=True)
 
-    def __init__(self) -> None:
+    def __init__(self, thing_server_interface: lt.ThingServerInterface) -> None:
         """Initialise and create the lock."""
-        super().__init__()
+        super().__init__(thing_server_interface)
         self._lock = Lock()
         self._stream_resolution: Optional[tuple[int, int]] = None
         self._rom_data = RomDataTracker()

From c318fddf8902b50119429cd226f4092ae4d269b1 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 13:09:25 +0000
Subject: [PATCH 05/21] Update fastapi_endpoint to endpoint

---
 src/openflexure_microscope_server/things/smart_scan.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py
index 6523e59f..951e6988 100644
--- a/src/openflexure_microscope_server/things/smart_scan.py
+++ b/src/openflexure_microscope_server/things/smart_scan.py
@@ -526,7 +526,7 @@ class SmartScanThing(lt.Thing):
                 overlap=self._scan_data.overlap,
             )
 
-    @lt.fastapi_endpoint(
+    @lt.endpoint(
         "get",
         "scans/stitched_thumbnail.jpg",
         responses={
@@ -597,7 +597,7 @@ class SmartScanThing(lt.Thing):
             ongoing=None if self._ongoing_scan is None else self._ongoing_scan.name,
         )
 
-    @lt.fastapi_endpoint(
+    @lt.endpoint(
         "get",
         "get_stitch/{scan_name}",
         responses={
@@ -621,7 +621,7 @@ class SmartScanThing(lt.Thing):
             raise HTTPException(404, "File not found")
         return FileResponse(stitch_path)
 
-    @lt.fastapi_endpoint(
+    @lt.endpoint(
         "delete",
         "scans/{scan_name}",
         responses={
@@ -643,7 +643,7 @@ class SmartScanThing(lt.Thing):
         if not deleted_scan_success:
             raise HTTPException(400, "Couldn't delete scan, check log for details")
 
-    @lt.fastapi_endpoint(
+    @lt.endpoint(
         "delete",
         "scans",
     )
@@ -710,7 +710,7 @@ class SmartScanThing(lt.Thing):
             return None
         return os.path.getmtime(self.latest_preview_stitch_path)
 
-    @lt.fastapi_endpoint(
+    @lt.endpoint(
         "get",
         "latest_preview_stitch.jpg",
         responses={

From ca3f339cbeeac7421553bb336373b0455f3c074a Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 16:04:01 +0000
Subject: [PATCH 06/21] Simulation camera get dummy stage from thing_slot

---
 .../things/camera/simulation.py               | 31 +++----------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/simulation.py b/src/openflexure_microscope_server/things/camera/simulation.py
index f64131cb..3c543a61 100644
--- a/src/openflexure_microscope_server/things/camera/simulation.py
+++ b/src/openflexure_microscope_server/things/camera/simulation.py
@@ -13,7 +13,7 @@ import logging
 import time
 from threading import Thread
 from types import TracebackType
-from typing import Literal, Mapping, Optional
+from typing import Literal, Optional
 
 import numpy as np
 from PIL import Image, ImageFilter
@@ -27,7 +27,7 @@ from openflexure_microscope_server.ui import (
     property_control_for,
 )
 
-from ..stage import BaseStage
+from ..stage.dummy import DummyStage
 from . import ArrayModel, BaseCamera
 
 LOGGER = logging.getLogger(__name__)
@@ -46,8 +46,8 @@ RNG = np.random.default_rng()
 class SimulatedCamera(BaseCamera):
     """A Thing that simulates a camera for testing."""
 
-    _stage: Optional[BaseStage] = None
-    _server: Optional[lt.ThingServer] = None
+    _stage: DummyStage = lt.thing_slot()
+
     _show_sample: bool = True
 
     def __init__(
@@ -229,31 +229,10 @@ class SimulatedCamera(BaseCamera):
         image[image > 255] = 255
         return Image.fromarray(image.astype("uint8"))
 
-    def attach_to_server(
-        self, server: lt.ThingServer, path: str, setting_storage_path: str
-    ) -> None:
-        """Wrap the attach_to_server method so the server instance can be stored.
-
-        Direct access to the server instance is needed to get the stage position while
-        maintaining the same public API as a real camera that doesn't need this access.
-        """
-        self._server = server
-        super().attach_to_server(server, path, setting_storage_path)
-
-    def get_stage_position(self) -> Mapping[str, int]:
-        """Return the stage position.
-
-        The simulation camera has access to the stage position so it can generate a
-        different image as the stage moves.
-        """
-        if not self._stage and self._server:
-            self._stage = self._server.things["/stage/"]
-        return self._stage.instantaneous_position
-
     def generate_frame(self) -> Image:
         """Generate a frame with blobs based on the stage coordinates."""
         try:
-            pos = self.get_stage_position()
+            pos = self._stage.instantaneous_position
         except Exception as e:
             LOGGER.debug(f"Failed to get stage position: {e}")
             pos = {"x": 0, "y": 0, "z": 0}

From e7f669cb5676ae8018eb9a11d22231bdc506f555 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 16:08:59 +0000
Subject: [PATCH 07/21] No blocking portals

---
 .../things/camera/opencv.py                   |  5 ++---
 .../things/camera/picamera.py                 | 22 +++++--------------
 .../things/camera/simulation.py               |  5 ++---
 tests/test_camera.py                          |  9 +++-----
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/opencv.py b/src/openflexure_microscope_server/things/camera/opencv.py
index 5a6a1675..3882730e 100644
--- a/src/openflexure_microscope_server/things/camera/opencv.py
+++ b/src/openflexure_microscope_server/things/camera/opencv.py
@@ -70,18 +70,17 @@ class OpenCVCamera(BaseCamera):
         return False
 
     def _capture_frames(self) -> None:
-        portal = lt.get_blocking_portal(self)
         while self._capture_enabled:
             ret, frame = self.cap.read()
             if not ret:
                 LOGGER.error(f"Failed to capture frame from camera {self.camera_index}")
                 break
             jpeg = cv2.imencode(".jpg", frame)[1].tobytes()
-            self.mjpeg_stream.add_frame(jpeg, portal)
+            self.mjpeg_stream.add_frame(jpeg)
             jpeg_lores = cv2.imencode(".jpg", cv2.resize(frame, (320, 240)))[
                 1
             ].tobytes()
-            self.lores_mjpeg_stream.add_frame(jpeg_lores, portal)
+            self.lores_mjpeg_stream.add_frame(jpeg_lores)
 
     @lt.action
     def discard_frames(self) -> None:
diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index c7b5ec0b..ac3078a1 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -68,9 +68,7 @@ class MissingCalibrationError(RuntimeError):
 class PicameraStreamOutput(Output):
     """An Output class that sends frames to a stream."""
 
-    def __init__(
-        self, stream: lt.outputs.MJPEGStream, portal: lt.deps.BlockingPortal
-    ) -> None:
+    def __init__(self, stream: lt.outputs.MJPEGStream) -> None:
         """Create an output that puts frames in an MJPEGStream.
 
         We need to pass the stream object, and also the blocking portal, because
@@ -80,7 +78,6 @@ class PicameraStreamOutput(Output):
         """
         Output.__init__(self)
         self.stream = stream
-        self.portal = portal
 
     def outputframe(
         self,
@@ -91,7 +88,7 @@ class PicameraStreamOutput(Output):
         _audio: bool = False,
     ) -> None:
         """Add a frame to the stream's ringbuffer."""
-        self.stream.add_frame(frame, self.portal)
+        self.stream.add_frame(frame)
 
 
 class SensorMode(BaseModel):
@@ -480,18 +477,12 @@ class StreamingPiCamera2(BaseCamera):
                 stream_name = "lores" if main_resolution[0] > 1280 else "main"
                 picam.start_recording(
                     MJPEGEncoder(self.mjpeg_bitrate),
-                    PicameraStreamOutput(
-                        self.mjpeg_stream,
-                        lt.get_blocking_portal(self),
-                    ),
+                    PicameraStreamOutput(self.mjpeg_stream),
                     name=stream_name,
                 )
                 picam.start_encoder(
                     MJPEGEncoder(100000000),
-                    PicameraStreamOutput(
-                        self.lores_mjpeg_stream,
-                        lt.get_blocking_portal(self),
-                    ),
+                    PicameraStreamOutput(self.lores_mjpeg_stream),
                     name="lores",
                 )
             except Exception as e:
@@ -515,9 +506,8 @@ class StreamingPiCamera2(BaseCamera):
             else:
                 self.stream_active = False
                 if stop_web_stream:
-                    portal = lt.get_blocking_portal(self)
-                    self.mjpeg_stream.stop(portal)
-                    self.lores_mjpeg_stream.stop(portal)
+                    self.mjpeg_stream.stop()
+                    self.lores_mjpeg_stream.stop()
                 LOGGER.info("Stopped MJPEG stream.")
 
             # Adding a sleep to prevent camera getting confused by rapid commands
diff --git a/src/openflexure_microscope_server/things/camera/simulation.py b/src/openflexure_microscope_server/things/camera/simulation.py
index 3c543a61..79a4cff8 100644
--- a/src/openflexure_microscope_server/things/camera/simulation.py
+++ b/src/openflexure_microscope_server/things/camera/simulation.py
@@ -290,7 +290,6 @@ class SimulatedCamera(BaseCamera):
     noise_level: float = lt.property(default=2.0)
 
     def _capture_frames(self) -> None:
-        portal = lt.get_blocking_portal(self)
         last_frame_t = time.time()
         while self._capture_enabled:
             wait_time = last_frame_t - time.time() - self.frame_interval
@@ -299,9 +298,9 @@ class SimulatedCamera(BaseCamera):
             last_frame_t = time.time()
             try:
                 frame = self.generate_frame()
-                self.mjpeg_stream.add_frame(_frame2bytes(frame), portal)
+                self.mjpeg_stream.add_frame(_frame2bytes(frame))
                 ds_frame = frame.resize((320, 240), resample=Image.NEAREST)
-                self.lores_mjpeg_stream.add_frame(_frame2bytes(ds_frame), portal)
+                self.lores_mjpeg_stream.add_frame(_frame2bytes(ds_frame))
 
             except Exception as e:
                 LOGGER.exception(f"Failed to capture frame: {e}, retrying...")
diff --git a/tests/test_camera.py b/tests/test_camera.py
index c6009f71..18c8214a 100644
--- a/tests/test_camera.py
+++ b/tests/test_camera.py
@@ -51,8 +51,6 @@ def test_handle_broken_frame():
 
     camera.mjpeg_stream.grab_frame = flaky_grabber
     with camera_server(camera):
-        portal = lt.get_blocking_portal(camera)
-
         # Check that this does cause broken frames.
         # The noqa is because we don't know exactly when the error is thrown so we
         # can't have a single simple statement in the pytest raises.
@@ -60,13 +58,13 @@ def test_handle_broken_frame():
             OSError, match="broken data stream when reading image file"
         ):
             for _i in range(15):
-                jpeg = camera.grab_jpeg(portal)
+                jpeg = camera.grab_jpeg()
                 np.asarray(Image.open(jpeg.open()))
 
         # Check that grab_as_array handles the broken frames and completes without
         # the same error.
         for _i in range(15):
-            array = camera.grab_as_array(portal)
+            array = camera.grab_as_array()
             assert isinstance(array, np.ndarray)
 
 
@@ -74,8 +72,7 @@ def test_simulation_cam_calibration():
     """Test that the simulated camera can be calibrated and reports calibration correctly."""
     camera = SimulatedCamera()
     with camera_server(camera):
-        portal = lt.get_blocking_portal(camera)
         assert camera.calibration_required
-        camera.full_auto_calibrate(portal)
+        camera.full_auto_calibrate()
         assert not camera.calibration_required
         assert camera.background_detector_status.ready

From 9ef417971f5b60b169a2cc1b68c2a42f7baa5b42 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 16:20:08 +0000
Subject: [PATCH 08/21] Remove a load more /names/

---
 .../picamera2/cam_test_utils/__init__.py      |  4 +--
 hardware-specific-tests/picamera2/conftest.py |  2 +-
 .../server/__init__.py                        |  8 +++---
 .../things/camera/__init__.py                 |  2 +-
 .../things/smart_scan.py                      |  4 +--
 .../things/stage/__init__.py                  |  2 +-
 .../things/stage_measure.py                   |  4 +--
 src/openflexure_microscope_server/ui.py       |  6 ++--
 tests/test_camera.py                          |  2 +-
 tests/test_dummy_server.py                    | 28 +++++++++----------
 tests/test_legacy_api.py                      |  4 +--
 tests/test_server_config.py                   |  6 ++--
 tests/test_stack.py                           |  2 +-
 tests/test_stage.py                           |  4 +--
 tests/test_stage_measure.py                   |  2 +-
 15 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/hardware-specific-tests/picamera2/cam_test_utils/__init__.py b/hardware-specific-tests/picamera2/cam_test_utils/__init__.py
index 145510f1..a7baeb0e 100644
--- a/hardware-specific-tests/picamera2/cam_test_utils/__init__.py
+++ b/hardware-specific-tests/picamera2/cam_test_utils/__init__.py
@@ -32,10 +32,10 @@ def camera_test_client(
         if settings_folder is None:
             settings_folder = tmpdir
         server = lt.ThingServer(settings_folder=settings_folder)
-        server.add_thing(cam, "/camera/")
+        server.add_thing(cam, "camera")
 
         with TestClient(server.app) as test_client:
-            client = lt.ThingClient.from_url("/camera/", client=test_client)
+            client = lt.ThingClient.from_url("camera", client=test_client)
             yield client
     del server
     del cam
diff --git a/hardware-specific-tests/picamera2/conftest.py b/hardware-specific-tests/picamera2/conftest.py
index f62b22a1..d6f4568d 100644
--- a/hardware-specific-tests/picamera2/conftest.py
+++ b/hardware-specific-tests/picamera2/conftest.py
@@ -26,7 +26,7 @@ def picamera_client(picamera_thing) -> lt.ThingClient:
     This fixture:
 
     * Sets up a ThingServer,
-    * Registers a StreamingPiCamera2 instance at the "/camera/" endpoint
+    * Registers a StreamingPiCamera2 instance at the "camera" endpoint
     * Provides a ThingClient for interacting with it during tests.
     """
     with camera_test_client(cam=picamera_thing) as picamera_client:
diff --git a/src/openflexure_microscope_server/server/__init__.py b/src/openflexure_microscope_server/server/__init__.py
index 2533ad20..73cb609c 100644
--- a/src/openflexure_microscope_server/server/__init__.py
+++ b/src/openflexure_microscope_server/server/__init__.py
@@ -63,11 +63,11 @@ def customise_server(
 def _get_scans_dir(config: dict) -> Optional[str]:
     """Read the config and return the scans directory.
 
-    Return is None if there is no /smart_scan/ thing loaded.
+    Return is None if there is no smart_scan thing loaded.
     """
-    if "/smart_scan/" in config["things"]:
+    if "smart_scan" in config["things"]:
         try:
-            return config["things"]["/smart_scan/"]["kwargs"]["scans_folder"]
+            return config["things"]["smart_scan"]["kwargs"]["scans_folder"]
         except KeyError as e:
             msg = "Configuration error: smart scan should have scans_folder kwarg set"
             raise RuntimeError(msg) from e
@@ -96,7 +96,7 @@ def serve_from_cli(argv: Optional[list[str]] = None) -> None:
         def shutdown_call() -> None:
             try:
                 # Kill any mjpeg streams so that StreamingResponses close.
-                server.things["/camera/"].kill_mjpeg_streams()
+                server.things["camera"].kill_mjpeg_streams()
             except BaseException as e:
                 # Catch anything and log as it is essential that this
                 # function cannot raise an unhandled exception or Uvicorn
diff --git a/src/openflexure_microscope_server/things/camera/__init__.py b/src/openflexure_microscope_server/things/camera/__init__.py
index 67f00b32..e2299737 100644
--- a/src/openflexure_microscope_server/things/camera/__init__.py
+++ b/src/openflexure_microscope_server/things/camera/__init__.py
@@ -731,7 +731,7 @@ class BaseCamera(lt.Thing):
         return {}
 
 
-CameraDependency = lt.deps.direct_thing_client_dependency(BaseCamera, "/camera/")
+CameraDependency = lt.deps.direct_thing_client_dependency(BaseCamera, "camera")
 RawCameraDependency = lt.deps.raw_thing_dependency(BaseCamera)
 
 
diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py
index 951e6988..62db3062 100644
--- a/src/openflexure_microscope_server/things/smart_scan.py
+++ b/src/openflexure_microscope_server/things/smart_scan.py
@@ -42,9 +42,9 @@ T = TypeVar("T")
 P = ParamSpec("P")
 
 CSMDep = lt.deps.direct_thing_client_dependency(
-    CameraStageMapper, "/camera_stage_mapping/"
+    CameraStageMapper, "camera_stage_mapping"
 )
-AutofocusDep = lt.deps.direct_thing_client_dependency(AutofocusThing, "/autofocus/")
+AutofocusDep = lt.deps.direct_thing_client_dependency(AutofocusThing, "autofocus")
 
 
 class ScanListInfo(BaseModel):
diff --git a/src/openflexure_microscope_server/things/stage/__init__.py b/src/openflexure_microscope_server/things/stage/__init__.py
index f6ae2526..d22809ce 100644
--- a/src/openflexure_microscope_server/things/stage/__init__.py
+++ b/src/openflexure_microscope_server/things/stage/__init__.py
@@ -228,4 +228,4 @@ class BaseStage(lt.Thing):
         self.move_absolute(cancel=cancel, x=xyz_pos[0], y=xyz_pos[1], z=xyz_pos[2])
 
 
-StageDependency = lt.deps.direct_thing_client_dependency(BaseStage, "/stage/")
+StageDependency = lt.deps.direct_thing_client_dependency(BaseStage, "stage")
diff --git a/src/openflexure_microscope_server/things/stage_measure.py b/src/openflexure_microscope_server/things/stage_measure.py
index 439561e7..4c244d9e 100644
--- a/src/openflexure_microscope_server/things/stage_measure.py
+++ b/src/openflexure_microscope_server/things/stage_measure.py
@@ -30,9 +30,9 @@ from .camera_stage_mapping import CameraStageMapper
 from .stage import StageDependency as StageDep
 
 CSMDep = lt.deps.direct_thing_client_dependency(
-    CameraStageMapper, "/camera_stage_mapping/"
+    CameraStageMapper, "camera_stage_mapping"
 )
-AutofocusDep = lt.deps.direct_thing_client_dependency(AutofocusThing, "/autofocus/")
+AutofocusDep = lt.deps.direct_thing_client_dependency(AutofocusThing, "autofocus")
 
 ## Size of movement in percentage of field of view
 SMALL_STEP = 20
diff --git a/src/openflexure_microscope_server/ui.py b/src/openflexure_microscope_server/ui.py
index 9de8396c..3b7ace59 100644
--- a/src/openflexure_microscope_server/ui.py
+++ b/src/openflexure_microscope_server/ui.py
@@ -54,9 +54,8 @@ def action_button_for(action: Callable[..., Any], **kwargs: Any) -> ActionButton
     :param kwargs: Any attribute of `ActionButton` except for ``thing`` or ``action``.
     """
     thing = action.args[0]
-    thing_path = thing.path.strip("/")
     action_name = action.func.__name__
-    return ActionButton(thing=thing_path, action=action_name, **kwargs)
+    return ActionButton(thing=thing.name, action=action_name, **kwargs)
 
 
 class PropertyControl(BaseModel):
@@ -94,7 +93,6 @@ def property_control_for(
     :param kwargs: Any attribute of `PropertyControl` except for ``thing`` or
         ``property_name``. If label is not set here it will be the property name.
     """
-    thing_path = thing.path.strip("/")
     if "label" not in kwargs:
         kwargs["label"] = property_name
-    return PropertyControl(thing=thing_path, property_name=property_name, **kwargs)
+    return PropertyControl(thing=thing.name, property_name=property_name, **kwargs)
diff --git a/tests/test_camera.py b/tests/test_camera.py
index 18c8214a..628f2a09 100644
--- a/tests/test_camera.py
+++ b/tests/test_camera.py
@@ -21,7 +21,7 @@ def camera_server(camera: SimulatedCamera) -> lt.ThingClient:
     """
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(camera, "/camera/")
+        server.add_thing(camera, "camera")
         with TestClient(server.app):
             yield server
 
diff --git a/tests/test_dummy_server.py b/tests/test_dummy_server.py
index 08715d7a..16b7aa0e 100644
--- a/tests/test_dummy_server.py
+++ b/tests/test_dummy_server.py
@@ -35,12 +35,12 @@ def thing_server():
         SimulatedCamera(
             shape=(240, 320, 3), canvas_shape=(1000, 1500, 3), frame_interval=0.01
         ),
-        "/camera/",
+        "camera",
     )
-    server.add_thing(DummyStage(step_time=0.000001), "/stage/")
-    server.add_thing(AutofocusThing(), "/autofocus/")
-    server.add_thing(CameraStageMapper(), "/camera_stage_mapping/")
-    assert os.path.exists(os.path.join(temp_folder.name, "camera/"))
+    server.add_thing(DummyStage(step_time=0.000001), "stage")
+    server.add_thing(AutofocusThing(), "autofocus")
+    server.add_thing(CameraStageMapper(), "camera_stage_mapping")
+    assert os.path.exists(os.path.join(temp_folder.name, "camera"))
     # Note: yield is important. If return is used the temp folder gets deleted
     # before the test runs. Silence PT022 as ruff doesn't think yield is needed.
     yield server  # noqa: PT022
@@ -60,7 +60,7 @@ def slower_client(thing_server):
     The step time for the stage is 100 microseconds rather than
     1 microsecond.
     """
-    thing_server.things["/stage/"].step_time = 0.0001
+    thing_server.things["stage"].step_time = 0.0001
     with TestClient(thing_server.app) as client:
         yield client
 
@@ -68,31 +68,31 @@ def slower_client(thing_server):
 def test_autofocus(slower_client):
     """Test Fast Autofocus can run doesn't raise an exception."""
     client = slower_client
-    autofocus = lt.ThingClient.from_url("/autofocus/", client)
+    autofocus = lt.ThingClient.from_url("autofocus", client)
     _ = autofocus.fast_autofocus()
 
 
 def test_grab_jpeg(client):
     """Check that grab_jpeg returns a blob that can be opened."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     blob = camera.grab_jpeg()
     _image = Image.open(blob.open())
 
 
 def test_capture_jpeg_metadata(client):
     """Check that the position is encoded into the image metadata."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     blob = camera.capture_jpeg()
     image = Image.open(blob.open())
     exif_dict = piexif.load(image.info["exif"])
     encoded_metadata = exif_dict["Exif"][piexif.ExifIFD.UserComment]
     metadata = json.loads(encoded_metadata)
-    assert "position" in metadata["/stage/"]
+    assert "position" in metadata["stage"]
 
 
 def test_stage(client):
     """Test moving th stage forwards and backwards."""
-    stage = lt.ThingClient.from_url("/stage/", client)
+    stage = lt.ThingClient.from_url("stage", client)
     start = stage.position
     move = {"x": 1, "y": 2, "z": 3}
     stage.move_relative(**move)
@@ -107,14 +107,14 @@ def test_stage(client):
 
 def test_capture_array(client):
     """Capture array from simulation and check the size is as expected."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     array = np.asarray(camera.capture_array())
     assert array.shape == (240, 320, 3)
 
 
 def test_camera_stage_mapping_calibration(client):
     """Check that camera stage mapping can run without an exception."""
-    camera = lt.ThingClient.from_url("/camera/", client)
+    camera = lt.ThingClient.from_url("camera", client)
     camera.settling_time = 0
-    camera_stage_mapping = lt.ThingClient.from_url("/camera_stage_mapping/", client)
+    camera_stage_mapping = lt.ThingClient.from_url("camera_stage_mapping", client)
     camera_stage_mapping.calibrate_xy()
diff --git a/tests/test_legacy_api.py b/tests/test_legacy_api.py
index 2f7f105d..b040d064 100644
--- a/tests/test_legacy_api.py
+++ b/tests/test_legacy_api.py
@@ -12,8 +12,8 @@ def test_v2_endpoints(mocker):
     """Check that the expected v2 endpoints are added."""
     mock_server = mocker.Mock()
     # Mock the camera thing to mocke the lores_mjpeg stream get_frame()
-    mock_server.things = {"/camera/": mocker.Mock()}
-    mock_server.things["/camera/"].lores_mjpeg_stream.grab_frame = mocker.AsyncMock(
+    mock_server.things = {"camera": mocker.Mock()}
+    mock_server.things["camera"].lores_mjpeg_stream.grab_frame = mocker.AsyncMock(
         return_value="Mock Frame"
     )
     mock_app = mock_server.app
diff --git a/tests/test_server_config.py b/tests/test_server_config.py
index d3a267cb..82b22929 100644
--- a/tests/test_server_config.py
+++ b/tests/test_server_config.py
@@ -102,7 +102,7 @@ def test_get_scans_dir_no_smart_scan():
     with open(FULL_CONFIG, "r", encoding="utf-8") as f_obj:
         config_dict = json.load(f_obj)
     # Delete smart scan
-    del config_dict["things"]["/smart_scan/"]
+    del config_dict["things"]["smart_scan"]
     # No SmartScanThing, should return None
     assert ofm_server._get_scans_dir(config_dict) is None
 
@@ -116,14 +116,14 @@ def test_get_scans_dir_bad_smart_scan_config():
     # Copy the dictionary
     broken_config = deepcopy(config_dict)
     # Delete all the smart scan kwargs
-    del broken_config["things"]["/smart_scan/"]["kwargs"]
+    del broken_config["things"]["smart_scan"]["kwargs"]
     # Creates an Error
     with pytest.raises(RuntimeError):
         ofm_server._get_scans_dir(broken_config)
 
     # Same thing should happen if just the scans_folder key is deleted
     broken_config = deepcopy(config_dict)
-    del broken_config["things"]["/smart_scan/"]["kwargs"]
+    del broken_config["things"]["smart_scan"]["kwargs"]
     # Creates an Error
     with pytest.raises(RuntimeError):
         ofm_server._get_scans_dir(broken_config)
diff --git a/tests/test_stack.py b/tests/test_stack.py
index 3f92aedc..9b2f39c0 100644
--- a/tests/test_stack.py
+++ b/tests/test_stack.py
@@ -270,7 +270,7 @@ def autofocus_thing():
     autofocus_thing = AutofocusThing()
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(autofocus_thing, "/autofocus/")
+        server.add_thing(autofocus_thing, "autofocus")
         with TestClient(server.app):
             yield autofocus_thing
 
diff --git a/tests/test_stage.py b/tests/test_stage.py
index a95d0b33..e2fa0163 100644
--- a/tests/test_stage.py
+++ b/tests/test_stage.py
@@ -41,7 +41,7 @@ def thing_server(dummy_stage):
     """Yield a server with a very basic configuration."""
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(dummy_stage, "/stage/")
+        server.add_thing(dummy_stage, "stage")
         yield server
 
 
@@ -49,7 +49,7 @@ def thing_server(dummy_stage):
 def stage_client(thing_server):
     """Yield a labthings ThingClient for the stage."""
     with TestClient(thing_server.app) as test_client:
-        yield lt.ThingClient.from_url("/stage/", client=test_client)
+        yield lt.ThingClient.from_url("stage", client=test_client)
 
 
 def test_override_base_movement():
diff --git a/tests/test_stage_measure.py b/tests/test_stage_measure.py
index f2a8205b..7a992756 100644
--- a/tests/test_stage_measure.py
+++ b/tests/test_stage_measure.py
@@ -158,7 +158,7 @@ def rom_thing(example_rom_data) -> stage_measure.RangeofMotionThing:
 
     with tempfile.TemporaryDirectory() as tmpdir:
         server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(rom_thing, "/rom_thing/")
+        server.add_thing(rom_thing, "rom_thing")
         with TestClient(server.app):
             yield rom_thing
 

From cfbb7cf7f98b85b55270cb80e23c27e862b8d8a2 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 19:21:06 +0000
Subject: [PATCH 09/21] Start fixing tests. This involves further blocking
 portal changes.

This will need PR 225 of labthings-fastapi to be merged to run.
---
 .../things/camera/__init__.py                 | 17 ++++------
 .../things/camera/picamera.py                 | 10 +++---
 .../things/camera/simulation.py               |  4 +--
 tests/test_autofocus.py                       |  4 ++-
 tests/test_camera.py                          | 33 ++++++++++---------
 5 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/__init__.py b/src/openflexure_microscope_server/things/camera/__init__.py
index e2299737..32f3c889 100644
--- a/src/openflexure_microscope_server/things/camera/__init__.py
+++ b/src/openflexure_microscope_server/things/camera/__init__.py
@@ -319,7 +319,6 @@ class BaseCamera(lt.Thing):
     @lt.action
     def grab_jpeg(
         self,
-        portal: lt.deps.BlockingPortal,
         stream_name: Literal["main", "lores"] = "main",
     ) -> JPEGBlob:
         """Acquire one image from the preview stream and return as blob of JPEG data.
@@ -337,13 +336,12 @@ class BaseCamera(lt.Thing):
         stream = (
             self.lores_mjpeg_stream if stream_name == "lores" else self.mjpeg_stream
         )
-        frame = portal.call(stream.grab_frame)
+        frame = self._thing_server_interface.call_async_task(stream.grab_frame)
         return JPEGBlob.from_bytes(frame)
 
     @lt.action
     def grab_as_array(
         self,
-        portal: lt.deps.BlockingPortal,
         stream_name: Literal["main", "lores"] = "main",
     ) -> ArrayModel:
         """Acquire one image from the preview stream and return as an array.
@@ -361,7 +359,7 @@ class BaseCamera(lt.Thing):
         tries = 0
         while tries < 3:
             try:
-                frame = portal.call(stream.grab_frame)
+                frame = self._thing_server_interface.call_async_task(stream.grab_frame)
                 return np.asarray(Image.open(io.BytesIO(frame)))
             except OSError:
                 tries += 1
@@ -370,14 +368,13 @@ class BaseCamera(lt.Thing):
     @lt.action
     def grab_jpeg_size(
         self,
-        portal: lt.deps.BlockingPortal,
         stream_name: Literal["main", "lores"] = "main",
     ) -> int:
         """Acquire one image from the preview stream and return its size."""
         stream = (
             self.lores_mjpeg_stream if stream_name == "lores" else self.mjpeg_stream
         )
-        return portal.call(stream.next_frame_size)
+        return self._thing_server_interface.call_async_task(stream.next_frame_size)
 
     def capture_image(
         self,
@@ -705,13 +702,13 @@ class BaseCamera(lt.Thing):
                 )
 
     @lt.action
-    def image_is_sample(self, portal: lt.deps.BlockingPortal) -> tuple[bool, str]:
+    def image_is_sample(self) -> tuple[bool, str]:
         """Label the current image as either background or sample."""
-        current_image = self.grab_as_array(portal, stream_name="lores")
+        current_image = self.grab_as_array(stream_name="lores")
         return self.active_detector.image_is_sample(current_image)
 
     @lt.action
-    def set_background(self, portal: lt.deps.BlockingPortal) -> None:
+    def set_background(self) -> None:
         """Grab an image, and use its statistics to set the background.
 
         This should be run when the microscope is looking at an empty region,
@@ -720,7 +717,7 @@ class BaseCamera(lt.Thing):
         future images to the distribution, to determine if each pixel is
         foreground or background.
         """
-        background = self.grab_as_array(portal, stream_name="lores")
+        background = self.grab_as_array(stream_name="lores")
         self.active_detector.set_background(background)
         # Manually save settings as the setter is not called.
         self.save_settings()
diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index ac3078a1..7ed77a52 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -71,10 +71,8 @@ class PicameraStreamOutput(Output):
     def __init__(self, stream: lt.outputs.MJPEGStream) -> None:
         """Create an output that puts frames in an MJPEGStream.
 
-        We need to pass the stream object, and also the blocking portal, because
-        new frame notifications happen in the anyio event loop and frames are
-        sent from a thread. The blocking portal enables thread-to-async
-        communication.
+        We need to pass the stream object, because new frame notifications happen in
+        the anyio event loop and frames are sent from a thread.
         """
         Output.__init__(self)
         self.stream = stream
@@ -744,7 +742,7 @@ class StreamingPiCamera2(BaseCamera):
             self._initialise_picamera()
 
     @lt.action
-    def full_auto_calibrate(self, portal: lt.deps.BlockingPortal) -> None:
+    def full_auto_calibrate(self) -> None:
         """Perform a full auto-calibration.
 
         This function will call the other calibration actions in sequence:
@@ -763,7 +761,7 @@ class StreamingPiCamera2(BaseCamera):
         for _i in range(3):
             try:
                 time.sleep(self._sensor_info.long_pause)
-                self.set_background(portal)
+                self.set_background()
                 # Return if background is set
                 return
             except ChannelBlankError:
diff --git a/src/openflexure_microscope_server/things/camera/simulation.py b/src/openflexure_microscope_server/things/camera/simulation.py
index 79a4cff8..e067f8dc 100644
--- a/src/openflexure_microscope_server/things/camera/simulation.py
+++ b/src/openflexure_microscope_server/things/camera/simulation.py
@@ -350,7 +350,7 @@ class SimulatedCamera(BaseCamera):
         return self.generate_frame()
 
     @lt.action
-    def full_auto_calibrate(self, portal: lt.deps.BlockingPortal) -> None:
+    def full_auto_calibrate(self) -> None:
         """Perform a full auto-calibration.
 
         For the simulation microscope the process is:
@@ -361,7 +361,7 @@ class SimulatedCamera(BaseCamera):
         """
         self.remove_sample()
         time.sleep(0.2)
-        self.set_background(portal)
+        self.set_background()
         time.sleep(0.2)
         self.load_sample()
 
diff --git a/tests/test_autofocus.py b/tests/test_autofocus.py
index 4c02146c..58a5f577 100644
--- a/tests/test_autofocus.py
+++ b/tests/test_autofocus.py
@@ -6,6 +6,8 @@ This doesn't check the behaviour of the JPEG shaprness monitor.
 import numpy as np
 import pytest
 
+from labthings_fastapi.testing import create_thing_without_server
+
 from openflexure_microscope_server.things.autofocus import (
     AutofocusThing,
     NoFocusFoundError,
@@ -77,7 +79,7 @@ def test_looping_autofocus(start_z, max_loc, centre, attempts_expected, passes,
 
     sharpness_monitor.move_data.side_effect = return_sharpness
 
-    autofocus_thing = AutofocusThing()
+    autofocus_thing = create_thing_without_server(AutofocusThing)
     if passes:
         autofocus_thing.looping_autofocus(
             stage=stage,
diff --git a/tests/test_camera.py b/tests/test_camera.py
index 628f2a09..7c0b1654 100644
--- a/tests/test_camera.py
+++ b/tests/test_camera.py
@@ -1,7 +1,6 @@
 """Use the Simulation camera to test base camera functionality."""
 
 import tempfile
-from contextlib import contextmanager
 
 import numpy as np
 import pytest
@@ -10,29 +9,30 @@ from PIL import Image
 
 import labthings_fastapi as lt
 
-from openflexure_microscope_server.things.camera.simulation import SimulatedCamera
 
-
-@contextmanager
-def camera_server(camera: SimulatedCamera) -> lt.ThingClient:
+@pytest.fixture
+def camera_server() -> lt.ThingClient:
     """Add the camera to a ThingServer and start a TestClient application.
 
-    The test client application is needed for the camera to have a blocking portal.
+    The test client will be needed for the camera to run async frame generation code.
     """
     with tempfile.TemporaryDirectory() as tmpdir:
-        server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(camera, "camera")
-        with TestClient(server.app):
-            yield server
+        conf = {
+            "camera": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
+            "stage": "openflexure_microscope_server.things.stage.dummy:DummyStage",
+        }
+
+        server = lt.ThingServer(things=conf, settings_folder=tmpdir)
+        yield server
 
 
-def test_handle_broken_frame():
+def test_handle_broken_frame(camera_server):
     """Monkey patch the the mjpeg steam so 1 in 5 frames are broken, then test operation.
 
     This simulates the very occasional broken frames that can occur when grabbing
     directly from the MJPEG stream.
     """
-    camera = SimulatedCamera()
+    camera = camera_server.things["camera"]
 
     # Money patch the mjpeg_stream grab_frame to break 1 in 5 frames.
     frame_number = 0
@@ -50,7 +50,8 @@ def test_handle_broken_frame():
         return frame
 
     camera.mjpeg_stream.grab_frame = flaky_grabber
-    with camera_server(camera):
+
+    with TestClient(camera_server.app):
         # Check that this does cause broken frames.
         # The noqa is because we don't know exactly when the error is thrown so we
         # can't have a single simple statement in the pytest raises.
@@ -68,10 +69,10 @@ def test_handle_broken_frame():
             assert isinstance(array, np.ndarray)
 
 
-def test_simulation_cam_calibration():
+def test_simulation_cam_calibration(camera_server):
     """Test that the simulated camera can be calibrated and reports calibration correctly."""
-    camera = SimulatedCamera()
-    with camera_server(camera):
+    camera = camera_server.things["camera"]
+    with TestClient(camera_server.app):
         assert camera.calibration_required
         camera.full_auto_calibrate()
         assert not camera.calibration_required

From 0c3de60629b2f90c17c937d5833d2eec0e4f4807 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 19:46:57 +0000
Subject: [PATCH 10/21] Update test_cameras to use create_thing_without_server

---
 tests/test_cameras.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/test_cameras.py b/tests/test_cameras.py
index aa28e762..3f90689f 100644
--- a/tests/test_cameras.py
+++ b/tests/test_cameras.py
@@ -6,6 +6,8 @@ on camera functionality using the simulation camera are in "test_camera".
 
 import pytest
 
+from labthings_fastapi.testing import create_thing_without_server
+
 from openflexure_microscope_server.things.camera import BaseCamera
 from openflexure_microscope_server.things.camera.opencv import OpenCVCamera
 from openflexure_microscope_server.things.camera.simulation import SimulatedCamera
@@ -30,7 +32,7 @@ def mock_picam_thing(mocker):
 
     from openflexure_microscope_server.things.camera.picamera import StreamingPiCamera2
 
-    return StreamingPiCamera2()
+    return create_thing_without_server(StreamingPiCamera2)
 
 
 def _get_clean_camera_description(camera_thing):
@@ -49,8 +51,6 @@ def _get_clean_camera_description(camera_thing):
         * "manual_properties" - Properties explicitly exposed to the UI as manual
             camera settings.
     """
-    camera_thing.path = "/mock/"
-
     td = camera_thing.thing_description()
     actions = set(td.actions.keys())
     properties = set(td.properties.keys())
@@ -82,12 +82,14 @@ def test_thing_description_equivalence(mock_picam_thing):
     to this test, prompting discussion of whether the action belongs in the subclass
     or the base camera class.
     """
-    base_td = BaseCamera().thing_description()
+    base_td = create_thing_without_server(BaseCamera).thing_description()
     base_actions = set(base_td.actions.keys())
     base_props = set(base_td.properties.keys())
 
-    sim_description = _get_clean_camera_description(SimulatedCamera())
-    opencv_description = _get_clean_camera_description(OpenCVCamera())
+    sim_camera = create_thing_without_server(SimulatedCamera)
+    sim_description = _get_clean_camera_description(sim_camera)
+    opencv_camera = create_thing_without_server(OpenCVCamera)
+    opencv_description = _get_clean_camera_description(opencv_camera)
     picamera_description = _get_clean_camera_description(mock_picam_thing)
 
     # Note. These are the actions and properties that are not exposed to the UI via

From 70fc3516e6c270004bf0df51afca3ce8713bbecb Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 20:04:48 +0000
Subject: [PATCH 11/21] Update test_camera and test_dummy_server for
 labthings-fastapi 0.0.12

---
 tests/test_camera.py       |  4 ++--
 tests/test_dummy_server.py | 48 +++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/tests/test_camera.py b/tests/test_camera.py
index 7c0b1654..07fb1181 100644
--- a/tests/test_camera.py
+++ b/tests/test_camera.py
@@ -17,12 +17,12 @@ def camera_server() -> lt.ThingClient:
     The test client will be needed for the camera to run async frame generation code.
     """
     with tempfile.TemporaryDirectory() as tmpdir:
-        conf = {
+        thing_conf = {
             "camera": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
             "stage": "openflexure_microscope_server.things.stage.dummy:DummyStage",
         }
 
-        server = lt.ThingServer(things=conf, settings_folder=tmpdir)
+        server = lt.ThingServer(things=thing_conf, settings_folder=tmpdir)
         yield server
 
 
diff --git a/tests/test_dummy_server.py b/tests/test_dummy_server.py
index 16b7aa0e..38808df3 100644
--- a/tests/test_dummy_server.py
+++ b/tests/test_dummy_server.py
@@ -20,26 +20,30 @@ from PIL import Image
 
 import labthings_fastapi as lt
 
-from openflexure_microscope_server.things.autofocus import AutofocusThing
-from openflexure_microscope_server.things.camera.simulation import SimulatedCamera
-from openflexure_microscope_server.things.camera_stage_mapping import CameraStageMapper
-from openflexure_microscope_server.things.stage.dummy import DummyStage
-
 
 @pytest.fixture
 def thing_server():
     """Yield a server with a very basic configuration."""
     temp_folder = tempfile.TemporaryDirectory()
-    server = lt.ThingServer(settings_folder=temp_folder.name)
-    server.add_thing(
-        SimulatedCamera(
-            shape=(240, 320, 3), canvas_shape=(1000, 1500, 3), frame_interval=0.01
-        ),
-        "camera",
-    )
-    server.add_thing(DummyStage(step_time=0.000001), "stage")
-    server.add_thing(AutofocusThing(), "autofocus")
-    server.add_thing(CameraStageMapper(), "camera_stage_mapping")
+    thing_conf = {
+        "camera": {
+            "class": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
+            "kwargs": {
+                "shape": (240, 320, 3),
+                "canvas_shape": (1000, 1500, 3),
+                "frame_interval": 0.01,
+            },
+        },
+        "stage": {
+            "class": "openflexure_microscope_server.things.stage.dummy:DummyStage",
+            "kwargs": {"step_time": 0.000001},
+        },
+        "autofocus": "openflexure_microscope_server.things.autofocus:AutofocusThing",
+        "camera_stage_mapping": "openflexure_microscope_server.things.camera_stage_mapping:CameraStageMapper",
+    }
+
+    server = lt.ThingServer(things=thing_conf, settings_folder=temp_folder.name)
+
     assert os.path.exists(os.path.join(temp_folder.name, "camera"))
     # Note: yield is important. If return is used the temp folder gets deleted
     # before the test runs. Silence PT022 as ruff doesn't think yield is needed.
@@ -68,20 +72,20 @@ def slower_client(thing_server):
 def test_autofocus(slower_client):
     """Test Fast Autofocus can run doesn't raise an exception."""
     client = slower_client
-    autofocus = lt.ThingClient.from_url("autofocus", client)
+    autofocus = lt.ThingClient.from_url("/autofocus/", client)
     _ = autofocus.fast_autofocus()
 
 
 def test_grab_jpeg(client):
     """Check that grab_jpeg returns a blob that can be opened."""
-    camera = lt.ThingClient.from_url("camera", client)
+    camera = lt.ThingClient.from_url("/camera/", client)
     blob = camera.grab_jpeg()
     _image = Image.open(blob.open())
 
 
 def test_capture_jpeg_metadata(client):
     """Check that the position is encoded into the image metadata."""
-    camera = lt.ThingClient.from_url("camera", client)
+    camera = lt.ThingClient.from_url("/camera/", client)
     blob = camera.capture_jpeg()
     image = Image.open(blob.open())
     exif_dict = piexif.load(image.info["exif"])
@@ -92,7 +96,7 @@ def test_capture_jpeg_metadata(client):
 
 def test_stage(client):
     """Test moving th stage forwards and backwards."""
-    stage = lt.ThingClient.from_url("stage", client)
+    stage = lt.ThingClient.from_url("/stage/", client)
     start = stage.position
     move = {"x": 1, "y": 2, "z": 3}
     stage.move_relative(**move)
@@ -107,14 +111,14 @@ def test_stage(client):
 
 def test_capture_array(client):
     """Capture array from simulation and check the size is as expected."""
-    camera = lt.ThingClient.from_url("camera", client)
+    camera = lt.ThingClient.from_url("/camera/", client)
     array = np.asarray(camera.capture_array())
     assert array.shape == (240, 320, 3)
 
 
 def test_camera_stage_mapping_calibration(client):
     """Check that camera stage mapping can run without an exception."""
-    camera = lt.ThingClient.from_url("camera", client)
+    camera = lt.ThingClient.from_url("/camera/", client)
     camera.settling_time = 0
-    camera_stage_mapping = lt.ThingClient.from_url("camera_stage_mapping", client)
+    camera_stage_mapping = lt.ThingClient.from_url("/camera_stage_mapping/", client)
     camera_stage_mapping.calibrate_xy()

From dec90f5b6be98c19b4192b0352a96c25ffb6927f Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 20:53:33 +0000
Subject: [PATCH 12/21] Update legacy_api.py test_sangaboard and
 test_server_cli so tests pass for labthings-fastapi 0.0.12

---
 src/openflexure_microscope_server/server/legacy_api.py | 2 +-
 tests/test_sangaboard.py                               | 4 +++-
 tests/test_server_cli.py                               | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/openflexure_microscope_server/server/legacy_api.py b/src/openflexure_microscope_server/server/legacy_api.py
index ff41c2bc..7d0e7265 100644
--- a/src/openflexure_microscope_server/server/legacy_api.py
+++ b/src/openflexure_microscope_server/server/legacy_api.py
@@ -38,7 +38,7 @@ def add_v2_endpoints(thing_server: lt.ThingServer) -> None:
     @app.head("/api/v2/streams/snapshot")
     async def thumbnail() -> JPEGResponse:
         """Return a low-resolution snapshot, for compatibility with OF connect."""
-        blob = await thing_server.things["/camera/"].lores_mjpeg_stream.grab_frame()
+        blob = await thing_server.things["camera"].lores_mjpeg_stream.grab_frame()
         return JPEGResponse(blob)
 
     @app.get("/api/v2/instrument/settings/name")
diff --git a/tests/test_sangaboard.py b/tests/test_sangaboard.py
index bd9ec103..b22ef1af 100644
--- a/tests/test_sangaboard.py
+++ b/tests/test_sangaboard.py
@@ -4,6 +4,8 @@ import logging
 
 import pytest
 
+from labthings_fastapi.testing import create_thing_without_server
+
 from openflexure_microscope_server.things.stage.sangaboard import (
     RECOMMENDED_VERSION,
     REQUIRED_VERSION,
@@ -14,7 +16,7 @@ from openflexure_microscope_server.things.stage.sangaboard import (
 @pytest.fixture
 def mock_sanga_thing(mocker):
     """Return a Sangaboard thing with a MagicMock for self._sangaboard."""
-    sanga_thing = SangaboardThing()
+    sanga_thing = create_thing_without_server(SangaboardThing)
     sanga_thing._sangaboard = mocker.MagicMock()
     return sanga_thing
 
diff --git a/tests/test_server_cli.py b/tests/test_server_cli.py
index 94bf057d..dde9879f 100644
--- a/tests/test_server_cli.py
+++ b/tests/test_server_cli.py
@@ -28,10 +28,10 @@ def test_successful_start(mocker, caplog):
     # Create a mock for the camera so we can check the MJPEG streams are closed on
     # shutdown.
     mock_camera = mocker.Mock()
-    mock_server.things = {"/camera/": mock_camera}
+    mock_server.things = {"camera": mock_camera}
     # Mock the LabThings function that returns the server so we have a mock server
     mocker.patch(
-        "openflexure_microscope_server.server.lt.cli.server_from_config",
+        "openflexure_microscope_server.server.lt.ThingServer.from_config",
         return_value=mock_server,
     )
     # Also mock customisation or it will try to access the hard drive and make files.
@@ -78,7 +78,7 @@ def test_failed_customise(mocker):
     mock_server = mocker.Mock()
     # Mock the LabThings function that returns the server so we have a mock server
     mocker.patch(
-        "openflexure_microscope_server.server.lt.cli.server_from_config",
+        "openflexure_microscope_server.server.lt.ThingServer.from_config",
         return_value=mock_server,
     )
     # Also mock customisation or it will try to access the hard drive and make files.

From f79505546c843eb26442d56c98af637f074d92b8 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Sun, 14 Dec 2025 22:11:08 +0000
Subject: [PATCH 13/21] Final updates for main test suite for labthings-fastapi
 0.0.12 compatibility

---
 tests/test_smart_scan.py    |   7 ++-
 tests/test_stack.py         |  13 +---
 tests/test_stage.py         | 117 +++++++++++++++++++-----------------
 tests/test_stage_measure.py |  16 ++---
 tests/test_system_thing.py  |  34 ++++++-----
 5 files changed, 94 insertions(+), 93 deletions(-)

diff --git a/tests/test_smart_scan.py b/tests/test_smart_scan.py
index bbea1391..f753250f 100644
--- a/tests/test_smart_scan.py
+++ b/tests/test_smart_scan.py
@@ -24,6 +24,7 @@ import pytest
 from fastapi import HTTPException
 
 from labthings_fastapi.exceptions import InvocationCancelledError
+from labthings_fastapi.testing import create_thing_without_server
 
 from openflexure_microscope_server.scan_directories import (
     NotEnoughFreeSpaceError,
@@ -56,7 +57,7 @@ def _clear_scan_dir() -> None:
 @pytest.fixture
 def smart_scan_thing():
     """Return a smart scan thing as a fixture."""
-    return SmartScanThing(SCAN_DIR)
+    return create_thing_without_server(SmartScanThing, scans_folder=SCAN_DIR)
 
 
 def test_initial_properties(smart_scan_thing):
@@ -198,7 +199,9 @@ def _run_only_outer_scan(adjust_initial_state: Optional[Callable] = None):
             assert self._csm is csm_mock
 
     # mock smart scan thing
-    mock_ss_thing = MockedSmartScanThing(SCAN_DIR)
+    mock_ss_thing = create_thing_without_server(
+        MockedSmartScanThing, scans_folder=SCAN_DIR
+    )
 
     if adjust_initial_state is not None:
         adjust_initial_state(mock_ss_thing)
diff --git a/tests/test_stack.py b/tests/test_stack.py
index 9b2f39c0..e7f1df27 100644
--- a/tests/test_stack.py
+++ b/tests/test_stack.py
@@ -1,17 +1,15 @@
 """Tests for the smart and fast stacking."""
 
 import logging
-import tempfile
 from random import randint
 from typing import Optional
 
 import numpy as np
 import pytest
-from fastapi.testclient import TestClient
 from hypothesis import given
 from hypothesis import strategies as st
 
-import labthings_fastapi as lt
+from labthings_fastapi.testing import create_thing_without_server
 
 from openflexure_microscope_server.scan_directories import IMAGE_REGEX
 from openflexure_microscope_server.things.autofocus import (
@@ -266,13 +264,8 @@ def test_retrieval_of_captures(start):
 
 @pytest.fixture
 def autofocus_thing():
-    """Yield an autofocus thing connected to a server."""
-    autofocus_thing = AutofocusThing()
-    with tempfile.TemporaryDirectory() as tmpdir:
-        server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(autofocus_thing, "autofocus")
-        with TestClient(server.app):
-            yield autofocus_thing
+    """Return an autofocus thing connected to a server."""
+    return create_thing_without_server(AutofocusThing)
 
 
 def test_create_stack(autofocus_thing, caplog):
diff --git a/tests/test_stage.py b/tests/test_stage.py
index e2fa0163..4a01eaca 100644
--- a/tests/test_stage.py
+++ b/tests/test_stage.py
@@ -11,6 +11,7 @@ from hypothesis import strategies as st
 
 import labthings_fastapi as lt
 from labthings_fastapi.exceptions import NotConnectedToServerError
+from labthings_fastapi.testing import create_thing_without_server
 
 from openflexure_microscope_server.things.stage import (
     BaseStage,
@@ -33,25 +34,21 @@ path3d = st.lists(point3d, min_size=5, max_size=10)
 @pytest.fixture
 def dummy_stage():
     """Return a dummy stage with a very low step time."""
-    return DummyStage(step_time=0.000001)
+    return create_thing_without_server(DummyStage, step_time=0.000001)
 
 
 @pytest.fixture
-def thing_server(dummy_stage):
+def stage_server():
     """Yield a server with a very basic configuration."""
+    thing_conf = {
+        "camera": "openflexure_microscope_server.things.camera.simulation:SimulatedCamera",
+        "stage": "openflexure_microscope_server.things.stage.dummy:DummyStage",
+    }
     with tempfile.TemporaryDirectory() as tmpdir:
-        server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(dummy_stage, "stage")
+        server = lt.ThingServer(things=thing_conf, settings_folder=tmpdir)
         yield server
 
 
-@pytest.fixture
-def stage_client(thing_server):
-    """Yield a labthings ThingClient for the stage."""
-    with TestClient(thing_server.app) as test_client:
-        yield lt.ThingClient.from_url("stage", client=test_client)
-
-
 def test_override_base_movement():
     """Child classes of stage should implement functions in the hardware reference frame.
 
@@ -73,7 +70,7 @@ def test_override_base_movement():
             pass
 
     with pytest.raises(RedefinedBaseMovementError):
-        BadStage1()
+        create_thing_without_server(BadStage1)
 
     class BadStage2(BaseStage):
         @lt.action
@@ -86,7 +83,7 @@ def test_override_base_movement():
             pass
 
     with pytest.raises(RedefinedBaseMovementError):
-        BadStage2()
+        create_thing_without_server(BadStage2)
 
 
 def _set_axis_direction(dummy_stage, direction):
@@ -149,48 +146,61 @@ def test_apply_axis_errors(dummy_stage):
         dummy_stage._apply_axis_direction({"x": -1, "y": 2, "up": -3})
 
 
-def test_default_values(stage_client, dummy_stage):
+def test_default_values(dummy_stage):
     """Check the default values for the dummy stage."""
     # axes are x, y, z (note that going through the thing, client the tuple is
     # converted to a list.
-    assert stage_client.axis_names == ["x", "y", "z"]
+    assert dummy_stage.axis_names == ("x", "y", "z")
     # position starts at 0, 0, 0
-    assert stage_client.position == {"x": 0, "y": 0, "z": 0}
+    assert dummy_stage.position == {"x": 0, "y": 0, "z": 0}
     # axis direction starts is -1, 1, 1 for the dummy stage
-    assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
+    assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": False}
     # And check the thing state
     assert dummy_stage.thing_state == {"position": {"x": 0, "y": 0, "z": 0}}
 
 
-def test_direction_inversion(stage_client, dummy_stage):
+def test_direction_inversion(dummy_stage):
     """Check axes invert as expected when called."""
-    # Can't set an arbitrary value via a client as read only:
-    with pytest.raises(HTTPStatusError) as excinfo:
-        stage_client.axis_inverted = {"x": 2, "y": 1, "z": 1}
-    # Read only should set a 405 error code
-    assert excinfo.value.response.status_code == 405
-    # And not modify th initial value
-    assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
-    stage_client.invert_axis_direction(axis="x")
-    assert stage_client.axis_inverted == {"x": False, "y": False, "z": False}
-    stage_client.invert_axis_direction(axis="x")
-    assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
-    stage_client.invert_axis_direction(axis="y")
-    assert stage_client.axis_inverted == {"x": True, "y": True, "z": False}
-    stage_client.invert_axis_direction(axis="y")
-    assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
-    stage_client.invert_axis_direction(axis="z")
-    assert stage_client.axis_inverted == {"x": True, "y": False, "z": True}
-    stage_client.invert_axis_direction(axis="z")
-    assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
+    # Check initial value
+    assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": False}
+    # Start inverting
+    dummy_stage.invert_axis_direction(axis="x")
+    assert dummy_stage.axis_inverted == {"x": False, "y": False, "z": False}
+    dummy_stage.invert_axis_direction(axis="x")
+    assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": False}
+    dummy_stage.invert_axis_direction(axis="y")
+    assert dummy_stage.axis_inverted == {"x": True, "y": True, "z": False}
+    dummy_stage.invert_axis_direction(axis="y")
+    assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": False}
+    dummy_stage.invert_axis_direction(axis="z")
+    assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": True}
+    dummy_stage.invert_axis_direction(axis="z")
+    assert dummy_stage.axis_inverted == {"x": True, "y": False, "z": False}
 
-    # Should error if axis doesn't exist, this is a KeyError in the server
-    with pytest.raises(KeyError):
-        dummy_stage.invert_axis_direction(axis="theta")
-    # But a 422 over HTTP
-    with pytest.raises(HTTPStatusError) as excinfo:
-        stage_client.invert_axis_direction(axis="theta")
-    assert excinfo.value.response.status_code == 422
+
+def test_direction_errors_local_and_http(stage_server):
+    """Check for expected errors both locally and over http."""
+    dummy_stage = stage_server.things["stage"]
+    with TestClient(stage_server.app) as test_client:
+        stage_client = lt.ThingClient.from_url("/stage/", client=test_client)
+
+        assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
+        # Can't set an arbitrary value via a client as read only:
+        with pytest.raises(HTTPStatusError) as excinfo:
+            stage_client.axis_inverted = {"x": 2, "y": 1, "z": 1}
+        # Read only should set a 405 error code ...
+        assert excinfo.value.response.status_code == 405
+
+        # ... and should not modify the initial value
+        assert stage_client.axis_inverted == {"x": True, "y": False, "z": False}
+
+        # Should error if axis doesn't exist, this is a KeyError in the server
+        with pytest.raises(KeyError):
+            dummy_stage.invert_axis_direction(axis="theta")
+        # But a 422 over HTTP
+        with pytest.raises(HTTPStatusError) as excinfo:
+            stage_client.invert_axis_direction(axis="theta")
+        assert excinfo.value.response.status_code == 422
 
 
 def _test_move_relative(dummy_stage, axis_inverted, path):
@@ -225,22 +235,17 @@ def _test_move_relative(dummy_stage, axis_inverted, path):
     suppress_health_check=[HealthCheck.function_scoped_fixture],
     deadline=10000,
 )
-def test_move_relative(stage_client, dummy_stage, path):
+def test_move_relative(dummy_stage, path):
     """Loop over different inversion options and check that the stage moves as expected.
 
     3 paths are tried for each case of axis inversion. This checks both that the
     reported position changes as is input in path, and that the hardware position is
     inverted when appropriate.
-
-    NOTE: it is essential that `stage_client` is imported even if any time it is used
-    dummy stage could be used. This is because the fixture that creates stage client
-    handles adding the dummy_stage to a server. It needs to have been added to a
-    server for it not to throw errors about not being connected to a server.
     """
     # Note that the fixture is not reset. This is fine, because the stage_should work
     # no matter the starting position.
 
-    axis_names = stage_client.axis_names
+    axis_names = dummy_stage.axis_names
     # Create every combination of True/False for x,y,z.
     inversion_combinations = [
         dict(zip(axis_names, inverted, strict=True))
@@ -286,14 +291,14 @@ def _test_move_absolute(dummy_stage, axis_inverted, path):
     suppress_health_check=[HealthCheck.function_scoped_fixture],
     deadline=10000,
 )
-def test_move_absolute(stage_client, dummy_stage, path):
+def test_move_absolute(dummy_stage, path):
     """Loop over different inversion options and check that the stage moves as expected.
 
     3 paths are tried for each case of axis inversion. This checks both that the
     reported position changes as is input in path, and that the hardware position is
     inverted when appropriate.
 
-    NOTE: it is essential that `stage_client` is imported even if any time it is used
+    NOTE: it is essential that `dummy_stage` is imported even if any time it is used
     dummy stage could be used. This is because the fixture that creates stage client
     handles adding the dummy_stage to a server. It needs to have been added to a
     server for it not to throw errors about not being connected to a server.
@@ -301,7 +306,7 @@ def test_move_absolute(stage_client, dummy_stage, path):
     # Note that the fixture is not reset. This is fine, because the stage_should work
     # no matter the starting position.
 
-    axis_names = stage_client.axis_names
+    axis_names = dummy_stage.axis_names
     # Create every combination of True/False for x,y,z.
     inversion_combinations = [
         dict(zip(axis_names, inverted, strict=True))
@@ -328,7 +333,7 @@ def test_thing_description_equivalence(dummy_stage, mocker):
     # Flash LED isn't a standard stage action, most stages do not control illumination.
     extra_sanga_actions = ["flash_led"]
 
-    base_td = BaseStage().thing_description()
+    base_td = create_thing_without_server(BaseStage).thing_description()
     base_actions = set(base_td.actions.keys())
     base_properties = set(base_td.properties.keys())
 
@@ -336,7 +341,7 @@ def test_thing_description_equivalence(dummy_stage, mocker):
     dummy_actions = set(dummy_td.actions.keys())
     dummy_properties = set(dummy_td.properties.keys())
 
-    sanga_td = SangaboardThing().thing_description()
+    sanga_td = create_thing_without_server(SangaboardThing).thing_description()
     # Remove known extra actions
     sanga_actions = list(sanga_td.actions.keys())
     for action in extra_sanga_actions:
diff --git a/tests/test_stage_measure.py b/tests/test_stage_measure.py
index 7a992756..db57d202 100644
--- a/tests/test_stage_measure.py
+++ b/tests/test_stage_measure.py
@@ -2,14 +2,12 @@
 
 import dataclasses
 import logging
-import tempfile
 from copy import copy
 
 import numpy as np
 import pytest
-from fastapi.testclient import TestClient
 
-import labthings_fastapi as lt
+from labthings_fastapi.testing import create_thing_without_server
 
 from openflexure_microscope_server.things import stage_measure
 from openflexure_microscope_server.things.camera_stage_mapping import (
@@ -145,22 +143,18 @@ def test_parasitic_detect(par_fraction, too_high):
 
 def test_error_if_no_stream_res_set_when_requesting_img_coords():
     """Check a RuntimeError thrown when requesting image coordinates if resolution unset."""
+    rom_thing = create_thing_without_server(stage_measure.RangeofMotionThing)
     with pytest.raises(RuntimeError, match="Stream resolution must be set"):
-        stage_measure.RangeofMotionThing()._img_percentage_to_img_coords(20, "x")
+        rom_thing._img_percentage_to_img_coords(20, "x")
 
 
 @pytest.fixture
 def rom_thing(example_rom_data) -> stage_measure.RangeofMotionThing:
     """Yield a RangeofMotionThing already populated with some example rom_data."""
-    rom_thing = stage_measure.RangeofMotionThing()
+    rom_thing = create_thing_without_server(stage_measure.RangeofMotionThing)
     rom_thing._stream_resolution = [800, 600]
     rom_thing._rom_data = example_rom_data
-
-    with tempfile.TemporaryDirectory() as tmpdir:
-        server = lt.ThingServer(settings_folder=tmpdir)
-        server.add_thing(rom_thing, "rom_thing")
-        with TestClient(server.app):
-            yield rom_thing
+    return rom_thing
 
 
 @pytest.fixture
diff --git a/tests/test_system_thing.py b/tests/test_system_thing.py
index d1fb4a1e..4754c8bb 100644
--- a/tests/test_system_thing.py
+++ b/tests/test_system_thing.py
@@ -4,10 +4,20 @@ import os
 from signal import SIGTERM
 from uuid import UUID
 
+import pytest
+
+from labthings_fastapi.testing import create_thing_without_server
+
 from openflexure_microscope_server.things import system
 from openflexure_microscope_server.utilities import VersionData, robust_version_strings
 
 
+@pytest.fixture
+def system_thing():
+    """Return a OpenFlexureSystem with a mocked server interface."""
+    return create_thing_without_server(system.OpenFlexureSystem)
+
+
 def _is_raspberrypi() -> bool:
     """Check if the machine running the test is a Raspberry Pi.
 
@@ -22,17 +32,16 @@ def _is_raspberrypi() -> bool:
     return "Raspberry Pi" in model_name
 
 
-def test_is_raspberry():
+def test_is_raspberry(system_thing):
     """Check the thing property reports whether this is a Raspberry Pi correctly."""
-    assert system.OpenFlexureSystem().is_raspberrypi == _is_raspberrypi()
+    assert system_thing.is_raspberrypi == _is_raspberrypi()
 
 
-def test_version_data():
+def test_version_data(system_thing):
     """Check VersionData is returned.
 
     The content of robust_version_strings() is tested elsewhere.
     """
-    system_thing = system.OpenFlexureSystem()
     data = system_thing.version_data
     assert isinstance(data, VersionData)
     assert data == robust_version_strings()
@@ -43,27 +52,24 @@ def test_version_data():
     assert data == fake_data
 
 
-def test_hostname(mocker):
+def test_hostname(system_thing, mocker):
     """Check the hostname matches what socket.gethostname() returns."""
     mock_gethostname = mocker.patch("socket.gethostname", return_value="foobar")
-    system_thing = system.OpenFlexureSystem()
     assert system_thing.hostname == "foobar"
     mock_gethostname.assert_called_once_with()
 
 
-def test_microscope_id():
+def test_microscope_id(system_thing):
     """Check the microscope UUID is a valid UUID and doesn't change when read again."""
-    system_thing = system.OpenFlexureSystem()
     microscope_id = system_thing.microscope_id
     assert isinstance(microscope_id, UUID)
     assert microscope_id == system_thing.microscope_id
 
 
-def test_thing_state(mocker):
+def test_thing_state(system_thing, mocker):
     """Check the thing state contains version data, hostname, and a UUID string."""
     mocker.patch("socket.gethostname", return_value="foobar")
     version_data = robust_version_strings()
-    system_thing = system.OpenFlexureSystem()
     state_dict = system_thing.thing_state
     assert state_dict["hostname"] == "foobar"
     # Check the UUID in the dictionary is a string
@@ -93,7 +99,7 @@ def test_pi_shutdown(mocker):
     # Mock the shutdown command as we don't want to shutdown when running tests.
     mocker.patch.object(system, "SHUTDOWN_CMD", new=["echo", "shutdown"])
     # Call shutdown on a MockPiSystem
-    system_thing = MockPiSystem()
+    system_thing = create_thing_without_server(MockPiSystem)
     result = system_thing.shutdown()
 
     # Check the result of the echo mock command was returned
@@ -108,7 +114,7 @@ def test_pi_reboot(mocker):
     # Mock the reboot command as we don't want to reboot when running tests.
     mocker.patch.object(system, "REBOOT_CMD", new=["echo", "restart"])
     # Call reboot on a MockPiSystem
-    system_thing = MockPiSystem()
+    system_thing = create_thing_without_server(MockPiSystem)
     result = system_thing.reboot()
 
     # Check the result of the echo mock command was returned
@@ -125,7 +131,7 @@ def test_non_pi_shutdown(mocker):
     mock_kill = mocker.patch("os.kill")
     # Get this subprocess
     pid = os.getpid()
-    system_thing = MockNonPiSystem()
+    system_thing = create_thing_without_server(MockNonPiSystem)
     result = system_thing.shutdown()
 
     # Check it tried to kill this process with SIGTERM
@@ -137,7 +143,7 @@ def test_non_pi_shutdown(mocker):
 
 def test_non_pi_reboot():
     """Check that a server not on a pi refuses to restart."""
-    system_thing = MockNonPiSystem()
+    system_thing = create_thing_without_server(MockNonPiSystem)
     result = system_thing.reboot()
 
     # Check output is an appropriate error message

From 8ed76b4baffcd544a7c74a9fc865ced3c4b749b3 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Mon, 15 Dec 2025 16:30:16 +0000
Subject: [PATCH 14/21] Temporarily set labthings-fastapi dependancy to point
 at github not pypi during testing

---
 pyproject.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b285de51..17ec53c1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,8 +18,7 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 dependencies = [
-  "labthings-fastapi == 0.0.11",
-  "fastapi <= 0.123.6", # This can be removed once #216 on labthings-fastapi is fixed
+  "labthings-fastapi @ git+https://github.com/labthings/labthings-fastapi",
   "sangaboard",
   "camera-stage-mapping ~= 0.1.10",
   "opencv-python ~= 4.11.0",

From baf0ff9a11d347cc326c63613b059c7c1f34eabf Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Mon, 15 Dec 2025 17:18:30 +0000
Subject: [PATCH 15/21] Updating for changes related to
 NotConnectedToServerErrors

---
 .../things/camera/picamera.py                   |  6 +++---
 tests/test_stage.py                             | 17 ++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 7ed77a52..5fd8a2a9 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -35,7 +35,7 @@ from PIL import Image
 from pydantic import BaseModel, BeforeValidator
 
 import labthings_fastapi as lt
-from labthings_fastapi.exceptions import NotConnectedToServerError
+from labthings_fastapi.exceptions import ServerNotRunningError
 
 from openflexure_microscope_server.background_detect import ChannelBlankError
 from openflexure_microscope_server.ui import (
@@ -160,13 +160,13 @@ class StreamingPiCamera2(BaseCamera):
         # connected to the server if tuning is saved to disk.
         try:
             self.tuning = copy.deepcopy(self.default_tuning)
-        except NotConnectedToServerError:
+        except ServerNotRunningError:
             # This will throw an error after setting as we are not connected to
             # a server. But we know this, so we ignore the error.
             pass
 
         # Also set the colour gains based on the tuning. Set to _colour_gains to not
-        # trigger a NotConnectedToServerError
+        # trigger a ServerNotRunningError
         self._colour_gains = tf_utils.get_colour_gains_from_lst(self.tuning)
 
     stream_resolution: tuple[int, int] = lt.property(default=(820, 616))
diff --git a/tests/test_stage.py b/tests/test_stage.py
index 4a01eaca..359331f7 100644
--- a/tests/test_stage.py
+++ b/tests/test_stage.py
@@ -10,7 +10,6 @@ from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
 
 import labthings_fastapi as lt
-from labthings_fastapi.exceptions import NotConnectedToServerError
 from labthings_fastapi.testing import create_thing_without_server
 
 from openflexure_microscope_server.things.stage import (
@@ -86,18 +85,10 @@ def test_override_base_movement():
         create_thing_without_server(BadStage2)
 
 
-def _set_axis_direction(dummy_stage, direction):
-    """Set the axis direction directly even if not connected to server."""
-    try:
-        dummy_stage.axis_inverted = direction
-    except NotConnectedToServerError:
-        pass
-
-
 def test_apply_axis_direction_all_pos(dummy_stage):
     """Test the apply axis direction function behaves as expected when axis +v3."""
     # Directly create a stage not through a ThingServer to access private methods
-    _set_axis_direction(dummy_stage, {"x": False, "y": False, "z": False})
+    dummy_stage.axis_inverted = {"x": False, "y": False, "z": False}
 
     # A list of positions to try
     positions = [
@@ -117,7 +108,7 @@ def test_apply_axis_direction_all_pos(dummy_stage):
 def test_apply_axis_direction_mixed(dummy_stage):
     """Test the apply axis direction function behaves as expected when axis dirs are mixed."""
     # Make x and z negative
-    _set_axis_direction(dummy_stage, {"x": True, "y": False, "z": True})
+    dummy_stage.axis_inverted = {"x": True, "y": False, "z": True}
 
     # A list of (input position, output position) to try
     position_pairs = [
@@ -210,7 +201,7 @@ def _test_move_relative(dummy_stage, axis_inverted, path):
     :param path: The 3d path to move over, generated by hypothesis.
     """
     cancel = MockCancel()
-    _set_axis_direction(dummy_stage, axis_inverted)
+    dummy_stage.axis_inverted = axis_inverted
     # Explicitly do axes calculation here to check logic in main code.
     x_dir = -1 if axis_inverted["x"] else 1
     y_dir = -1 if axis_inverted["y"] else 1
@@ -267,7 +258,7 @@ def _test_move_absolute(dummy_stage, axis_inverted, path):
     :param path: The 3d path to move over, generated by hypothesis.
     """
     cancel = MockCancel()
-    _set_axis_direction(dummy_stage, axis_inverted)
+    dummy_stage.axis_inverted = axis_inverted
     # Explicitly do axes calculation here to check logic in main code.
     x_dir = -1 if axis_inverted["x"] else 1
     y_dir = -1 if axis_inverted["y"] else 1

From 7a26b262a91a61fddb398299a61104e8d0bd3c31 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Mon, 15 Dec 2025 18:28:28 +0000
Subject: [PATCH 16/21] Update the picamera tests for labthings 0.0.12 syntax

---
 .../picamera2/cam_test_utils/__init__.py      | 50 ++++++++++++-------
 hardware-specific-tests/picamera2/conftest.py | 26 +++++-----
 .../picamera2/test_calibration.py             |  4 +-
 3 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/hardware-specific-tests/picamera2/cam_test_utils/__init__.py b/hardware-specific-tests/picamera2/cam_test_utils/__init__.py
index a7baeb0e..3893d583 100644
--- a/hardware-specific-tests/picamera2/cam_test_utils/__init__.py
+++ b/hardware-specific-tests/picamera2/cam_test_utils/__init__.py
@@ -8,13 +8,36 @@ from fastapi.testclient import TestClient
 
 import labthings_fastapi as lt
 
-from openflexure_microscope_server.things.camera.picamera import StreamingPiCamera2
+
+@contextmanager
+def camera_test_client_and_server(settings_folder: Optional[str] = None):
+    """Yield a camera ThingClient and the associated camera server.
+
+    This is a context manager, not a pytest fixture, as it needs to be created
+    multiple times in some tests.
+
+    :param cam: The camera Thing to be used. If not supplied a new one will be created.
+    :param settings_folder: The settings folder for the camera, if none is supplied, new
+        temporary directory will be used as the settings folder.
+    """
+    # Create a temp dir, if the setting folder is set it isn't really needed
+    # but doesn't add much overhead.
+    with tempfile.TemporaryDirectory() as tmpdir:
+        if settings_folder is None:
+            settings_folder = tmpdir
+        thing_conf = {
+            "camera": "openflexure_microscope_server.things.camera.picamera:StreamingPiCamera2",
+        }
+        server = lt.ThingServer(things=thing_conf, settings_folder=settings_folder)
+
+        with TestClient(server.app) as test_client:
+            client = lt.ThingClient.from_url("/camera/", client=test_client)
+            yield client, server
+    del server
 
 
 @contextmanager
-def camera_test_client(
-    cam: Optional[StreamingPiCamera2] = None, settings_folder: Optional[str] = None
-):
+def camera_test_client(settings_folder: Optional[str] = None):
     """Yield a camera ThingClient on a camera server.
 
     This is a context manager, not a pytest fixture, as it needs to be created
@@ -24,18 +47,7 @@ def camera_test_client(
     :param settings_folder: The settings folder for the camera, if none is supplied, new
         temporary directory will be used as the settings folder.
     """
-    if cam is None:
-        cam = StreamingPiCamera2()
-    # Create a temp dir, if the setting folder is set it isn't really needed
-    # but doesn't add much overhead.
-    with tempfile.TemporaryDirectory() as tmpdir:
-        if settings_folder is None:
-            settings_folder = tmpdir
-        server = lt.ThingServer(settings_folder=settings_folder)
-        server.add_thing(cam, "camera")
-
-        with TestClient(server.app) as test_client:
-            client = lt.ThingClient.from_url("camera", client=test_client)
-            yield client
-    del server
-    del cam
+    with camera_test_client_and_server(
+        settings_folder=settings_folder
+    ) as client_and_server:
+        yield client_and_server[0]
diff --git a/hardware-specific-tests/picamera2/conftest.py b/hardware-specific-tests/picamera2/conftest.py
index d6f4568d..68ec8dc1 100644
--- a/hardware-specific-tests/picamera2/conftest.py
+++ b/hardware-specific-tests/picamera2/conftest.py
@@ -4,30 +4,32 @@ import pytest
 
 import labthings_fastapi as lt
 
-from openflexure_microscope_server.things.camera.picamera import StreamingPiCamera2
-
-from .cam_test_utils import camera_test_client
+from .cam_test_utils import camera_test_client_and_server
 
 
 @pytest.fixture
-def picamera_thing() -> StreamingPiCamera2:
-    """Return a StreamingPiCamera2 Thing.
+def picamera_client_and_server() -> lt.ThingClient:
+    """Initialise a test picamera_client and server for the StreamingPiCamera2 Thing.
 
-    This is the Thing that the fixture picamera_client uses. It can be used to probe
-    the Thing directly to check actions had the expected response.
+    This fixture:
+
+    * Sets up a ThingServer,
+    * Registers a StreamingPiCamera2 instance at the "camera" endpoint
+    * Yields a ThingClient and the server for interacting with it during tests.
+    * The picamera thing can be found at server.things["camera"]
     """
-    return StreamingPiCamera2()
+    with camera_test_client_and_server() as client_and_server:
+        yield client_and_server
 
 
 @pytest.fixture
-def picamera_client(picamera_thing) -> lt.ThingClient:
+def picamera_client(picamera_client_and_server) -> lt.ThingClient:
     """Initialise a test picamera_client for the StreamingPiCamera2 Thing.
 
     This fixture:
 
     * Sets up a ThingServer,
     * Registers a StreamingPiCamera2 instance at the "camera" endpoint
-    * Provides a ThingClient for interacting with it during tests.
+    * return a ThingClient for interacting with it during tests.
     """
-    with camera_test_client(cam=picamera_thing) as picamera_client:
-        yield picamera_client
+    return picamera_client_and_server[0]
diff --git a/hardware-specific-tests/picamera2/test_calibration.py b/hardware-specific-tests/picamera2/test_calibration.py
index 22d55cae..1e239344 100644
--- a/hardware-specific-tests/picamera2/test_calibration.py
+++ b/hardware-specific-tests/picamera2/test_calibration.py
@@ -6,8 +6,10 @@ from copy import deepcopy
 from .cam_test_utils import camera_test_client
 
 
-def test_calibration(picamera_thing, picamera_client):
+def test_calibration(picamera_client_and_server):
     """Check that full auto calibrate completes and set the expected values."""
+    picamera_client, server = picamera_client_and_server
+    picamera_thing = server.things["camera"]
     # Check the calibration_required property used by the calibration wizard
     assert picamera_thing.calibration_required
     # Save copy of default tuning file for end of test

From d3df6ba5884c99eaadd00abaec4094add3760825 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 16 Dec 2025 09:27:52 +0000
Subject: [PATCH 17/21] Bump labthings-fastapi (0.0.13) and stitching (0.2.3)
 versions

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 17ec53c1..b7728ed5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,11 +18,11 @@ classifiers = [
   "Operating System :: OS Independent",
 ]
 dependencies = [
-  "labthings-fastapi @ git+https://github.com/labthings/labthings-fastapi",
+  "labthings-fastapi==0.0.13",
   "sangaboard",
   "camera-stage-mapping ~= 0.1.10",
   "opencv-python ~= 4.11.0",
-  "openflexure-stitching[libvips]==0.2.2",
+  "openflexure-stitching[libvips]==0.2.3",
   "pillow ~= 10.4",
   "anyio ~= 4.0",
   "numpy ~= 2.2",

From 942e9e5024f4b40ff9999913e683d674934d4470 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 16 Dec 2025 09:30:46 +0000
Subject: [PATCH 18/21] Fix type for ROM calibrated_range

---
 src/openflexure_microscope_server/things/stage_measure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openflexure_microscope_server/things/stage_measure.py b/src/openflexure_microscope_server/things/stage_measure.py
index 4c244d9e..dbe229d6 100644
--- a/src/openflexure_microscope_server/things/stage_measure.py
+++ b/src/openflexure_microscope_server/things/stage_measure.py
@@ -136,7 +136,7 @@ class ParasiticMotionError(Exception):
 class RangeofMotionThing(lt.Thing):
     """A class used to measure the range of motion of the stage in X and Y."""
 
-    calibrated_range: int = lt.setting(default=None, readonly=True)
+    calibrated_range: Optional[list[int, int]] = lt.setting(default=None, readonly=True)
 
     def __init__(self, thing_server_interface: lt.ThingServerInterface) -> None:
         """Initialise and create the lock."""

From a67afdf21fb7d14ad4f46846fb4bbde366ff71c0 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 16 Dec 2025 10:23:55 +0000
Subject: [PATCH 19/21] Fix bug in simulation frame timing which may be
 affecting integration test

---
 src/openflexure_microscope_server/things/camera/simulation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/openflexure_microscope_server/things/camera/simulation.py b/src/openflexure_microscope_server/things/camera/simulation.py
index e067f8dc..a4e2f316 100644
--- a/src/openflexure_microscope_server/things/camera/simulation.py
+++ b/src/openflexure_microscope_server/things/camera/simulation.py
@@ -292,7 +292,7 @@ class SimulatedCamera(BaseCamera):
     def _capture_frames(self) -> None:
         last_frame_t = time.time()
         while self._capture_enabled:
-            wait_time = last_frame_t - time.time() - self.frame_interval
+            wait_time = self.frame_interval - (time.time() - last_frame_t)
             if wait_time > 0:
                 time.sleep(wait_time)
             last_frame_t = time.time()

From ddc81f9c1770808038299e86efeca8d9842f98b3 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 16 Dec 2025 13:23:03 +0000
Subject: [PATCH 20/21] Apply suggestions from code review of branch
 update-for-labthings0.0.12

Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
---
 src/openflexure_microscope_server/things/camera/picamera.py | 5 ++---
 tests/test_stage.py                                         | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/openflexure_microscope_server/things/camera/picamera.py b/src/openflexure_microscope_server/things/camera/picamera.py
index 5fd8a2a9..b621c888 100644
--- a/src/openflexure_microscope_server/things/camera/picamera.py
+++ b/src/openflexure_microscope_server/things/camera/picamera.py
@@ -71,8 +71,7 @@ class PicameraStreamOutput(Output):
     def __init__(self, stream: lt.outputs.MJPEGStream) -> None:
         """Create an output that puts frames in an MJPEGStream.
 
-        We need to pass the stream object, because new frame notifications happen in
-        the anyio event loop and frames are sent from a thread.
+        :param stream: The labthings MJPEGStream to send frames to.
         """
         Output.__init__(self)
         self.stream = stream
@@ -182,7 +181,7 @@ class StreamingPiCamera2(BaseCamera):
         """Override save_settings to ensure that camera properties don't recurse.
 
         This method is run by any Thing when a setting is saved. However, the
-        method reads the thing_setting. As reading the thing setting talks to the
+        method reads the setting. As reading the setting talks to the
         camera and calls save_settings if the value is not as expected, this could
         cause recursion. Also this means that saving one setting causes all others
         to be read each time.
diff --git a/tests/test_stage.py b/tests/test_stage.py
index 359331f7..2a28698c 100644
--- a/tests/test_stage.py
+++ b/tests/test_stage.py
@@ -288,11 +288,6 @@ def test_move_absolute(dummy_stage, path):
     3 paths are tried for each case of axis inversion. This checks both that the
     reported position changes as is input in path, and that the hardware position is
     inverted when appropriate.
-
-    NOTE: it is essential that `dummy_stage` is imported even if any time it is used
-    dummy stage could be used. This is because the fixture that creates stage client
-    handles adding the dummy_stage to a server. It needs to have been added to a
-    server for it not to throw errors about not being connected to a server.
     """
     # Note that the fixture is not reset. This is fine, because the stage_should work
     # no matter the starting position.

From e3904b98ee004df43b238e3fb023fce151d716b7 Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 16 Dec 2025 13:43:32 +0000
Subject: [PATCH 21/21] Update picamera coverage zip

---
 picamera_coverage.zip | Bin 54038 -> 54038 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/picamera_coverage.zip b/picamera_coverage.zip
index 7ce7593ec730a74c021690a7425c2a90518fcd14..55d371724a48dd8ffa270a7ac31e8a48f5fab211 100644
GIT binary patch
delta 615
zcmbQXjCtBJW}yIYW)=|!5ZIG5A-XsGTFpiwX#+;%&3Xo+0?f1c+&8;9eBfoW=a_uY
z&z>!iorR%MeewcdrO63Cyp#9&aZN7u6J=#X6P4R6>u<)$%FZ{N&tr2$z<u7ycjFvb
zIf7Uk)h9oUvz%PwC(6nW=N<PG-7Fg~sVEe~!2gr~F#m4;aK2l7^Z4@lVm3PpxbRKx
z?BnA}xM6mNQJ0;Cku!#U^5Q-{Mz+b9`b_JqSy>r58_PJD7=GQ)XTEN@d4rAQKb|uR
z%pV@|sNWKMFe}5q|J(QM58q$bFW<|Sop6}R;ePeqg$tsY59BwNGcbsJ*k8|oj&J_9
zhu0Yx82;a2U@$ddkT7G|FrV>ZzZ3(TK>~yM4#pq)5)28TFlu0AVBle3PGB%+XkIUy
z!~(Y6WpZ!7rU@&<ZKe(U+#U%W3=9TL3}$Q$3~me`*bdESnEU+LSrL|i1B}uP$voGx
z)-pEyU3ZZEFhlmt$*=n(Sa0xO<iEe!QD77Q<X`i7_}SUnSQt4O+1S7o$7az5ss<dO
zxS5;Mm@(PuLYjuLQJQhGg@t8mYEoK?v2miAnVGR^ibZ0YQKFeyQkq#>VsdJVQL@S8
z3m2R<lFW<@lPxSPOiYX{3{nk}(oB;~P0Y-a%}vsbjExc#6AergElg5PCttW=Gr9cY
z4Li$}v@}agvosS6qofpLL(627R3pQ*w8XSjGXq0Y^W;=Z3ll@5R70iO0B=Sn5oXlH
PGr9MY1;VvwFL?q0{q)Ju

delta 627
zcmbQXjCtBJW}yIYW)=|!5SZH06m2p8Q{YA+X#+;X&3Xo+0?cdpA~(A^eBfmY<d}TM
z&vx=QKT$^Z$!Gim+3eX^7#f);U+}ZoEah*>$hwv<ijRGBM8JJsmLQf!^~s9y%99g(
zcqjk&<C?t9PlS~NO;nDR-GQZ%8A%=IW~q1?MWILr{-6AZ`FHb&@m=Se&6mR$x!F;`
zk#BNOA0N+w4Y@Ozb=g@MIb%2`FYD7|WS@Ms&$Palm6egRv5Jj};n)3q=Ie%=8T9<y
z?3s-@9vqhRD~XL~T-W*SOGf>Ew)*-1%5P<FU^CNU__Fu9EY~hmhCgBz><kW!|9`L7
zx3K=Rg?B$21H+HwYz!+FG9K8#*zlK!qy7qmK?5W6j)S}h>JKt7FoVL1hk+r1L4tvK
z2ctyITlQoYko|6x`}#FaIT^Nb9<cLqU~*<)Xb@!BV93B=z|>$a@Q>w%jd|WOg$5?R
z8w?W38^W@A8Qzrh+DWiQoMxH)x<7*TKK~8=i<=z<Ht|pXHJ^u{gPo0qk&}^~4NS3Z
z7G0ofzyXS*MOjl{O?JAFreT?!l4x#jWNcubmSkyeXl7t&W^QI^Xlj{eVU(1dXlj&}
zVxDY}Vm$f61!oNlvm{d^6T?K~WXmL@q*Mb7V<Q72i^Md8<U~s|gG9rmWW!Wb<3x~R
zo5>vhqLX_r9=1z1x3n;}OiN2Mv`kA%H8wLaGcqzxvNTIGG__2!G%!y#HA}KIPEAv)
X4e(}U5@AM7NRxXnSs+||_L3(6f|JN_