Organise plate_reading package

pylabrobot/plate_reading/__init__.py

@@ -1,15 +1,40 @@
-from .agilent_biotek_backend import BioTekPlateReaderBackend
-from .agilent_biotek_cytation_backend import (
+from __future__ import annotations
+
+from typing import Any
+
+from .agilent import (
+  BioTekPlateReaderBackend,
   Cytation5Backend,
   Cytation5ImagingConfig,
   CytationBackend,
   CytationImagingConfig,
+  SynergyH1Backend,
 )
-from .agilent_biotek_synergyh1_backend import SynergyH1Backend
+from .bmg_labtech import CLARIOstarBackend
 from .chatterbox import PlateReaderChatterboxBackend
-from .clario_star_backend import CLARIOstarBackend
 from .image_reader import ImageReader
 from .imager import Imager
+from .molecular_devices import (
+  Calibrate,
+  CarriageSpeed,
+  KineticSettings,
+  MolecularDevicesBackend,
+  MolecularDevicesError,
+  MolecularDevicesFirmwareError,
+  MolecularDevicesHardwareError,
+  MolecularDevicesMotionError,
+  MolecularDevicesNVRAMError,
+  MolecularDevicesSettings,
+  MolecularDevicesSpectraMax384PlusBackend,
+  MolecularDevicesSpectraMaxM5Backend,
+  MolecularDevicesUnrecognizedCommandError,
+  PmtGain,
+  ReadMode,
+  ReadOrder,
+  ReadType,
+  ShakeSettings,
+  SpectrumSettings,
+)
 from .plate_reader import PlateReader
 from .standard import (
   Exposure,

pylabrobot/plate_reading/agilent/__init__.py

@@ -0,0 +1,8 @@
+from .biotek_backend import BioTekPlateReaderBackend
+from .biotek_cytation_backend import (
+  Cytation5Backend,
+  Cytation5ImagingConfig,
+  CytationBackend,
+  CytationImagingConfig,
+)
+from .biotek_synergyh1_backend import SynergyH1Backend

pylabrobot/plate_reading/agilent_biotek_cytation_backend.py → pylabrobot/plate_reading/agilent/biotek_cytation_backend.py

@@ -8,7 +8,7 @@
 from dataclasses import dataclass
 from typing import List, Literal, Optional, Tuple, Union
 
-from pylabrobot.plate_reading.agilent_biotek_backend import BioTekPlateReaderBackend
+from pylabrobot.plate_reading.agilent.biotek_backend import BioTekPlateReaderBackend
 from pylabrobot.plate_reading.backend import ImagerBackend
 from pylabrobot.resources import Plate
 

pylabrobot/plate_reading/agilent_biotek_synergyh1_backend.py → pylabrobot/plate_reading/agilent/biotek_synergyh1_backend.py

@@ -5,7 +5,7 @@
 
 from pylibftdi import FtdiError
 
-from pylabrobot.plate_reading.agilent_biotek_backend import BioTekPlateReaderBackend
+from pylabrobot.plate_reading.agilent.biotek_backend import BioTekPlateReaderBackend
 
 logger = logging.getLogger(__name__)
 

pylabrobot/plate_reading/biotek_tests.py → pylabrobot/plate_reading/agilent/biotek_tests.py

@@ -5,7 +5,7 @@
 import unittest.mock
 from typing import Iterator
 
-from pylabrobot.plate_reading.agilent_biotek_cytation_backend import CytationBackend
+from pylabrobot.plate_reading.agilent.biotek_cytation_backend import CytationBackend
 from pylabrobot.resources import CellVis_24_wellplate_3600uL_Fb, CellVis_96_wellplate_350uL_Fb
 
 

pylabrobot/plate_reading/biotek_backend.py

@@ -0,0 +1,8 @@
+import warnings
+
+from .agilent.biotek_backend import BioTekPlateReaderBackend  # noqa: F401
+
+warnings.warn(
+  "pylabrobot.plate_reading.biotek_backend is deprecated and will be removed in a future release. "
+  "Please use pylabrobot.plate_reading.agilent.biotek_backend instead.",
+)

pylabrobot/plate_reading/biotek_cytation_backend.py

@@ -0,0 +1,13 @@
+import warnings
+
+from .agilent.biotek_cytation_backend import (
+  Cytation5Backend,  # noqa: F401
+  Cytation5ImagingConfig,  # noqa: F401
+  CytationBackend,  # noqa: F401
+  CytationImagingConfig,  # noqa: F401
+)
+
+warnings.warn(
+  "pylabrobot.plate_reading.biotek_backend is deprecated and will be removed in a future release. "
+  "Please use pylabrobot.plate_reading.agilent.biotek_backend instead.",
+)

pylabrobot/plate_reading/biotek_synergyh1_backend.py

@@ -0,0 +1,8 @@
+import warnings
+
+from .agilent.biotek_synergyh1_backend import SynergyH1Backend  # noqa: F401
+
+warnings.warn(
+  "pylabrobot.plate_reading.biotek_synergyh1_backend is deprecated and will be removed in a future release. "
+  "Please use pylabrobot.plate_reading.agilent.biotek_synergyh1_backend instead.",
+)

pylabrobot/plate_reading/bmg_labtech/__init__.py

@@ -0,0 +1 @@
+from .clario_star_backend import CLARIOstarBackend