Skip to content

Commit 204d7b7

Browse files
committed
lint, typo, type (not tests yet)
1 parent 26492cb commit 204d7b7

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

pylabrobot/liquid_handling/liquid_classes/hamilton/star.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4215,7 +4215,7 @@ def get_star_liquid_class(
42154215
# - a break time after dispense with about 10s time counter, makes sure the drop which residue
42164216
# after dispense drops back into the probetube
42174217
# - some droplets on tip after dispense are also with more air transport volume not avoidable
4218-
# - sometimes it helpes using Filtertips
4218+
# - sometimes it helps to use Filtertips
42194219
# - Correction Curve is taken from MeOH Liqiudclass
42204220
#
42214221
#
@@ -5581,7 +5581,7 @@ def get_star_liquid_class(
55815581
# - To protect, the distance from Asp. to Disp. should be as short as possible,
55825582
# because MeOH could be drop out in a long way!
55835583
# - some droplets on tip after dispense are also with more air transport volume not avoidable
5584-
# - sometimes it helpes using Filtertips
5584+
# - sometimes it helps to use Filtertips
55855585
#
55865586
#
55875587
#
@@ -5633,7 +5633,7 @@ def get_star_liquid_class(
56335633
# - To protect, the distance from Asp. to Disp. should be as short as possible,
56345634
# because MeOH could be drop out in a long way!
56355635
# - some droplets on tip after dispense are also with more air transport volume not avoidable
5636-
# - sometimes it helpes using Filtertips
5636+
# - sometimes it helps to use Filtertips
56375637
#
56385638
#
56395639
#
@@ -12002,7 +12002,7 @@ def get_star_liquid_class(
1200212002
# - To protect, the distance from Asp. to Disp. should be as short as possible( about 12slot),
1200312003
# because MeOH could drop out in a long way!
1200412004
# - some droplets on tip after dispense are also with more air transport volume not avoidable
12005-
# - sometimes it helpes using Filtertips
12005+
# - sometimes it helps to use Filtertips
1200612006
#
1200712007
#
1200812008
#
@@ -12054,7 +12054,7 @@ def get_star_liquid_class(
1205412054
# - To protect, the distance from Asp. to Disp. should be as short as possible( about 12slot),
1205512055
# because MeOH could drop out in a long way!
1205612056
# - some droplets on tip after dispense are also with more air transport volume not avoidable
12057-
# - sometimes it helpes using Filtertips
12057+
# - sometimes it helps to use Filtertips
1205812058
#
1205912059
#
1206012060
#

pylabrobot/liquid_handling/liquid_classes/hamilton/vantage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10988,7 +10988,7 @@ def get_vantage_liquid_class(
1098810988
# - To protect, the distance from Asp. to Disp. should be as short as possible( about 12slot),
1098910989
# because MeOH could drop out in a long way!
1099010990
# - some droplets on tip after dispense are also with more air transport volume not avoidable
10991-
# - sometimes it helpes using Filtertips
10991+
# - sometimes it helps to use Filtertips
1099210992
#
1099310993
#
1099410994
#
@@ -11040,7 +11040,7 @@ def get_vantage_liquid_class(
1104011040
# - To protect, the distance from Asp. to Disp. should be as short as possible( about 12slot),
1104111041
# because MeOH could drop out in a long way!
1104211042
# - some droplets on tip after dispense are also with more air transport volume not avoidable
11043-
# - sometimes it helpes using Filtertips
11043+
# - sometimes it helps to use Filtertips
1104411044
#
1104511045
#
1104611046
#

pylabrobot/plate_reading/__init__.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
from .biotek_backend import Cytation5Backend, Cytation5ImagingConfig
2-
from .byonoy_backend import ByonoyAbsorbance96AutomateBackend, ByonoyFluorescence96AutomateBackend
3-
from .clario_star_backend import CLARIOstarBackend
2+
from .byonoy import (
3+
ByonoyAbsorbance96AutomateBackend,
4+
ByonoyLuminescence96AutomateBackend,
5+
byonoy_absorbance96_base_and_reader,
6+
byonoy_absorbance_adapter,
7+
)
8+
from .clario_star_backend import CLARIOStarBackend
49
from .image_reader import ImageReader
510
from .imager import Imager
611
from .plate_reader import PlateReader
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
from .byonoy import byonoy_luminescence96_base_and_reader, byonoy_luminescence_adapter
1+
from .byonoy import byonoy_absorbance96_base_and_reader, byonoy_absorbance_adapter
22
from .byonoy_backend import ByonoyAbsorbance96AutomateBackend, ByonoyLuminescence96AutomateBackend

pylabrobot/plate_reading/byonoy/byonoy.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from pylabrobot.resources import Coordinate, PlateHolder, Resource, ResourceHolder
66

77

8-
def byonoy_luminescence_adapter(name: str) -> ResourceHolder:
8+
def byonoy_absorbance_adapter(name: str) -> ResourceHolder:
99
return ResourceHolder(
1010
name=name,
1111
size_x=127.76, # measured
@@ -90,7 +90,9 @@ def __init__(self, name, rotation=None, category=None, model=None, barcode=None)
9090
)
9191
self.assign_child_resource(self.reader_holder, location=Coordinate.zero())
9292

93-
def assign_child_resource(self, resource: Resource, location: Coordinate, reassign=True):
93+
def assign_child_resource(
94+
self, resource: Resource, location: Optional[Coordinate], reassign=True
95+
):
9496
if isinstance(resource, _ByonoyAbsorbanceReaderPlateHolder):
9597
if self.plate_holder._byonoy_base is not None:
9698
raise ValueError("ByonoyBase can only have one plate holder assigned.")
@@ -104,7 +106,7 @@ def check_can_drop_resource_here(self, resource: Resource) -> None:
104106
)
105107

106108

107-
def byonoy_luminescence96_base_and_reader(name: str, assign=True) -> Tuple[ByonoyBase, PlateReader]:
109+
def byonoy_absorbance96_base_and_reader(name: str, assign=True) -> Tuple[ByonoyBase, PlateReader]:
108110
"""Creates a ByonoyBase and a PlateReader instance."""
109111
byonoy_base = ByonoyBase(name=name + "_base")
110112
reader = PlateReader(

pylabrobot/plate_reading/byonoy/byonoy_backend.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from pylabrobot.io.hid import HID
1010
from pylabrobot.plate_reading.backend import PlateReaderBackend
11-
from pylabrobot.plate_reading.byonoy.parser import encode_hid_report, parse_hid_report
1211
from pylabrobot.resources.plate import Plate
1312
from pylabrobot.utils.list import reshape_2d
1413

@@ -102,11 +101,9 @@ async def _ping_loop(self) -> None:
102101
"""Main ping loop that runs in the background thread."""
103102
while not self._stop_background.is_set():
104103
if self._sending_pings:
105-
cmd = b"\x00" + encode_hid_report(
106-
{"report_id": 64, "payload_name": "HEARTBEAT_IN", "payload": {"enabled": 1}}
107-
)
108-
await self.io.write(cmd)
109104
# don't read in background thread, data might get lost here
105+
# not needed?
106+
pass
110107

111108
self._stop_background.wait(self._ping_interval)
112109

pylabrobot/plate_reading/byonoy/byonoy_tests.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
import unittest
22
import unittest.mock
33

4-
from pylabrobot.liquid_handling import (
5-
LiquidHandler,
6-
LiquidHandlerBackend,
7-
LiquidHandlerChatterboxBackend,
8-
)
4+
from pylabrobot.liquid_handling import LiquidHandler, LiquidHandlerBackend
95
from pylabrobot.plate_reading.byonoy import (
10-
byonoy_luminescence96_base_and_reader,
11-
byonoy_luminescence_adapter,
6+
byonoy_absorbance96_base_and_reader,
7+
byonoy_absorbance_adapter,
128
)
139
from pylabrobot.resources import PLT_CAR_L5_DWP, CellVis_96_wellplate_350uL_Fb, Coordinate, STARDeck
1410

1511

1612
class ByonoyResourceTests(unittest.IsolatedAsyncioTestCase):
1713
async def asyncSetUp(self):
18-
self.base, self.reader = byonoy_luminescence96_base_and_reader(name="byonoy_test", assign=True)
19-
self.adapter = byonoy_luminescence_adapter(name="byonoy_test_adapter")
14+
self.base, self.reader = byonoy_absorbance96_base_and_reader(name="byonoy_test", assign=True)
15+
self.adapter = byonoy_absorbance_adapter(name="byonoy_test_adapter")
2016

21-
self.lh = LiquidHandler(deck=STARDeck(), backend=unittest.mock.Mock(spec=LiquidHandlerBackend))
22-
# self.lh = LiquidHandler(deck=STARDeck(), backend=LiquidHandlerChatterboxBackend())
17+
self.deck = STARDeck()
18+
self.lh = LiquidHandler(deck=self.deck, backend=unittest.mock.Mock(spec=LiquidHandlerBackend))
2319
self.plate_carrier = PLT_CAR_L5_DWP(name="plate_carrier")
2420
self.plate_carrier[1] = self.adapter
25-
self.lh.deck.assign_child_resource(self.plate_carrier, rails=28)
21+
self.deck.assign_child_resource(self.plate_carrier, rails=28)
2622
self.adapter.assign_child_resource(self.base)
2723
self.plate_carrier[2] = self.plate = CellVis_96_wellplate_350uL_Fb(name="plate")
2824

0 commit comments

Comments
 (0)