mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-15 13:44:39 +00:00
a625a86e3e
* 更新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>
286 lines
7.1 KiB
Python
286 lines
7.1 KiB
Python
from unilabos.resources.warehouse import WareHouse, warehouse_factory
|
||
|
||
|
||
def bioyond_warehouse_1x4x4(name: str) -> WareHouse:
|
||
"""创建BioYond 4x4x1仓库 (左侧堆栈: A01～D04)
|
||
|
||
使用行优先排序，前端展示为:
|
||
A01 | A02 | A03 | A04
|
||
B01 | B02 | B03 | B04
|
||
C01 | C02 | C03 | C04
|
||
D01 | D02 | D03 | D04
|
||
"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=4, # 4列
|
||
num_items_y=4, # 4行
|
||
num_items_z=1,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
col_offset=0, # 从01开始: A01, A02, A03, A04
|
||
layout="row-major", # ⭐ 改为行优先排序
|
||
)
|
||
|
||
|
||
def bioyond_warehouse_1x4x4_right(name: str) -> WareHouse:
|
||
"""创建BioYond 4x4x1仓库 (右侧堆栈: A05～D08)"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=4,
|
||
num_items_y=4,
|
||
num_items_z=1,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=147.0,
|
||
item_dy=106.0,
|
||
item_dz=130.0,
|
||
category="warehouse",
|
||
col_offset=4, # 从05开始: A05, A06, A07, A08
|
||
layout="row-major", # ⭐ 改为行优先排序
|
||
)
|
||
|
||
|
||
|
||
def bioyond_warehouse_1x4x2(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x2仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=1,
|
||
num_items_y=4,
|
||
num_items_z=2,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
removed_positions=None
|
||
)
|
||
|
||
def bioyond_warehouse_reagent_stack(name: str) -> WareHouse:
|
||
"""创建BioYond 试剂堆栈 2x4x1 (2行×4列: A01-A04, B01-B04)
|
||
|
||
使用行优先排序，前端展示为:
|
||
A01 | A02 | A03 | A04
|
||
B01 | B02 | B03 | B04
|
||
"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=4, # 4列 (01-04)
|
||
num_items_y=2, # 2行 (A-B)
|
||
num_items_z=1, # 1层
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=147.0,
|
||
item_dy=106.0,
|
||
item_dz=130.0,
|
||
category="warehouse",
|
||
col_offset=0, # 从01开始
|
||
layout="row-major", # ⭐ 使用行优先排序: A01,A02,A03,A04, B01,B02,B03,B04
|
||
)
|
||
|
||
# 定义bioyond的堆栈
|
||
def bioyond_warehouse_1x2x2(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=1,
|
||
num_items_y=2,
|
||
num_items_z=2,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
def bioyond_warehouse_10x1x1(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=10,
|
||
num_items_y=1,
|
||
num_items_z=1,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
def bioyond_warehouse_1x3x3(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=1,
|
||
num_items_y=3,
|
||
num_items_z=3,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
def bioyond_warehouse_2x1x3(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=2,
|
||
num_items_y=1,
|
||
num_items_z=3,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
|
||
def bioyond_warehouse_3x3x1(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=3,
|
||
num_items_y=3,
|
||
num_items_z=1,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
def bioyond_warehouse_5x1x1(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=5,
|
||
num_items_y=1,
|
||
num_items_z=1,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
def bioyond_warehouse_3x3x1_2(name: str) -> WareHouse:
|
||
"""创建BioYond 4x1x4仓库"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=3,
|
||
num_items_y=3,
|
||
num_items_z=1,
|
||
dx=12.0,
|
||
dy=12.0,
|
||
dz=12.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
|
||
def bioyond_warehouse_liquid_and_lid_handling(name: str) -> WareHouse:
|
||
"""创建BioYond开关盖加液模块台面"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=2,
|
||
num_items_y=5,
|
||
num_items_z=1,
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
removed_positions=None
|
||
)
|
||
|
||
|
||
def bioyond_warehouse_1x8x4(name: str) -> WareHouse:
|
||
"""创建BioYond 8x4x1反应站堆栈（A01～D08）"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=8, # 8列（01-08）
|
||
num_items_y=4, # 4行（A-D）
|
||
num_items_z=1, # 1层
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=147.0,
|
||
item_dy=106.0,
|
||
item_dz=130.0,
|
||
category="warehouse",
|
||
)
|
||
|
||
|
||
def bioyond_warehouse_reagent_storage(name: str) -> WareHouse:
|
||
"""创建BioYond站内试剂存放堆栈（A01～A02, 1行×2列）"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=2, # 2列（01-02）
|
||
num_items_y=1, # 1行（A）
|
||
num_items_z=1, # 1层
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
)
|
||
|
||
|
||
def bioyond_warehouse_liquid_preparation(name: str) -> WareHouse:
|
||
"""创建BioYond移液站内10%分装液体准备仓库（A01～B04）"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=4, # 4列（01-04）
|
||
num_items_y=2, # 2行（A-B）
|
||
num_items_z=1, # 1层
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
col_offset=0,
|
||
layout="row-major",
|
||
)
|
||
|
||
|
||
def bioyond_warehouse_tipbox_storage(name: str) -> WareHouse:
|
||
"""创建BioYond站内Tip盒堆栈（A01～B03），用于存放枪头盒"""
|
||
return warehouse_factory(
|
||
name=name,
|
||
num_items_x=3, # 3列（01-03）
|
||
num_items_y=2, # 2行（A-B）
|
||
num_items_z=1, # 1层
|
||
dx=10.0,
|
||
dy=10.0,
|
||
dz=10.0,
|
||
item_dx=137.0,
|
||
item_dy=96.0,
|
||
item_dz=120.0,
|
||
category="warehouse",
|
||
col_offset=0,
|
||
layout="row-major",
|
||
)
|