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>
196 lines
4.9 KiB
Python
196 lines
4.9 KiB
Python
from unilabos.resources.itemized_carrier import Bottle
|
||
|
||
|
||
def BIOYOND_PolymerStation_Solid_Stock(
|
||
name: str,
|
||
diameter: float = 20.0,
|
||
height: float = 100.0,
|
||
max_volume: float = 30000.0, # 30mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建粉末瓶"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Solid_Stock",
|
||
)
|
||
|
||
|
||
def BIOYOND_PolymerStation_Solid_Vial(
|
||
name: str,
|
||
diameter: float = 25.0,
|
||
height: float = 60.0,
|
||
max_volume: float = 30000.0, # 30mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建粉末瓶"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Solid_Vial",
|
||
)
|
||
|
||
|
||
def BIOYOND_PolymerStation_Liquid_Vial(
|
||
name: str,
|
||
diameter: float = 25.0,
|
||
height: float = 60.0,
|
||
max_volume: float = 30000.0, # 30mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建滴定液瓶"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Liquid_Vial",
|
||
)
|
||
|
||
|
||
def BIOYOND_PolymerStation_Solution_Beaker(
|
||
name: str,
|
||
diameter: float = 60.0,
|
||
height: float = 70.0,
|
||
max_volume: float = 200000.0, # 200mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建溶液烧杯"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Solution_Beaker",
|
||
)
|
||
|
||
|
||
def BIOYOND_PolymerStation_Reagent_Bottle(
|
||
name: str,
|
||
diameter: float = 70.0,
|
||
height: float = 120.0,
|
||
max_volume: float = 500000.0, # 500mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建试剂瓶"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Reagent_Bottle",
|
||
)
|
||
|
||
|
||
def BIOYOND_PolymerStation_Reactor(
|
||
name: str,
|
||
diameter: float = 30.0,
|
||
height: float = 80.0,
|
||
max_volume: float = 50000.0, # 50mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建反应器"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Reactor",
|
||
)
|
||
|
||
|
||
def BIOYOND_PolymerStation_TipBox(
|
||
name: str,
|
||
size_x: float = 127.76, # 枪头盒宽度
|
||
size_y: float = 85.48, # 枪头盒长度
|
||
size_z: float = 100.0, # 枪头盒高度
|
||
barcode: str = None,
|
||
):
|
||
"""创建4×6枪头盒 (24个枪头)
|
||
|
||
Args:
|
||
name: 枪头盒名称
|
||
size_x: 枪头盒宽度 (mm)
|
||
size_y: 枪头盒长度 (mm)
|
||
size_z: 枪头盒高度 (mm)
|
||
barcode: 条形码
|
||
|
||
Returns:
|
||
TipBoxCarrier: 包含24个枪头孔位的枪头盒
|
||
"""
|
||
from pylabrobot.resources import Container, Coordinate
|
||
|
||
# 创建枪头盒容器
|
||
tip_box = Container(
|
||
name=name,
|
||
size_x=size_x,
|
||
size_y=size_y,
|
||
size_z=size_z,
|
||
category="tip_rack",
|
||
model="BIOYOND_PolymerStation_TipBox_4x6",
|
||
)
|
||
|
||
# 设置自定义属性
|
||
tip_box.barcode = barcode
|
||
tip_box.tip_count = 24 # 4行×6列
|
||
tip_box.num_items_x = 6 # 6列
|
||
tip_box.num_items_y = 4 # 4行
|
||
|
||
# 创建24个枪头孔位 (4行×6列)
|
||
# 假设孔位间距为 9mm
|
||
tip_spacing_x = 9.0 # 列间距
|
||
tip_spacing_y = 9.0 # 行间距
|
||
start_x = 14.38 # 第一个孔位的x偏移
|
||
start_y = 11.24 # 第一个孔位的y偏移
|
||
|
||
for row in range(4): # A, B, C, D
|
||
for col in range(6): # 1-6
|
||
spot_name = f"{chr(65 + row)}{col + 1}" # A1, A2, ..., D6
|
||
x = start_x + col * tip_spacing_x
|
||
y = start_y + row * tip_spacing_y
|
||
|
||
# 创建枪头孔位容器
|
||
tip_spot = Container(
|
||
name=spot_name,
|
||
size_x=8.0, # 单个枪头孔位大小
|
||
size_y=8.0,
|
||
size_z=size_z - 10.0, # 略低于盒子高度
|
||
category="tip_spot",
|
||
)
|
||
|
||
# 添加到枪头盒
|
||
tip_box.assign_child_resource(
|
||
tip_spot,
|
||
location=Coordinate(x=x, y=y, z=0)
|
||
)
|
||
|
||
return tip_box
|
||
|
||
|
||
def BIOYOND_PolymerStation_Flask(
|
||
name: str,
|
||
diameter: float = 60.0,
|
||
height: float = 70.0,
|
||
max_volume: float = 200000.0, # 200mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""聚合站-烧杯(统一 Flask 资源到 PolymerStation)"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Flask",
|
||
)
|