mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-15 13:44:39 +00:00
* 更新Bioyond工作站配置,添加新的物料类型映射和载架定义,优化物料查询逻辑 * 添加Bioyond实验配置文件,定义物料类型映射和设备配置 * 更新bioyond_warehouse_reagent_stack方法,修正试剂堆栈尺寸和布局描述 * 更新Bioyond实验配置,修正物料类型映射,优化设备配置 * 更新Bioyond资源同步逻辑,优化物料入库流程,增强错误处理和日志记录 * 更新Bioyond资源,添加配液站和反应站专用载架,优化仓库工厂函数的排序方式 * 更新Bioyond资源,添加配液站和反应站相关载架,优化试剂瓶和样品瓶配置 * 更新Bioyond实验配置,修正试剂瓶载架ID,确保与设备匹配 * 更新Bioyond资源,移除反应站单烧杯载架,添加反应站单烧瓶载架分类 * Refactor Bioyond resource synchronization and update bottle carrier definitions - Removed traceback printing in error handling for Bioyond synchronization. - Enhanced logging for existing Bioyond material ID usage during synchronization. - Added new bottle carrier definitions for single flask and updated existing ones. - Refactored dispensing station and reaction station bottle definitions for clarity and consistency. - Improved resource mapping and error handling in graphio for Bioyond resource conversion. - Introduced layout parameter in warehouse factory for better warehouse configuration. * 更新Bioyond仓库工厂,添加排序方式支持,优化坐标计算逻辑 * 更新Bioyond载架和甲板配置,调整样品板尺寸和仓库坐标 * 更新Bioyond资源同步,增强占用位置日志信息,修正坐标转换逻辑 * 更新Bioyond反应站和分配站配置,调整材料类型映射和ID,移除不必要的项 * support name change during materials change * fix json dumps * correct tip * 优化调度器API路径,更新相关方法描述 * 更新 BIOYOND 载架相关文档,调整 API 以支持自带试剂瓶的载架类型,修复资源获取时的子物料处理逻辑 * 实现资源删除时的同步处理,优化出库操作逻辑 * 修复 ItemizedCarrier 中的可见性逻辑 * 保存 Bioyond 原始信息到 unilabos_extra,以便出库时查询 * 根据 resource.capacity 判断是试剂瓶(载架)还是多瓶载架,走不同的奔曜转换 * Fix bioyond bottle_carriers ordering * 优化 Bioyond 物料同步逻辑,增强坐标解析和位置更新处理 * disable slave connect websocket * correct remove_resource stats * change uuid logger to trace level * enable slave mode * refactor(bioyond): 统一资源命名并优化物料同步逻辑 - 将DispensingStation和ReactionStation资源统一为PolymerStation命名 - 优化物料同步逻辑,支持耗材类型(typeMode=0)的查询 - 添加物料默认参数配置功能 - 调整仓库坐标布局 - 清理废弃资源定义 * feat(warehouses): 为仓库函数添加col_offset和layout参数 * refactor: 更新实验配置中的物料类型映射命名 将DispensingStation和ReactionStation的物料类型映射统一更名为PolymerStation,保持命名一致性 * fix: 更新实验配置中的载体名称从6VialCarrier到6StockCarrier * feat(bioyond): 实现物料创建与入库分离逻辑 将物料同步流程拆分为两个独立阶段:transfer阶段只创建物料,add阶段执行入库 简化状态检查接口,仅返回连接状态 * fix(reaction_station): 修正液体进料烧杯体积单位并增强返回结果 将液体进料烧杯的体积单位从μL改为g以匹配实际使用场景 在返回结果中添加merged_workflow和order_params字段,提供更完整的工作流信息 * feat(dispensing_station): 在任务创建返回结果中添加order_params信息 在create_order方法返回结果中增加order_params字段,以便调用方获取完整的任务参数 * fix(dispensing_station): 修改90%物料分配逻辑从分成3份改为直接使用 原逻辑将主称固体平均分成3份作为90%物料,现改为直接使用main_portion * feat(bioyond): 添加任务编码和任务ID的输出,支持批量任务创建后的状态监控 * refactor(registry): 简化设备配置中的任务结果处理逻辑 将多个单独的任务编码和ID字段合并为统一的return_info字段 更新相关描述以反映新的数据结构 * feat(工作站): 添加HTTP报送服务和任务完成状态跟踪 - 在graphio.py中添加API必需字段 - 实现工作站HTTP服务启动和停止逻辑 - 添加任务完成状态跟踪字典和等待方法 - 重写任务完成报送处理方法记录状态 - 支持批量任务完成等待和报告获取 * refactor(dispensing_station): 移除wait_for_order_completion_and_get_report功能 该功能已被wait_for_multiple_orders_and_get_reports替代,简化代码结构 * fix: 更新任务报告API错误 * fix(workstation_http_service): 修复状态查询中device_id获取逻辑 处理状态查询时安全获取device_id,避免因属性不存在导致的异常 * fix(bioyond_studio): 改进物料入库失败时的错误处理和日志记录 在物料入库API调用失败时,添加更详细的错误信息打印 同时修正station.py中对空响应和失败情况的判断逻辑 * refactor(bioyond): 优化瓶架载体的分配逻辑和注释说明 重构瓶架载体的分配逻辑,使用嵌套循环替代硬编码索引分配 添加更详细的坐标映射说明,明确PLR与Bioyond坐标的对应关系 * fix(bioyond_rpc): 修复物料入库成功时无data字段返回空的问题 当API返回成功但无data字段时,返回包含success标识的字典而非空字典 --------- Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com> Co-authored-by: Junhan Chang <changjh@dp.tech>
152 lines
6.3 KiB
Python
152 lines
6.3 KiB
Python
from os import name
|
||
from pylabrobot.resources import Deck, Coordinate, Rotation
|
||
|
||
from unilabos.resources.bioyond.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_1x3x3,
|
||
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_tipbox_storage, # 新增:Tip盒堆栈
|
||
)
|
||
|
||
|
||
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("站内Tip盒堆栈"), # A01~B03, 存放枪头盒
|
||
}
|
||
self.warehouse_locations = {
|
||
"堆栈1左": Coordinate(0.0, 430.0, 0.0), # 左侧位置
|
||
"堆栈1右": Coordinate(2500.0, 430.0, 0.0), # 右侧位置
|
||
"站内试剂存放堆栈": Coordinate(640.0, 480.0, 0.0),
|
||
"移液站内10%分装液体准备仓库": Coordinate(1200.0, 600.0, 0.0),
|
||
"站内Tip盒堆栈": Coordinate(300.0, 150.0, 0.0),
|
||
}
|
||
self.warehouses["站内试剂存放堆栈"].rotation = Rotation(z=90)
|
||
|
||
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(0.0, 450.0, 0.0),
|
||
"试剂堆栈": Coordinate(1850.0, 200.0, 0.0),
|
||
"溶液堆栈": Coordinate(2500.0, 450.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_1x2x2("321窗口"),
|
||
"43窗口": bioyond_warehouse_1x2x2("43窗口"),
|
||
"手动传递窗左": bioyond_warehouse_1x3x3("手动传递窗左"),
|
||
"手动传递窗右": bioyond_warehouse_1x3x3("手动传递窗右"),
|
||
"加样头堆栈左": bioyond_warehouse_10x1x1("加样头堆栈左"),
|
||
"加样头堆栈右": bioyond_warehouse_10x1x1("加样头堆栈右"),
|
||
|
||
"15ml配液堆栈左": bioyond_warehouse_3x3x1("15ml配液堆栈左"),
|
||
"母液加样右": bioyond_warehouse_3x3x1_2("母液加样右"),
|
||
"大瓶母液堆栈左": bioyond_warehouse_5x1x1("大瓶母液堆栈左"),
|
||
"大瓶母液堆栈右": bioyond_warehouse_5x1x1("大瓶母液堆栈右"),
|
||
}
|
||
# 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),
|
||
}
|
||
|
||
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
|
||
|
||
|
||
|
||
|
||
|