mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2026-02-04 05:15:10 +00:00
* 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>
213 lines
5.3 KiB
Python
213 lines
5.3 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",
|
||
)
|
||
|
||
def BIOYOND_PolymerStation_Measurement_Vial(
|
||
name: str,
|
||
diameter: float = 25.0,
|
||
height: float = 60.0,
|
||
max_volume: float = 20000.0, # 20mL
|
||
barcode: str = None,
|
||
) -> Bottle:
|
||
"""创建测量小瓶"""
|
||
return Bottle(
|
||
name=name,
|
||
diameter=diameter,
|
||
height=height,
|
||
max_volume=max_volume,
|
||
barcode=barcode,
|
||
model="BIOYOND_PolymerStation_Measurement_Vial",
|
||
)
|