Add ANN20X rules to ruff

src/openflexure_microscope_server/things/camera/__init__.py

@@ -133,7 +133,7 @@ class CameraMemoryBuffer:
                 "No image with matching id in memory to retrieve."
             ) from e
 
-    def clear(self):
+    def clear(self) -> None:
         """Clear all images from memory."""
         self._storage.clear()
 
@@ -208,7 +208,7 @@ class BaseCamera(lt.Thing):
             "CameraThings must define their own start_streaming method"
         )
 
-    def kill_mjpeg_streams(self):
+    def kill_mjpeg_streams(self) -> None:
         """Kill the streams now as the server is shutting down.
 
         This is called when uvicorn gets the a shutdown signal. As this is called from

src/openflexure_microscope_server/things/camera/opencv.py

@@ -65,7 +65,7 @@ class OpenCVCamera(BaseCamera):
             return self._capture_thread.is_alive()
         return False
 
-    def _capture_frames(self):
+    def _capture_frames(self) -> None:
         portal = lt.get_blocking_portal(self)
         while self._capture_enabled:
             ret, frame = self.cap.read()

src/openflexure_microscope_server/things/camera/picamera.py

@@ -72,7 +72,7 @@ class PicameraStreamOutput(Output):
         _timestamp: Optional[int] = None,
         _packet: Any = None,
         _audio: bool = False,
-    ):
+    ) -> None:
         """Add a frame to the stream's ringbuffer."""
         self.stream.add_frame(frame, self.portal)
 
@@ -173,7 +173,7 @@ class StreamingPiCamera2(BaseCamera):
     )
     """Whether the MJPEG stream is active."""
 
-    def save_settings(self):
+    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
@@ -204,7 +204,7 @@ class StreamingPiCamera2(BaseCamera):
         return self._analogue_gain
 
     @analogue_gain.setter
-    def analogue_gain(self, value: float):
+    def analogue_gain(self, value: float) -> None:
         self._analogue_gain = value
         if self.streaming:
             with self._streaming_picamera() as cam:
@@ -224,7 +224,7 @@ class StreamingPiCamera2(BaseCamera):
         return self._colour_gains
 
     @colour_gains.setter
-    def colour_gains(self, value: tuple[float, float]):
+    def colour_gains(self, value: tuple[float, float]) -> None:
         self._colour_gains = value
         if self.streaming:
             with self._streaming_picamera() as cam:
@@ -248,7 +248,7 @@ class StreamingPiCamera2(BaseCamera):
         return self._exposure_time
 
     @exposure_time.setter
-    def exposure_time(self, value: int):
+    def exposure_time(self, value: int) -> None:
         self._exposure_time = value
         if self.streaming:
             with self._streaming_picamera() as cam:
@@ -292,7 +292,7 @@ class StreamingPiCamera2(BaseCamera):
         return SensorModeSelector(**self._sensor_mode)
 
     @sensor_mode.setter
-    def sensor_mode(self, new_mode: Optional[SensorModeSelector | dict]):
+    def sensor_mode(self, new_mode: Optional[SensorModeSelector | dict]) -> None:
         """Change the sensor mode used."""
         if new_mode is None:
             self._sensor_mode = None
@@ -352,7 +352,7 @@ class StreamingPiCamera2(BaseCamera):
                 ) from e
             return None
 
-    def _initialise_picamera(self):
+    def _initialise_picamera(self) -> None:
         """Acquire the picamera device and store it as ``self._picamera``.
 
         This duplicates logic in ``Picamera2.__init__`` to provide a tuning file that
@@ -646,7 +646,7 @@ class StreamingPiCamera2(BaseCamera):
         self,
         target_white_level: int = 700,
         percentile: float = 99.9,
-    ):
+    ) -> None:
         """Adjust exposure until a the target white level is reached.
 
         Starting from the minimum exposure, gradually increase exposure until
@@ -672,7 +672,7 @@ class StreamingPiCamera2(BaseCamera):
         self,
         method: Literal["percentile", "centre"] = "centre",
         luminance_power: float = 1.0,
