mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-17 04:51:10 +00:00
modify workstation_architecture docs bioyond_HR (#133) * feat: Enhance Bioyond synchronization and resource management - Implemented synchronization for all material types (consumables, samples, reagents) from Bioyond, logging detailed information for each type. - Improved error handling and logging during synchronization processes. - Added functionality to save Bioyond material IDs in UniLab resources for future updates. - Enhanced the `sync_to_external` method to handle material movements correctly, including querying and creating materials in Bioyond. - Updated warehouse configurations to support new storage types and improved layout for better resource management. - Introduced new resource types such as reactors and tip boxes, with detailed specifications. - Modified warehouse factory to support column offsets for naming conventions (e.g., A05-D08). - Improved resource tracking by merging extra attributes instead of overwriting them. - Added a new method for updating resources in Bioyond, ensuring better synchronization of resource changes. * feat: 添加TipBox和Reactor的配置到bottles.yaml * fix: 修复液体投料方法中的volume参数处理逻辑 修复solid_feeding_vials方法中的volume参数处理逻辑,优化solvents参数的使用条件 更新液体投料方法,支持通过溶剂信息自动计算体积,添加solvents参数并更新文档描述 Add batch creation methods for vial and solution tasks 添加批量创建90%10%小瓶投料任务和二胺溶液配置任务的功能,更新相关参数和默认值
115 lines
4.0 KiB
Python
115 lines
4.0 KiB
Python
from typing import Dict, Optional, List, Union
|
||
from pylabrobot.resources import Coordinate
|
||
from pylabrobot.resources.carrier import ResourceHolder, create_homogeneous_resources
|
||
|
||
from unilabos.resources.itemized_carrier import ItemizedCarrier, ResourcePLR
|
||
|
||
|
||
LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||
|
||
|
||
def warehouse_factory(
|
||
name: str,
|
||
num_items_x: int = 1,
|
||
num_items_y: int = 4,
|
||
num_items_z: int = 4,
|
||
dx: float = 137.0,
|
||
dy: float = 96.0,
|
||
dz: float = 120.0,
|
||
item_dx: float = 10.0,
|
||
item_dy: float = 10.0,
|
||
item_dz: float = 10.0,
|
||
removed_positions: Optional[List[int]] = None,
|
||
empty: bool = False,
|
||
category: str = "warehouse",
|
||
model: Optional[str] = None,
|
||
col_offset: int = 0, # 新增:列起始偏移量,用于生成A05-D08等命名
|
||
):
|
||
# 创建16个板架位 (4层 x 4位置)
|
||
locations = []
|
||
for layer in range(num_items_z): # 4层
|
||
for row in range(num_items_y): # 4行
|
||
for col in range(num_items_x): # 1列 (每层4x1=4个位置)
|
||
# 计算位置
|
||
x = dx + col * item_dx
|
||
y = dy + (num_items_y - row - 1) * item_dy
|
||
z = dz + (num_items_z - layer - 1) * item_dz
|
||
locations.append(Coordinate(x, y, z))
|
||
if removed_positions:
|
||
locations = [loc for i, loc in enumerate(locations) if i not in removed_positions]
|
||
_sites = create_homogeneous_resources(
|
||
klass=ResourceHolder,
|
||
locations=locations,
|
||
resource_size_x=127.0,
|
||
resource_size_y=86.0,
|
||
name_prefix=name,
|
||
)
|
||
len_x, len_y = (num_items_x, num_items_y) if num_items_z == 1 else (num_items_y, num_items_z) if num_items_x == 1 else (num_items_x, num_items_z)
|
||
# 应用列偏移量,支持A05-D08等命名
|
||
# 使用列优先顺序生成keys (与Bioyond坐标系统一致): A01,B01,C01,D01, A02,B02,C02,D02, ...
|
||
keys = [f"{LETTERS[j]}{i + 1 + col_offset:02d}" for i in range(len_x) for j in range(len_y)]
|
||
sites = {i: site for i, site in zip(keys, _sites.values())}
|
||
|
||
return WareHouse(
|
||
name=name,
|
||
size_x=dx + item_dx * num_items_x,
|
||
size_y=dy + item_dy * num_items_y,
|
||
size_z=dz + item_dz * num_items_z,
|
||
num_items_x = num_items_x,
|
||
num_items_y = num_items_y,
|
||
num_items_z = num_items_z,
|
||
# ordered_items=ordered_items,
|
||
# ordering=ordering,
|
||
sites=sites,
|
||
category=category,
|
||
model=model,
|
||
)
|
||
|
||
|
||
class WareHouse(ItemizedCarrier):
|
||
"""堆栈载体类 - 可容纳16个板位的载体(4层x4行x1列)"""
|
||
def __init__(
|
||
self,
|
||
name: str,
|
||
size_x: float,
|
||
size_y: float,
|
||
size_z: float,
|
||
num_items_x: int,
|
||
num_items_y: int,
|
||
num_items_z: int,
|
||
layout: str = "x-y",
|
||
sites: Optional[Dict[Union[int, str], Optional[ResourcePLR]]] = None,
|
||
category: str = "warehouse",
|
||
model: Optional[str] = None,
|
||
):
|
||
|
||
super().__init__(
|
||
name=name,
|
||
size_x=size_x,
|
||
size_y=size_y,
|
||
size_z=size_z,
|
||
# ordered_items=ordered_items,
|
||
# ordering=ordering,
|
||
num_items_x=num_items_x,
|
||
num_items_y=num_items_y,
|
||
num_items_z=num_items_z,
|
||
layout=layout,
|
||
sites=sites,
|
||
category=category,
|
||
model=model,
|
||
)
|
||
|
||
def get_site_by_layer_position(self, row: int, col: int, layer: int) -> ResourceHolder:
|
||
if not (0 <= layer < 4 and 0 <= row < 4 and 0 <= col < 1):
|
||
raise ValueError("无效的位置: layer={}, row={}, col={}".format(layer, row, col))
|
||
|
||
site_index = layer * 4 + row * 1 + col
|
||
return self.sites[site_index]
|
||
|
||
def add_rack_to_position(self, row: int, col: int, layer: int, rack) -> None:
|
||
site = self.get_site_by_layer_position(row, col, layer)
|
||
site.assign_child_resource(rack)
|
||
|
||
def get_rack_at_position(self, row: int, col: int, layer: int):
|
||
site = self.get_site_by_layer_position(row, col, layer)
|
||
return site.resource |