mirror of
https://github.com/deepmodeling/Uni-Lab-OS
synced 2026-05-24 13:12:15 +00:00
7c83e1bd51
- Phase 1: fix _publish_resource_tree_update to call update_resource via run_async_func with deck resource list. - Phase 2: add ID-first material placement resolver chain with material_info and warehouse_inventory caches. - Phase 3: classify stock-material rows as slot_labware vs liquid_content; idempotent reagent attachment by Bioyond materialId. - Phase 4: introduce SirnaResourceSynchronizer over BioyondResourceSynchronizer; install once in post_init without double-sync. - Phase 5: numeric stack orientation and bioyond_axis support in bioyond warehouses/__init__/decks (carries forward prior in-progress edits). - _resolve_location_to_warehouse now raises on ambiguity; deck constructor accepts warehouse_bioyond_ids kwarg.
230 lines
10 KiB
Python
230 lines
10 KiB
Python
from os import name
|
||
|
||
from pylabrobot.resources import Deck, Coordinate, Rotation
|
||
|
||
from unilabos.registry.decorators import resource
|
||
from unilabos.resources.bioyond.YB_warehouses import (
|
||
bioyond_warehouse_1x4x4,
|
||
bioyond_warehouse_1x4x4_right, # 新增：右侧仓库 (A05～D08)
|
||
bioyond_warehouse_1x4x2,
|
||
bioyond_warehouse_reagent_stack, # 新增：试剂堆栈 (A1-B4)
|
||
bioyond_warehouse_liquid_and_lid_handling,
|
||
bioyond_warehouse_1x2x2,
|
||
bioyond_warehouse_2x2x1, # 新增：321和43窗口 (2行×2列)
|
||
bioyond_warehouse_1x3x3,
|
||
bioyond_warehouse_5x3x1, # 新增：手动传递窗仓库 (5行×3列)
|
||
bioyond_warehouse_10x1x1,
|
||
bioyond_warehouse_3x3x1,
|
||
bioyond_warehouse_3x3x1_2,
|
||
bioyond_warehouse_5x1x1,
|
||
bioyond_warehouse_1x8x4,
|
||
bioyond_warehouse_reagent_storage,
|
||
# bioyond_warehouse_liquid_preparation,
|
||
bioyond_warehouse_density_vial,
|
||
)
|
||
from unilabos.resources.bioyond.warehouses import (
|
||
bioyond_warehouse_tipbox_storage_left, # 新增：Tip盒堆栈(左)
|
||
bioyond_warehouse_tipbox_storage_right, # 新增：Tip盒堆栈(右)
|
||
bioyond_warehouse_sirna_automation_stack,
|
||
bioyond_warehouse_sirna_centrifuge_balance_plate_stack,
|
||
bioyond_warehouse_sirna_g3_liquid_handler,
|
||
)
|
||
|
||
|
||
class BIOYOND_PolymerReactionStation_Deck(Deck):
|
||
def __init__(
|
||
self,
|
||
name: str = "PolymerReactionStation_Deck",
|
||
size_x: float = 2700.0,
|
||
size_y: float = 1080.0,
|
||
size_z: float = 1500.0,
|
||
category: str = "deck",
|
||
setup: bool = False
|
||
) -> None:
|
||
super().__init__(name=name, size_x=2700.0, size_y=1080.0, size_z=1500.0)
|
||
if setup:
|
||
self.setup()
|
||
|
||
def setup(self) -> None:
|
||
# 添加仓库
|
||
# 说明: 堆栈1物理上分为左右两部分
|
||
# - 堆栈1左: A01～D04 (4行×4列, 位于反应站左侧)
|
||
# - 堆栈1右: A05～D08 (4行×4列, 位于反应站右侧)
|
||
self.warehouses = {
|
||
"堆栈1左": bioyond_warehouse_1x4x4("堆栈1左"), # 左侧堆栈: A01～D04
|
||
"堆栈1右": bioyond_warehouse_1x4x4_right("堆栈1右"), # 右侧堆栈: A05～D08
|
||
"站内试剂存放堆栈": bioyond_warehouse_reagent_storage("站内试剂存放堆栈"), # A01～A02
|
||
# "移液站内10%分装液体准备仓库": bioyond_warehouse_liquid_preparation("移液站内10%分装液体准备仓库"), # A01～B04
|
||
"站内Tip盒堆栈(左)": bioyond_warehouse_tipbox_storage_left("站内Tip盒堆栈(左)"), # A02～B03
|
||
"站内Tip盒堆栈(右)": bioyond_warehouse_tipbox_storage_right("站内Tip盒堆栈(右)"), # A01～B01
|
||
"测量小瓶仓库(测密度)": bioyond_warehouse_density_vial("测量小瓶仓库(测密度)"), # A01～B03
|
||
}
|
||
self.warehouse_locations = {
|
||
"堆栈1左": Coordinate(-200.0, 400.0, 0.0), # 左侧位置
|
||
"堆栈1右": Coordinate(2350.0, 400.0, 0.0), # 右侧位置
|
||
"站内试剂存放堆栈": Coordinate(640.0, 400.0, 0.0),
|
||
"站内Tip盒堆栈(左)": Coordinate(300.0, 100.0, 0.0),
|
||
"站内Tip盒堆栈(右)": Coordinate(2250.0, 100.0, 0.0), # 向右偏移 2 * item_dx (137.0)
|
||
"测量小瓶仓库(测密度)": Coordinate(1000.0, 530.0, 0.0),
|
||
}
|
||
|
||
for warehouse_name, warehouse in self.warehouses.items():
|
||
self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])
|
||
|
||
class BIOYOND_PolymerPreparationStation_Deck(Deck):
|
||
def __init__(
|
||
self,
|
||
name: str = "PolymerPreparationStation_Deck",
|
||
size_x: float = 2700.0,
|
||
size_y: float = 1080.0,
|
||
size_z: float = 1500.0,
|
||
category: str = "deck",
|
||
setup: bool = False
|
||
) -> None:
|
||
super().__init__(name=name, size_x=2700.0, size_y=1080.0, size_z=1500.0)
|
||
if setup:
|
||
self.setup()
|
||
|
||
def setup(self) -> None:
|
||
# 添加仓库 - 配液站的3个堆栈，使用Bioyond系统中的实际名称
|
||
# 样品类型（typeMode=1）：烧杯、试剂瓶、分装板 → 试剂堆栈、溶液堆栈
|
||
# 试剂类型（typeMode=2）：样品板 → 粉末堆栈
|
||
self.warehouses = {
|
||
# 试剂类型 - 样品板
|
||
"粉末堆栈": bioyond_warehouse_1x4x4("粉末堆栈"), # 4行×4列 (A01-D04)
|
||
|
||
# 样品类型 - 烧杯、试剂瓶、分装板
|
||
"试剂堆栈": bioyond_warehouse_reagent_stack("试剂堆栈"), # 2行×4列 (A01-B04)
|
||
"溶液堆栈": bioyond_warehouse_1x4x4("溶液堆栈"), # 4行×4列 (A01-D04)
|
||
}
|
||
self.warehouse_locations = {
|
||
"粉末堆栈": Coordinate(-200.0, 400.0, 0.0),
|
||
"试剂堆栈": Coordinate(1750.0, 160.0, 0.0),
|
||
"溶液堆栈": Coordinate(2350.0, 400.0, 0.0),
|
||
}
|
||
|
||
for warehouse_name, warehouse in self.warehouses.items():
|
||
self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])
|
||
|
||
@resource(
|
||
id="BIOYOND_SirnaStation_Deck",
|
||
category=["deck"],
|
||
description="BIOYOND 小核酸工作站 Deck",
|
||
icon="配液站.webp",
|
||
)
|
||
class BIOYOND_SirnaStation_Deck(Deck):
|
||
WAREHOUSE_BIOYOND_AXIS = {
|
||
"G3移液站": "xy_col_row",
|
||
"自动化堆栈": "xy_col_row",
|
||
"离心机配平板堆栈": "xy_col_row",
|
||
}
|
||
# Bioyond warehouse UUID -> 本地仓库名称 映射。
|
||
# 留空时由配置（station config 的 ``warehouse_bioyond_ids``）注入。
|
||
# graph 节点也可在 deck.config.warehouse_bioyond_ids 覆盖。
|
||
WAREHOUSE_BIOYOND_IDS: dict = {}
|
||
|
||
def __init__(
|
||
self,
|
||
name: str = "SirnaStation_Deck",
|
||
size_x: float = 2700.0,
|
||
size_y: float = 1080.0,
|
||
size_z: float = 1500.0,
|
||
category: str = "deck",
|
||
setup: bool = False,
|
||
warehouse_bioyond_ids: dict | None = None,
|
||
**kwargs,
|
||
) -> None:
|
||
super().__init__(name=name, size_x=size_x, size_y=size_y, size_z=size_z)
|
||
# 按需写入实例级覆盖；保留默认空 mapping，避免改动模型常量。
|
||
self.warehouse_bioyond_ids: dict = dict(self.WAREHOUSE_BIOYOND_IDS)
|
||
if warehouse_bioyond_ids:
|
||
self.warehouse_bioyond_ids.update(warehouse_bioyond_ids)
|
||
if setup:
|
||
self.setup()
|
||
|
||
@classmethod
|
||
def deserialize(cls, data: dict, allow_marshal: bool = False):
|
||
if data.get("children") and data.get("setup") is True:
|
||
data = data.copy()
|
||
data["setup"] = False
|
||
result = super().deserialize(data, allow_marshal=allow_marshal)
|
||
result._ensure_sirna_warehouse_axis()
|
||
return result
|
||
|
||
def _ensure_sirna_warehouse_axis(self) -> None:
|
||
for child in getattr(self, "children", []):
|
||
axis = self.WAREHOUSE_BIOYOND_AXIS.get(getattr(child, "name", ""))
|
||
if axis and not hasattr(child, "bioyond_axis"):
|
||
child.bioyond_axis = axis
|
||
|
||
def setup(self) -> None:
|
||
# Sirna 读接口 /api/storage/location/locations-by-type 返回完整固定堆栈清单。
|
||
# LIMS 在库物料接口仍使用相同的 自动化堆栈 名称和数字库位编码。
|
||
self.warehouses = {
|
||
"G3移液站": bioyond_warehouse_sirna_g3_liquid_handler(),
|
||
"自动化堆栈": bioyond_warehouse_sirna_automation_stack(),
|
||
"离心机配平板堆栈": bioyond_warehouse_sirna_centrifuge_balance_plate_stack(),
|
||
}
|
||
self.warehouse_locations = {
|
||
"G3移液站": Coordinate(0.0, 0.0, 0.0),
|
||
"自动化堆栈": Coordinate(0.0, 180.0, 0.0),
|
||
"离心机配平板堆栈": Coordinate(0.0, 1300.0, 0.0),
|
||
}
|
||
|
||
for warehouse_name, warehouse in self.warehouses.items():
|
||
self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])
|
||
|
||
class BIOYOND_YB_Deck(Deck):
|
||
def __init__(
|
||
self,
|
||
name: str = "YB_Deck",
|
||
size_x: float = 4150,
|
||
size_y: float = 1400.0,
|
||
size_z: float = 2670.0,
|
||
category: str = "deck",
|
||
setup: bool = False
|
||
) -> None:
|
||
super().__init__(name=name, size_x=4150.0, size_y=1400.0, size_z=2670.0)
|
||
if setup:
|
||
self.setup()
|
||
|
||
def setup(self) -> None:
|
||
# 添加仓库
|
||
self.warehouses = {
|
||
"321窗口": bioyond_warehouse_2x2x1("321窗口"), # 2行×2列
|
||
"43窗口": bioyond_warehouse_2x2x1("43窗口"), # 2行×2列
|
||
"手动传递窗右": bioyond_warehouse_5x3x1("手动传递窗右", row_offset=0), # A01-E03
|
||
"手动传递窗左": bioyond_warehouse_5x3x1("手动传递窗左", row_offset=5), # F01-J03
|
||
"加样头堆栈左": bioyond_warehouse_10x1x1("加样头堆栈左"),
|
||
"加样头堆栈右": bioyond_warehouse_10x1x1("加样头堆栈右"),
|
||
|
||
"15ml配液堆栈左": bioyond_warehouse_3x3x1("15ml配液堆栈左"),
|
||
"母液加样右": bioyond_warehouse_3x3x1_2("母液加样右"),
|
||
"大瓶母液堆栈左": bioyond_warehouse_5x1x1("大瓶母液堆栈左"),
|
||
"大瓶母液堆栈右": bioyond_warehouse_5x1x1("大瓶母液堆栈右"),
|
||
"2号手套箱内部堆栈": bioyond_warehouse_3x3x1("2号手套箱内部堆栈"), # 新增：3行×3列 (A01-C03)
|
||
}
|
||
# warehouse 的位置
|
||
self.warehouse_locations = {
|
||
"321窗口": Coordinate(-150.0, 158.0, 0.0),
|
||
"43窗口": Coordinate(4160.0, 158.0, 0.0),
|
||
"手动传递窗左": Coordinate(-150.0, 877.0, 0.0),
|
||
"手动传递窗右": Coordinate(4160.0, 877.0, 0.0),
|
||
"加样头堆栈左": Coordinate(385.0, 1300.0, 0.0),
|
||
"加样头堆栈右": Coordinate(2187.0, 1300.0, 0.0),
|
||
|
||
"15ml配液堆栈左": Coordinate(749.0, 355.0, 0.0),
|
||
"母液加样右": Coordinate(2152.0, 333.0, 0.0),
|
||
"大瓶母液堆栈左": Coordinate(1164.0, 676.0, 0.0),
|
||
"大瓶母液堆栈右": Coordinate(2717.0, 676.0, 0.0),
|
||
"2号手套箱内部堆栈": Coordinate(-800, -500.0, 0.0), # 新增：位置需根据实际硬件调整
|
||
}
|
||
|
||
for warehouse_name, warehouse in self.warehouses.items():
|
||
self.assign_child_resource(warehouse, location=self.warehouse_locations[warehouse_name])
|
||
|
||
def YB_Deck(name: str) -> Deck:
|
||
by=BIOYOND_YB_Deck(name=name)
|
||
by.setup()
|
||
return by
|