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>
325 lines
9.7 KiB
Python
325 lines
9.7 KiB
Python
from pylabrobot.resources import create_homogeneous_resources, Coordinate, ResourceHolder, create_ordered_items_2d
|
||
|
||
from unilabos.resources.itemized_carrier import BottleCarrier
|
||
from unilabos.resources.bioyond.bottles import (
|
||
BIOYOND_PolymerStation_Solid_Stock,
|
||
BIOYOND_PolymerStation_Solid_Vial,
|
||
BIOYOND_PolymerStation_Liquid_Vial,
|
||
BIOYOND_PolymerStation_Solution_Beaker,
|
||
BIOYOND_PolymerStation_Reagent_Bottle,
|
||
BIOYOND_PolymerStation_Flask,
|
||
)
|
||
# 命名约定:试剂瓶-Bottle,烧杯-Beaker,烧瓶-Flask,小瓶-Vial
|
||
|
||
|
||
# ============================================================================
|
||
# 聚合站(PolymerStation)载体定义(统一入口)
|
||
# ============================================================================
|
||
|
||
def BIOYOND_PolymerStation_6StockCarrier(name: str) -> BottleCarrier:
|
||
"""聚合站-6孔样品板 - 2x3布局
|
||
|
||
参数:
|
||
- name: 载架名称前缀
|
||
|
||
说明:
|
||
- 统一站点命名为 PolymerStation,使用 PolymerStation 的 Vial 资源类
|
||
- A行(PLR y=0,对应 Bioyond 位置A01~A03)使用 Liquid_Vial(10% 分装小瓶)
|
||
- B行(PLR y=1,对应 Bioyond 位置B01~B03)使用 Solid_Vial(90% 分装小瓶)
|
||
"""
|
||
|
||
# 载架尺寸 (mm)
|
||
carrier_size_x = 127.8
|
||
carrier_size_y = 85.5
|
||
carrier_size_z = 50.0
|
||
|
||
# 瓶位尺寸
|
||
bottle_diameter = 20.0
|
||
bottle_spacing_x = 42.0 # X方向间距
|
||
bottle_spacing_y = 35.0 # Y方向间距
|
||
|
||
# 计算起始位置 (居中排列)
|
||
start_x = (carrier_size_x - (3 - 1) * bottle_spacing_x - bottle_diameter) / 2
|
||
start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
|
||
|
||
sites = create_ordered_items_2d(
|
||
klass=ResourceHolder,
|
||
num_items_x=3,
|
||
num_items_y=2,
|
||
dx=start_x,
|
||
dy=start_y,
|
||
dz=5.0,
|
||
item_dx=bottle_spacing_x,
|
||
item_dy=bottle_spacing_y,
|
||
|
||
size_x=bottle_diameter,
|
||
size_y=bottle_diameter,
|
||
size_z=carrier_size_z,
|
||
)
|
||
for k, v in sites.items():
|
||
v.name = f"{name}_{v.name}"
|
||
|
||
carrier = BottleCarrier(
|
||
name=name,
|
||
size_x=carrier_size_x,
|
||
size_y=carrier_size_y,
|
||
size_z=carrier_size_z,
|
||
sites=sites,
|
||
model="BIOYOND_PolymerStation_6StockCarrier",
|
||
)
|
||
carrier.num_items_x = 3
|
||
carrier.num_items_y = 2
|
||
carrier.num_items_z = 1
|
||
|
||
# 布局说明:
|
||
# - num_items_x=3, num_items_y=2 表示 3列×2行
|
||
# - create_ordered_items_2d 按先y后x的顺序创建(列优先)
|
||
# - 索引顺序: 0=A1(x=0,y=0), 1=B1(x=0,y=1), 2=A2(x=1,y=0), 3=B2(x=1,y=1), 4=A3(x=2,y=0), 5=B3(x=2,y=1)
|
||
#
|
||
# Bioyond坐标映射: PLR(x,y) → Bioyond(y+1,x+1)
|
||
# - A行(PLR y=0) → Bioyond x=1 → 10%分装小瓶
|
||
# - B行(PLR y=1) → Bioyond x=2 → 90%分装小瓶
|
||
|
||
ordering = ["A1", "B1", "A2", "B2", "A3", "B3"]
|
||
for col in range(3): # 3列
|
||
for row in range(2): # 2行
|
||
idx = col * 2 + row # 计算索引: 列优先顺序
|
||
if row == 0: # A行 (PLR y=0 → Bioyond x=1)
|
||
carrier[idx] = BIOYOND_PolymerStation_Liquid_Vial(f"{ordering[idx]}")
|
||
else: # B行 (PLR y=1 → Bioyond x=2)
|
||
carrier[idx] = BIOYOND_PolymerStation_Solid_Vial(f"{ordering[idx]}")
|
||
return carrier
|
||
|
||
|
||
def BIOYOND_PolymerStation_8StockCarrier(name: str) -> BottleCarrier:
|
||
"""聚合站-8孔样品板 - 2x4布局
|
||
|
||
参数:
|
||
- name: 载架名称前缀
|
||
|
||
说明:
|
||
- 统一站点命名为 PolymerStation,使用 PolymerStation 的 Solid_Stock 资源类
|
||
"""
|
||
|
||
# 载架尺寸 (mm)
|
||
carrier_size_x = 128.0
|
||
carrier_size_y = 85.5
|
||
carrier_size_z = 50.0
|
||
|
||
# 瓶位尺寸
|
||
bottle_diameter = 20.0
|
||
bottle_spacing_x = 30.0 # X方向间距
|
||
bottle_spacing_y = 35.0 # Y方向间距
|
||
|
||
# 计算起始位置 (居中排列)
|
||
start_x = (carrier_size_x - (4 - 1) * bottle_spacing_x - bottle_diameter) / 2
|
||
start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
|
||
|
||
sites = create_ordered_items_2d(
|
||
klass=ResourceHolder,
|
||
num_items_x=4,
|
||
num_items_y=2,
|
||
dx=start_x,
|
||
dy=start_y,
|
||
dz=5.0,
|
||
item_dx=bottle_spacing_x,
|
||
item_dy=bottle_spacing_y,
|
||
|
||
size_x=bottle_diameter,
|
||
size_y=bottle_diameter,
|
||
size_z=carrier_size_z,
|
||
)
|
||
for k, v in sites.items():
|
||
v.name = f"{name}_{v.name}"
|
||
|
||
carrier = BottleCarrier(
|
||
name=name,
|
||
size_x=carrier_size_x,
|
||
size_y=carrier_size_y,
|
||
size_z=carrier_size_z,
|
||
sites=sites,
|
||
model="BIOYOND_PolymerStation_8StockCarrier",
|
||
)
|
||
carrier.num_items_x = 4
|
||
carrier.num_items_y = 2
|
||
carrier.num_items_z = 1
|
||
ordering = ["A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4"]
|
||
for i in range(8):
|
||
carrier[i] = BIOYOND_PolymerStation_Solid_Stock(f"{name}_vial_{ordering[i]}")
|
||
return carrier
|
||
|
||
|
||
def BIOYOND_PolymerStation_1BottleCarrier(name: str) -> BottleCarrier:
|
||
"""聚合站-单试剂瓶载架
|
||
|
||
参数:
|
||
- name: 载架名称前缀
|
||
"""
|
||
|
||
# 载架尺寸 (mm)
|
||
carrier_size_x = 127.8
|
||
carrier_size_y = 85.5
|
||
carrier_size_z = 20.0
|
||
|
||
# 烧杯/试剂瓶占位尺寸(使用圆形占位)
|
||
beaker_diameter = 60.0
|
||
|
||
# 计算中央位置
|
||
center_x = (carrier_size_x - beaker_diameter) / 2
|
||
center_y = (carrier_size_y - beaker_diameter) / 2
|
||
center_z = 5.0
|
||
|
||
carrier = BottleCarrier(
|
||
name=name,
|
||
size_x=carrier_size_x,
|
||
size_y=carrier_size_y,
|
||
size_z=carrier_size_z,
|
||
sites=create_homogeneous_resources(
|
||
klass=ResourceHolder,
|
||
locations=[Coordinate(center_x, center_y, center_z)],
|
||
resource_size_x=beaker_diameter,
|
||
resource_size_y=beaker_diameter,
|
||
name_prefix=name,
|
||
),
|
||
model="BIOYOND_PolymerStation_1BottleCarrier",
|
||
)
|
||
carrier.num_items_x = 1
|
||
carrier.num_items_y = 1
|
||
carrier.num_items_z = 1
|
||
# 统一后缀采用 "flask_1" 命名(可按需调整)
|
||
carrier[0] = BIOYOND_PolymerStation_Reagent_Bottle(f"{name}_flask_1")
|
||
return carrier
|
||
|
||
|
||
def BIOYOND_PolymerStation_1FlaskCarrier(name: str) -> BottleCarrier:
|
||
"""聚合站-单烧杯载架
|
||
|
||
说明:
|
||
- 使用 BIOYOND_PolymerStation_Flask 资源类
|
||
- 载架命名与 model 统一为 PolymerStation
|
||
"""
|
||
|
||
# 载架尺寸 (mm)
|
||
carrier_size_x = 127.8
|
||
carrier_size_y = 85.5
|
||
carrier_size_z = 20.0
|
||
|
||
# 烧杯尺寸
|
||
beaker_diameter = 60.0
|
||
|
||
# 计算中央位置
|
||
center_x = (carrier_size_x - beaker_diameter) / 2
|
||
center_y = (carrier_size_y - beaker_diameter) / 2
|
||
center_z = 5.0
|
||
|
||
carrier = BottleCarrier(
|
||
name=name,
|
||
size_x=carrier_size_x,
|
||
size_y=carrier_size_y,
|
||
size_z=carrier_size_z,
|
||
sites=create_homogeneous_resources(
|
||
klass=ResourceHolder,
|
||
locations=[Coordinate(center_x, center_y, center_z)],
|
||
resource_size_x=beaker_diameter,
|
||
resource_size_y=beaker_diameter,
|
||
name_prefix=name,
|
||
),
|
||
model="BIOYOND_PolymerStation_1FlaskCarrier",
|
||
)
|
||
carrier.num_items_x = 1
|
||
carrier.num_items_y = 1
|
||
carrier.num_items_z = 1
|
||
carrier[0] = BIOYOND_PolymerStation_Flask(f"{name}_flask_1")
|
||
return carrier
|
||
|
||
|
||
# ============================================================================
|
||
# 其他载体定义
|
||
# ============================================================================
|
||
|
||
def BIOYOND_Electrolyte_6VialCarrier(name: str) -> BottleCarrier:
|
||
"""6瓶载架 - 2x3布局"""
|
||
|
||
# 载架尺寸 (mm)
|
||
carrier_size_x = 127.8
|
||
carrier_size_y = 85.5
|
||
carrier_size_z = 50.0
|
||
|
||
# 瓶位尺寸
|
||
bottle_diameter = 30.0
|
||
bottle_spacing_x = 42.0 # X方向间距
|
||
bottle_spacing_y = 35.0 # Y方向间距
|
||
|
||
# 计算起始位置 (居中排列)
|
||
start_x = (carrier_size_x - (3 - 1) * bottle_spacing_x - bottle_diameter) / 2
|
||
start_y = (carrier_size_y - (2 - 1) * bottle_spacing_y - bottle_diameter) / 2
|
||
|
||
sites = create_ordered_items_2d(
|
||
klass=ResourceHolder,
|
||
num_items_x=3,
|
||
num_items_y=2,
|
||
dx=start_x,
|
||
dy=start_y,
|
||
dz=5.0,
|
||
item_dx=bottle_spacing_x,
|
||
item_dy=bottle_spacing_y,
|
||
|
||
size_x=bottle_diameter,
|
||
size_y=bottle_diameter,
|
||
size_z=carrier_size_z,
|
||
)
|
||
for k, v in sites.items():
|
||
v.name = f"{name}_{v.name}"
|
||
|
||
carrier = BottleCarrier(
|
||
name=name,
|
||
size_x=carrier_size_x,
|
||
size_y=carrier_size_y,
|
||
size_z=carrier_size_z,
|
||
sites=sites,
|
||
model="BIOYOND_Electrolyte_6VialCarrier",
|
||
)
|
||
carrier.num_items_x = 3
|
||
carrier.num_items_y = 2
|
||
carrier.num_items_z = 1
|
||
for i in range(6):
|
||
carrier[i] = BIOYOND_PolymerStation_Solid_Vial(f"{name}_vial_{i+1}")
|
||
return carrier
|
||
|
||
|
||
def BIOYOND_Electrolyte_1BottleCarrier(name: str) -> BottleCarrier:
|
||
"""1瓶载架 - 单个中央位置"""
|
||
|
||
# 载架尺寸 (mm)
|
||
carrier_size_x = 127.8
|
||
carrier_size_y = 85.5
|
||
carrier_size_z = 100.0
|
||
|
||
# 烧杯尺寸
|
||
beaker_diameter = 80.0
|
||
|
||
# 计算中央位置
|
||
center_x = (carrier_size_x - beaker_diameter) / 2
|
||
center_y = (carrier_size_y - beaker_diameter) / 2
|
||
center_z = 5.0
|
||
|
||
carrier = BottleCarrier(
|
||
name=name,
|
||
size_x=carrier_size_x,
|
||
size_y=carrier_size_y,
|
||
size_z=carrier_size_z,
|
||
sites=create_homogeneous_resources(
|
||
klass=ResourceHolder,
|
||
locations=[Coordinate(center_x, center_y, center_z)],
|
||
resource_size_x=beaker_diameter,
|
||
resource_size_y=beaker_diameter,
|
||
name_prefix=name,
|
||
),
|
||
model="BIOYOND_Electrolyte_1BottleCarrier",
|
||
)
|
||
carrier.num_items_x = 1
|
||
carrier.num_items_y = 1
|
||
carrier.num_items_z = 1
|
||
carrier[0] = BIOYOND_PolymerStation_Solution_Beaker(f"{name}_beaker_1")
|
||
return carrier
|