mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2026-02-03 21:05:09 +00:00
Workbench example, adjust log level, and ci check (#220) * TestLatency Return Value Example & gitignore update * Adjust log level & Add workbench virtual example & Add not action decorator & Add check_mode & * Add CI Check Fix/workstation yb revision (#217) * Revert log change & update registry * Revert opcua client & move electrolyte node Workstation yb merge dev ready 260113 (#216) * feat(bioyond): 添加计算实验设计功能,支持化合物配比和滴定比例参数 * feat(bioyond): 添加测量小瓶功能,支持基本参数配置 * feat(bioyond): 添加测量小瓶配置,支持新设备参数 * feat(bioyond): 更新仓库布局和尺寸,支持竖向排列的测量小瓶和试剂存放堆栈 * feat(bioyond): 优化任务创建流程,确保无论成功与否都清理任务队列以避免重复累积 * feat(bioyond): 添加设置反应器温度功能,支持温度范围和异常处理 * feat(bioyond): 调整反应器位置配置,统一坐标格式 * feat(bioyond): 添加调度器启动功能,支持任务队列执行并处理异常 * feat(bioyond): 优化调度器启动功能,添加异常处理并更新相关配置 * feat(opcua): 增强节点ID解析兼容性和数据类型处理 改进节点ID解析逻辑以支持多种格式,包括字符串和数字标识符 添加数据类型转换处理,确保写入值时类型匹配 优化错误提示信息,便于调试节点连接问题 * feat(registry): 新增后处理站的设备配置文件 添加后处理站的YAML配置文件,包含动作映射、状态类型和设备描述 * 添加调度器启动功能,合并物料参数配置,优化物料参数处理逻辑 * 添加从 Bioyond 系统自动同步工作流序列的功能,并更新相关配置 * fix:兼容 BioyondReactionStation 中 workflow_sequence 被重写为 property * fix:同步工作流序列 * feat: remove commented workflow synchronization from `reaction_station.py`. * 添加时间约束功能及相关配置 * fix:自动更新物料缓存功能,添加物料时更新缓存并在删除时移除缓存项 * fix:在添加物料时处理字符串和字典返回值,确保正确更新缓存 * fix:更新奔曜错误处理报送为物料变更报送,调整日志记录和响应消息 * feat:添加实验报告简化功能,去除冗余信息并保留关键信息 * feat: 添加任务状态事件发布功能,监控并报告任务运行、超时、完成和错误状态 * fix: 修复添加物料时数据格式错误 * Refactor bioyond_dispensing_station and reaction_station_bioyond YAML configurations - Removed redundant action value mappings from bioyond_dispensing_station. - Updated goal properties in bioyond_dispensing_station to use enums for target_stack and other parameters. - Changed data types for end_point and start_point in reaction_station_bioyond to use string enums (Start, End). - Simplified descriptions and updated measurement units from μL to mL where applicable. - Removed unused commands from reaction_station_bioyond to streamline the configuration. * fix:Change the material unit from μL to mL * fix:refresh_material_cache * feat: 动态获取工作流步骤ID,优化工作流配置 * feat: 添加清空服务端所有非核心工作流功能 * fix:修复Bottle类的序列化和反序列化方法 * feat:增强材料缓存更新逻辑,支持处理返回数据中的详细信息 * Add debug log * feat(workstation): update bioyond config migration and coin cell material search logic - Migrate bioyond_cell config to JSON structure and remove global variable dependencies - Implement material search confirmation dialog auto-handling - Add documentation: 20260113_物料搜寻确认弹窗自动处理功能.md and 20260113_配置迁移修改总结.md * Refactor module paths for Bioyond devices in YAML configuration files - Updated the module path for BioyondDispensingStation in bioyond_dispensing_station.yaml to reflect the new directory structure. - Updated the module path for BioyondReactionStation and BioyondReactor in reaction_station_bioyond.yaml to align with the revised organization of the codebase. * fix: WareHouse 的不可哈希类型错误,优化父节点去重逻辑 * refactor: Move config from module to instance initialization * fix: 修正 reaction_station 目录名拼写错误 * feat: Integrate material search logic and cleanup deprecated files - Update coin_cell_assembly.py with material search dialog handling - Update YB_warehouses.py with latest warehouse configurations - Remove outdated documentation and test data files * Refactor: Use instance attributes for action names and workflow step IDs * refactor: Split tipbox storage into left and right warehouses * refactor: Merge tipbox storage left and right into single warehouse --------- Co-authored-by: ZiWei <131428629+ZiWei09@users.noreply.github.com> Co-authored-by: Andy6M <xieqiming1132@qq.com> fix: WareHouse 的不可哈希类型错误,优化父节点去重逻辑 fix parent_uuid fetch when bind_parent_id == node_name 物料更新也是用父节点进行报送 Add None conversion for tube rack etc. Add set_liquid example. Add create_resource and test_resource example. Add restart. Temp allow action message. Add no_update_feedback option. Create session_id by edge. bump version to 0.10.15 temp cancel update req
155 lines
5.8 KiB
Python
155 lines
5.8 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,
|
||
resource_size_x: float = 127.0,
|
||
resource_size_y: float = 86.0,
|
||
resource_size_z: float = 25.0,
|
||
removed_positions: Optional[List[int]] = None,
|
||
empty: bool = False,
|
||
category: str = "warehouse",
|
||
model: Optional[str] = None,
|
||
col_offset: int = 0, # 列起始偏移量,用于生成A05-D08等命名
|
||
row_offset: int = 0, # 行起始偏移量,用于生成F01-J03等命名
|
||
layout: str = "col-major", # 新增:排序方式,"col-major"=列优先,"row-major"=行优先
|
||
):
|
||
# 创建位置坐标
|
||
locations = []
|
||
|
||
for layer in range(num_items_z): # 层
|
||
for row in range(num_items_y): # 行
|
||
for col in range(num_items_x): # 列
|
||
# 计算位置
|
||
x = dx + col * item_dx
|
||
|
||
# 根据 layout 决定 y 坐标计算
|
||
if layout == "row-major":
|
||
# 行优先:row=0(A行) 应该显示在上方,需要较小的 y 值
|
||
y = dy + row * item_dy
|
||
elif layout == "vertical-col-major":
|
||
# 竖向warehouse: row=0 对应顶部(y小),row=n-1 对应底部(y大)
|
||
# 但标签 01 应该在底部,所以使用反向映射
|
||
y = dy + (num_items_y - row - 1) * item_dy
|
||
else:
|
||
# 列优先:保持原逻辑(row=0 对应较大的 y)
|
||
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=resource_size_x,
|
||
resource_size_y=resource_size_y,
|
||
resource_size_z=resource_size_z,
|
||
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)
|
||
|
||
# 根据 layout 参数生成不同的排序方式
|
||
# 注意:物理位置的 y 坐标是倒序的 (row=0 时 y 最大,对应前端显示的顶部)
|
||
if layout == "row-major":
|
||
# 行优先顺序: A01,A02,A03,A04, B01,B02,B03,B04
|
||
# locations[0] 对应 row=0, y最大(前端顶部)→ 应该是 A01
|
||
keys = [f"{LETTERS[j + row_offset]}{i + 1 + col_offset:02d}" for j in range(len_y) for i in range(len_x)]
|
||
else:
|
||
# 列优先顺序: A01,B01,C01,D01, A02,B02,C02,D02
|
||
keys = [f"{LETTERS[j + row_offset]}{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,
|
||
ordering_layout=layout, # 传递排序方式到 ordering_layout
|
||
# 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,
|
||
ordering_layout: str = "col-major",
|
||
**kwargs
|
||
):
|
||
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,
|
||
)
|
||
|
||
# 保存排序方式,供graphio.py的坐标映射使用
|
||
# 使用独立属性避免与父类的layout冲突
|
||
self.ordering_layout = ordering_layout
|
||
|
||
def serialize(self) -> dict:
|
||
"""序列化时保存 ordering_layout 属性"""
|
||
data = super().serialize()
|
||
data['ordering_layout'] = self.ordering_layout
|
||
return data
|
||
|
||
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
|