-    ):
+    ) -> None:
         """Correct the white balance of the image.
 
         This calibration requires a neutral image, such that the 99th centile
@@ -747,7 +747,7 @@ class StreamingPiCamera2(BaseCamera):
                 self._initialise_picamera()
 
     @lt.thing_action
-    def reset_ccm(self):
+    def reset_ccm(self) -> None:
         """Overwrite the colour correction matrix in camera tuning with default values.
 
         These values are from the Raspberry Pi Camera Algorithm and Tuning Guide, page

src/openflexure_microscope_server/things/camera/simulation.py

@@ -8,7 +8,7 @@ See repository root for licensing information.
 
 from __future__ import annotations
 import logging
-from typing import Literal, Optional
+from typing import Literal, Optional, Mapping
 from types import TracebackType
 from threading import Thread
 import time
@@ -76,7 +76,7 @@ class SimulatedCamera(BaseCamera):
         self.generate_blobs()
         self.generate_canvas()
 
-    def generate_sprites(self):
+    def generate_sprites(self) -> None:
         """Generate sprites to populate the image."""
         sprite_sizes = [5, 7, 10, 21, 36, 40]
         self.sprites = []
@@ -109,7 +109,7 @@ class SimulatedCamera(BaseCamera):
             # Convert to uint8 and append to the list
             self.sprites.append(sprite.astype(np.uint8))
 
-    def generate_blobs(self, n_blobs: int = 1000):
+    def generate_blobs(self, n_blobs: int = 1000) -> None:
         """Generate coordinates of blobs and their sizes.
 
         A 1000x3 array is returned. Each row represents (x,y) coordinate
@@ -125,7 +125,7 @@ class SimulatedCamera(BaseCamera):
         self.blobs[:, 1] = RNG.uniform(w / 2, self.canvas_shape[1] - w / 2, n_blobs)
         self.blobs[:, 2] = RNG.choice(len(self.sprites), n_blobs)
 
-    def generate_canvas(self):
+    def generate_canvas(self) -> None:
         """Generate a canvas.
 
         Canvas is int16 so that random noise can be added to simulation image before
@@ -145,7 +145,7 @@ class SimulatedCamera(BaseCamera):
         self.canvas[self.canvas < 0] = 0
         self.canvas[self.canvas > 255] = 255
 
-    def generate_image(self, pos: tuple[int, int, int]):
+    def generate_image(self, pos: tuple[int, int, int]) -> np.ndarray:
         """Generate an image with blobs based on supplied coordinates."""
         canvas_width, canvas_height, _ = self.canvas_shape
         image_width, image_height, _ = self.shape
@@ -180,16 +180,16 @@ class SimulatedCamera(BaseCamera):
 
     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
-        return super().attach_to_server(server, path, setting_storage_path)
+        super().attach_to_server(server, path, setting_storage_path)
 
-    def get_stage_position(self):
+    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
@@ -199,7 +199,7 @@ class SimulatedCamera(BaseCamera):
             self._stage = self._server.things["/stage/"]
         return self._stage.instantaneous_position
 
-    def generate_frame(self):
+    def generate_frame(self) -> np.ndarray:
         """Generate a frame with blobs based on the stage coordinates."""
         try:
             pos = self.get_stage_position()
@@ -256,7 +256,7 @@ class SimulatedCamera(BaseCamera):
 
     noise_level = lt.ThingProperty(float, 2.0)
 
-    def _capture_frames(self):
+    def _capture_frames(self) -> None:
         portal = lt.get_blocking_portal(self)
         while self._capture_enabled:
             time.sleep(self.frame_interval)
@@ -312,14 +312,14 @@ class SimulatedCamera(BaseCamera):
         return Image.fromarray(self.generate_frame())
 
     @lt.thing_action
-    def remove_sample(self):
+    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
-    def load_sample(self):
+    def load_sample(self) -> None:
         """Show the simulated sample."""
         if self._show_sample:
             raise RuntimeError("Sample is already in place.")