rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use type[] not Type[] in typehints, and add clarification comment.

Browse source
This commit is contained in:
Julian Stirling 2026-01-12 14:56:10 +00:00
parent 560ca6e9fe
commit 06cab8a6a4
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/openflexure_microscope_server/background_detect.py
View file

@ -5,7 +5,7 @@ for analysis. Information from these images is used to detect whether an image f
current camera field of view contains sample. current camera field of view contains sample.
""" """
from typing import Any, Generic, Optional, Type, TypeVar from typing import Any, Generic, Optional, TypeVar
import cv2 import cv2
import numpy as np import numpy as np
@ -61,9 +61,9 @@ class BackgroundDetectorStatus(BaseModel):
class BackgroundDetectAlgorithm(Generic[SettingsType, BackgroundType]): class BackgroundDetectAlgorithm(Generic[SettingsType, BackgroundType]):
"""The base class for defining background detect algorithms.""" """The base class for defining background detect algorithms."""
background_data_model: Type[BackgroundType] background_data_model: type[BackgroundType]
"""The data model of the background data. This must be set by child classes""" """The data model of the background data. This must be set by child classes"""
settings_data_model: Type[SettingsType] settings_data_model: type[SettingsType]
"""The data model of algorithm settings. This must be set by child classes""" """The data model of algorithm settings. This must be set by child classes"""
def __init__(self) -> None: def __init__(self) -> None:
@ -198,8 +198,8 @@ class ColourChannelDetectLUV(
intuitive way. intuitive way.
""" """
background_data_model: Type[ChannelDistributions] = ChannelDistributions background_data_model: type[ChannelDistributions] = ChannelDistributions
settings_data_model: Type[ColourChannelDetectSettings] = ColourChannelDetectSettings settings_data_model: type[ColourChannelDetectSettings] = ColourChannelDetectSettings
# These are the same as those used for ChannelDeviationLUV. More detail is # These are the same as those used for ChannelDeviationLUV. More detail is
# provided there. # provided there.
@ -297,8 +297,8 @@ class ChannelDeviationLUV(
# Note we don't use the means in this algorithm but we use the same channel # Note we don't use the means in this algorithm but we use the same channel
# distributions model # distributions model
background_data_model: Type[ChannelDistributions] = ChannelDistributions background_data_model: type[ChannelDistributions] = ChannelDistributions
settings_data_model: Type[ColourChannelDetectSettings] = ColourChannelDetectSettings settings_data_model: type[ColourChannelDetectSettings] = ColourChannelDetectSettings
# Empirically, 0.5 seems to be approximate the standard deviation for a good image # Empirically, 0.5 seems to be approximate the standard deviation for a good image
# in L and V. U appears to be about 60% of this value. U is about 65% of V when # in L and V. U appears to be about 60% of this value. U is about 65% of V when

3
src/openflexure_microscope_server/things/camera/__init__.py
View file

@ -210,6 +210,9 @@ class BaseCamera(lt.Thing):
:param main_resolution: the resolution to use for the main stream. :param main_resolution: the resolution to use for the main stream.
:param buffer_count: number of images in the stream buffer. :param buffer_count: number of images in the stream buffer.
Note that the default values for both parameters should be set appropriately
for the specific camera when defining a new Camera Thing.
""" """
raise NotImplementedError( raise NotImplementedError(
"CameraThings must define their own start_streaming method" "CameraThings must define their own start_streaming method"