mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-14 13:14:39 +00:00
* Cleanup registry to be easy-understanding (#76) * delete deprecated mock devices * rename categories * combine chromatographic devices * rename rviz simulation nodes * organic virtual devices * parse vessel_id * run registry completion before merge --------- Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com> * fix: workstation handlers and vessel_id parsing * fix: working dir error when input config path feat: report publish topic when error * modify default discovery_interval to 15s * feat: add trace log level * feat: 添加ChinWe设备控制类,支持串口通信和电机控制功能 (#79) * fix: drop_tips not using auto resource select * fix: discard_tips error * fix: discard_tips * fix: prcxi_res * add: prcxi res fix: startup slow * feat: workstation example * fix pumps and liquid_handler handle * feat: 优化protocol node节点运行日志 * fix all protocol_compilers and remove deprecated devices * feat: 新增use_remote_resource参数 * fix and remove redundant info * bugfixes on organic protocols * fix filter protocol * fix protocol node * 临时兼容错误的driver写法 * fix: prcxi import error * use call_async in all service to avoid deadlock * fix: figure_resource * Update recipe.yaml * add workstation template and battery example * feat: add sk & ak * update workstation base * Create workstation_architecture.md * refactor: workstation_base 重构为仅含业务逻辑,通信和子设备管理交给 ProtocolNode * refactor: ProtocolNode→WorkstationNode * Add:msgs.action (#83) * update: Workstation dev 将版本号从 0.10.3 更新为 0.10.4 (#84) * Add:msgs.action * update: 将版本号从 0.10.3 更新为 0.10.4 * simplify resource system * uncompleted refactor * example for use WorkstationBase * feat: websocket * feat: websocket test * feat: workstation example * feat: action status * fix: station自己的方法注册错误 * fix: 还原protocol node处理方法 * fix: build * fix: missing job_id key * ws test version 1 * ws test version 2 * ws protocol * 增加物料关系上传日志 * 增加物料关系上传日志 * 修正物料关系上传 * 修复工站的tracker实例追踪失效问题 * 增加handle检测,增加material edge关系上传 * 修复event loop错误 * 修复edge上报错误 * 修复async错误 * 更新schema的title字段 * 主机节点信息等支持自动刷新 * 注册表编辑器 * 修复status密集发送时,消息出错 * 增加addr参数 * fix: addr param * fix: addr param * 取消labid 和 强制config输入 * Add action definitions for LiquidHandlerSetGroup and LiquidHandlerTransferGroup - Created LiquidHandlerSetGroup.action with fields for group name, wells, and volumes. - Created LiquidHandlerTransferGroup.action with fields for source and target group names and unit volume. - Both actions include response fields for return information and success status. * Add LiquidHandlerSetGroup and LiquidHandlerTransferGroup actions to CMakeLists * Add set_group and transfer_group methods to PRCXI9300Handler and update liquid_handler.yaml * result_info改为字典类型 * 新增uat的地址替换 * runze multiple pump support (cherry picked from commit49354fcf39) * remove runze multiple software obtainer (cherry picked from commit8bcc92a394) * support multiple backbone (cherry picked from commit4771ff2347) * Update runze pump format * Correct runze multiple backbone * Update runze_multiple_backbone * Correct runze pump multiple receive method. * Correct runze pump multiple receive method. * 对于PRCXI9320的transfer_group,一对多和多对多 * 移除MQTT,更新launch文档,提供注册表示例文件,更新到0.10.5 * fix import error * fix dupe upload registry * refactor ws client * add server timeout * Fix: run-column with correct vessel id (#86) * fix run_column * Update run_column_protocol.py (cherry picked from commite5aa4d940a) * resource_update use resource_add * 新增版位推荐功能 * 重新规定了版位推荐的入参 * update registry with nested obj * fix protocol node log_message, added create_resource return value * fix protocol node log_message, added create_resource return value * try fix add protocol * fix resource_add * 修复移液站错误的aspirate注册表 * Feature/xprbalance-zhida (#80) * feat(devices): add Zhida GC/MS pretreatment automation workstation * feat(devices): add mettler_toledo xpr balance * balance * 重新补全zhida注册表 * PRCXI9320 json * PRCXI9320 json * PRCXI9320 json * fix resource download * remove class for resource * bump version to 0.10.6 * 更新所有注册表 * 修复protocolnode的兼容性 * 修复protocolnode的兼容性 * Update install md * Add Defaultlayout * 更新物料接口 * fix dict to tree/nested-dict converter * coin_cell_station draft * refactor: rename "station_resource" to "deck" * add standardized BIOYOND resources: bottle_carrier, bottle * refactor and add BIOYOND resources tests * add BIOYOND deck assignment and pass all tests * fix: update resource with correct structure; remove deprecated liquid_handler set_group action * feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 (#92) * feat: 新威电池测试系统驱动与注册文件 * feat: bring neware driver & battery.json into workstation_dev_YB2 * add bioyond studio draft * bioyond station with communication init and resource sync * fix bioyond station and registry * fix: update resource with correct structure; remove deprecated liquid_handler set_group action * frontend_docs * create/update resources with POST/PUT for big amount/ small amount data * create/update resources with POST/PUT for big amount/ small amount data * refactor: add itemized_carrier instead of carrier consists of ResourceHolder * create warehouse by factory func * update bioyond launch json * add child_size for itemized_carrier * fix bioyond resource io * Workstation templates: Resources and its CRUD, and workstation tasks (#95) * coin_cell_station draft * refactor: rename "station_resource" to "deck" * add standardized BIOYOND resources: bottle_carrier, bottle * refactor and add BIOYOND resources tests * add BIOYOND deck assignment and pass all tests * fix: update resource with correct structure; remove deprecated liquid_handler set_group action * feat: 将新威电池测试系统驱动与配置文件并入 workstation_dev_YB2 (#92) * feat: 新威电池测试系统驱动与注册文件 * feat: bring neware driver & battery.json into workstation_dev_YB2 * add bioyond studio draft * bioyond station with communication init and resource sync * fix bioyond station and registry * create/update resources with POST/PUT for big amount/ small amount data * refactor: add itemized_carrier instead of carrier consists of ResourceHolder * create warehouse by factory func * update bioyond launch json * add child_size for itemized_carrier * fix bioyond resource io --------- Co-authored-by: h840473807 <47357934+h840473807@users.noreply.github.com> Co-authored-by: Xie Qiming <97236197+Andy6M@users.noreply.github.com> * 更新物料接口 * Workstation dev yb2 (#100) * Refactor and extend reaction station action messages * Refactor dispensing station tasks to enhance parameter clarity and add batch processing capabilities - Updated `create_90_10_vial_feeding_task` to include detailed parameters for 90%/10% vial feeding, improving clarity and usability. - Introduced `create_batch_90_10_vial_feeding_task` for batch processing of 90%/10% vial feeding tasks with JSON formatted input. - Added `create_batch_diamine_solution_task` for batch preparation of diamine solution, also utilizing JSON formatted input. - Refined `create_diamine_solution_task` to include additional parameters for better task configuration. - Enhanced schema descriptions and default values for improved user guidance. * 修复to_plr_resources * add update remove * 支持选择器注册表自动生成 支持转运物料 * 修复资源添加 * 修复transfer_resource_to_another生成 * 更新transfer_resource_to_another参数,支持spot入参 * 新增test_resource动作 * fix host_node error * fix host_node test_resource error * fix host_node test_resource error * 过滤本地动作 * 移动内部action以兼容host node * 修复同步任务报错不显示的bug * feat: 允许返回非本节点物料,后面可以通过decoration进行区分,就不进行warning了 * update todo * modify bioyond/plr converter, bioyond resource registry, and tests * pass the tests * update todo * add conda-pack-build.yml * add auto install script for conda-pack-build.yml (cherry picked from commit172599adcf) * update conda-pack-build.yml * update conda-pack-build.yml * update conda-pack-build.yml * update conda-pack-build.yml * update conda-pack-build.yml * Add version in __init__.py Update conda-pack-build.yml Add create_zip_archive.py * Update conda-pack-build.yml * Update conda-pack-build.yml (with mamba) * Update conda-pack-build.yml * Fix FileNotFoundError * Try fix 'charmap' codec can't encode characters in position 16-23: character maps to <undefined> * Fix unilabos msgs search error * Fix environment_check.py * Update recipe.yaml * Update registry. Update uuid loop figure method. Update install docs. * Fix nested conda pack * Fix one-key installation path error * Bump version to 0.10.7 * Workshop bj (#99) * Add LaiYu Liquid device integration and tests Introduce LaiYu Liquid device implementation, including backend, controllers, drivers, configuration, and resource files. Add hardware connection, tip pickup, and simplified test scripts, as well as experiment and registry configuration for LaiYu Liquid. Documentation and .gitignore for the device are also included. * feat(LaiYu_Liquid): 重构设备模块结构并添加硬件文档 refactor: 重新组织LaiYu_Liquid模块目录结构 docs: 添加SOPA移液器和步进电机控制指令文档 fix: 修正设备配置中的最大体积默认值 test: 新增工作台配置测试用例 chore: 删除过时的测试脚本和配置文件 * add * 重构: 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py 并更新所有导入引用 - 使用 git mv 将 LaiYu_Liquid.py 重命名为 laiyu_liquid_main.py - 更新所有相关文件中的导入引用 - 保持代码功能不变,仅改善命名一致性 - 测试确认所有导入正常工作 * 修复: 在 core/__init__.py 中添加 LaiYuLiquidBackend 导出 - 添加 LaiYuLiquidBackend 到导入列表 - 添加 LaiYuLiquidBackend 到 __all__ 导出列表 - 确保所有主要类都可以正确导入 * 修复大小写文件夹名字 * 电池装配工站二次开发教程(带目录)上传至dev (#94) * 电池装配工站二次开发教程 * Update intro.md * 物料教程 * 更新物料教程,json格式注释 * Update prcxi driver & fix transfer_liquid mix_times (#90) * Update prcxi driver & fix transfer_liquid mix_times * fix: correct mix_times type * Update liquid_handler registry * test: prcxi.py * Update registry from pr * fix ony-key script not exist * clean files --------- Co-authored-by: Junhan Chang <changjh@dp.tech> Co-authored-by: ZiWei <131428629+ZiWei09@users.noreply.github.com> Co-authored-by: Guangxin Zhang <guangxin.zhang.bio@gmail.com> Co-authored-by: Xie Qiming <97236197+Andy6M@users.noreply.github.com> Co-authored-by: h840473807 <47357934+h840473807@users.noreply.github.com> Co-authored-by: LccLink <1951855008@qq.com> Co-authored-by: lixinyu1011 <61094742+lixinyu1011@users.noreply.github.com> Co-authored-by: shiyubo0410 <shiyubo@dp.tech>
423 lines
17 KiB
Python
423 lines
17 KiB
Python
from functools import partial
|
||
|
||
import networkx as nx
|
||
import re
|
||
import logging
|
||
from typing import List, Dict, Any, Union
|
||
|
||
from .utils.unit_parser import parse_volume_input, parse_mass_input, parse_time_input
|
||
from .utils.vessel_parser import get_vessel, find_solid_dispenser, find_connected_stirrer, find_reagent_vessel
|
||
from .utils.logger_util import action_log
|
||
from .pump_protocol import generate_pump_protocol_with_rinsing
|
||
|
||
logger = logging.getLogger(__name__)
|
||
|
||
def debug_print(message):
|
||
"""调试输出"""
|
||
logger.info(f"[ADD] {message}")
|
||
|
||
|
||
# 🆕 创建进度日志动作
|
||
create_action_log = partial(action_log, prefix="[ADD]")
|
||
|
||
def generate_add_protocol(
|
||
G: nx.DiGraph,
|
||
vessel: dict, # 🔧 修改:现在接收字典类型的 vessel
|
||
reagent: str,
|
||
# 🔧 修复:所有参数都用 Union 类型,支持字符串和数值
|
||
volume: Union[str, float] = 0.0,
|
||
mass: Union[str, float] = 0.0,
|
||
amount: str = "",
|
||
time: Union[str, float] = 0.0,
|
||
stir: bool = False,
|
||
stir_speed: float = 300.0,
|
||
viscous: bool = False,
|
||
purpose: str = "添加试剂",
|
||
# XDL扩展参数
|
||
mol: str = "",
|
||
event: str = "",
|
||
rate_spec: str = "",
|
||
equiv: str = "",
|
||
ratio: str = "",
|
||
**kwargs
|
||
) -> List[Dict[str, Any]]:
|
||
"""
|
||
生成添加试剂协议 - 修复版
|
||
|
||
支持所有XDL参数和单位:
|
||
- vessel: Resource类型字典,包含id字段
|
||
- volume: "2.7 mL", "2.67 mL", "?" 或数值
|
||
- mass: "19.3 g", "4.5 g" 或数值
|
||
- time: "1 h", "20 min" 或数值(秒)
|
||
- mol: "0.28 mol", "16.2 mmol", "25.2 mmol"
|
||
- rate_spec: "portionwise", "dropwise"
|
||
- event: "A", "B"
|
||
- equiv: "1.1"
|
||
- ratio: "?", "1:1"
|
||
"""
|
||
|
||
# 🔧 核心修改:从字典中提取容器ID
|
||
vessel_id, vessel_data = get_vessel(vessel)
|
||
|
||
# 🔧 修改:更新容器的液体体积(假设有 liquid_volume 字段)
|
||
if "data" in vessel and "liquid_volume" in vessel["data"]:
|
||
if isinstance(vessel["data"]["liquid_volume"], list) and len(vessel["data"]["liquid_volume"]) > 0:
|
||
vessel["data"]["liquid_volume"][0] -= parse_volume_input(volume)
|
||
|
||
debug_print("=" * 60)
|
||
debug_print("🚀 开始生成添加试剂协议")
|
||
debug_print(f"📋 原始参数:")
|
||
debug_print(f" 🥼 vessel: {vessel} (ID: {vessel_id})")
|
||
debug_print(f" 🧪 reagent: '{reagent}'")
|
||
debug_print(f" 📏 volume: {volume} (类型: {type(volume)})")
|
||
debug_print(f" ⚖️ mass: {mass} (类型: {type(mass)})")
|
||
debug_print(f" ⏱️ time: {time} (类型: {type(time)})")
|
||
debug_print(f" 🧬 mol: '{mol}'")
|
||
debug_print(f" 🎯 event: '{event}'")
|
||
debug_print(f" ⚡ rate_spec: '{rate_spec}'")
|
||
debug_print(f" 🌪️ stir: {stir}")
|
||
debug_print(f" 🔄 stir_speed: {stir_speed} rpm")
|
||
debug_print("=" * 60)
|
||
|
||
action_sequence = []
|
||
|
||
# === 参数验证 ===
|
||
debug_print("🔍 步骤1: 参数验证...")
|
||
action_sequence.append(create_action_log(f"开始添加试剂 '{reagent}' 到容器 '{vessel_id}'", "🎬"))
|
||
|
||
if not vessel or not vessel_id:
|
||
debug_print("❌ vessel 参数不能为空")
|
||
raise ValueError("vessel 参数不能为空")
|
||
if not reagent:
|
||
debug_print("❌ reagent 参数不能为空")
|
||
raise ValueError("reagent 参数不能为空")
|
||
|
||
if vessel_id not in G.nodes():
|
||
debug_print(f"❌ 容器 '{vessel_id}' 不存在于系统中")
|
||
raise ValueError(f"容器 '{vessel_id}' 不存在于系统中")
|
||
|
||
debug_print("✅ 基本参数验证通过")
|
||
|
||
# === 🔧 关键修复:参数解析 ===
|
||
debug_print("🔍 步骤2: 参数解析...")
|
||
action_sequence.append(create_action_log("正在解析添加参数...", "🔍"))
|
||
|
||
# 解析各种参数为数值
|
||
final_volume = parse_volume_input(volume)
|
||
final_mass = parse_mass_input(mass)
|
||
final_time = parse_time_input(time)
|
||
|
||
debug_print(f"📊 解析结果:")
|
||
debug_print(f" 体积: {final_volume}mL, 质量: {final_mass}g, 时间: {final_time}s, 摩尔: '{mol}', 事件: '{event}', 速率: '{rate_spec}'")
|
||
|
||
# === 判断添加类型 ===
|
||
debug_print("🔍 步骤3: 判断添加类型...")
|
||
|
||
# 🔧 修复:现在使用解析后的数值进行比较
|
||
is_solid = (final_mass > 0 or (mol and mol.strip() != ""))
|
||
is_liquid = (final_volume > 0)
|
||
|
||
if not is_solid and not is_liquid:
|
||
# 默认为液体,10mL
|
||
is_liquid = True
|
||
final_volume = 10.0
|
||
debug_print("⚠️ 未指定体积或质量,默认为10mL液体")
|
||
|
||
add_type = "固体" if is_solid else "液体"
|
||
add_emoji = "🧂" if is_solid else "💧"
|
||
debug_print(f"📋 添加类型: {add_type} {add_emoji}")
|
||
|
||
action_sequence.append(create_action_log(f"确定添加类型: {add_type} {add_emoji}", "📋"))
|
||
|
||
# === 执行添加流程 ===
|
||
debug_print("🔍 步骤4: 执行添加流程...")
|
||
|
||
try:
|
||
if is_solid:
|
||
# === 固体添加路径 ===
|
||
debug_print(f"🧂 使用固体添加路径")
|
||
action_sequence.append(create_action_log("开始固体试剂添加流程", "🧂"))
|
||
|
||
solid_dispenser = find_solid_dispenser(G)
|
||
if solid_dispenser:
|
||
action_sequence.append(create_action_log(f"找到固体加样器: {solid_dispenser}", "🥄"))
|
||
|
||
# 启动搅拌
|
||
if stir:
|
||
debug_print("🌪️ 准备启动搅拌...")
|
||
action_sequence.append(create_action_log("准备启动搅拌器", "🌪️"))
|
||
|
||
stirrer_id = find_connected_stirrer(G, vessel_id) # 🔧 使用 vessel_id
|
||
if stirrer_id:
|
||
action_sequence.append(create_action_log(f"启动搅拌器 {stirrer_id} (速度: {stir_speed} rpm)", "🔄"))
|
||
|
||
action_sequence.append({
|
||
"device_id": stirrer_id,
|
||
"action_name": "start_stir",
|
||
"action_kwargs": {
|
||
"vessel": {"id": vessel_id}, # 🔧 使用 vessel_id
|
||
"stir_speed": stir_speed,
|
||
"purpose": f"准备添加固体 {reagent}"
|
||
}
|
||
})
|
||
# 等待搅拌稳定
|
||
action_sequence.append(create_action_log("等待搅拌稳定...", "⏳"))
|
||
action_sequence.append({
|
||
"action_name": "wait",
|
||
"action_kwargs": {"time": 3}
|
||
})
|
||
|
||
# 固体加样
|
||
add_kwargs = {
|
||
"vessel": {"id": vessel_id}, # 🔧 使用 vessel_id
|
||
"reagent": reagent,
|
||
"purpose": purpose,
|
||
"event": event,
|
||
"rate_spec": rate_spec
|
||
}
|
||
|
||
if final_mass > 0:
|
||
add_kwargs["mass"] = str(final_mass)
|
||
action_sequence.append(create_action_log(f"准备添加固体: {final_mass}g", "⚖️"))
|
||
if mol and mol.strip():
|
||
add_kwargs["mol"] = mol
|
||
action_sequence.append(create_action_log(f"按摩尔数添加: {mol}", "🧬"))
|
||
if equiv and equiv.strip():
|
||
add_kwargs["equiv"] = equiv
|
||
action_sequence.append(create_action_log(f"当量: {equiv}", "🔢"))
|
||
|
||
action_sequence.append(create_action_log("开始固体加样操作", "🥄"))
|
||
action_sequence.append({
|
||
"device_id": solid_dispenser,
|
||
"action_name": "add_solid",
|
||
"action_kwargs": add_kwargs
|
||
})
|
||
|
||
action_sequence.append(create_action_log("固体加样完成", "✅"))
|
||
|
||
# 添加后等待
|
||
if final_time > 0:
|
||
wait_minutes = final_time / 60
|
||
action_sequence.append(create_action_log(f"等待反应进行 ({wait_minutes:.1f}分钟)", "⏰"))
|
||
action_sequence.append({
|
||
"action_name": "wait",
|
||
"action_kwargs": {"time": final_time}
|
||
})
|
||
|
||
debug_print(f"✅ 固体添加完成")
|
||
else:
|
||
debug_print("❌ 未找到固体加样器,跳过固体添加")
|
||
action_sequence.append(create_action_log("未找到固体加样器,无法添加固体", "❌"))
|
||
|
||
else:
|
||
# === 液体添加路径 ===
|
||
debug_print(f"💧 使用液体添加路径")
|
||
action_sequence.append(create_action_log("开始液体试剂添加流程", "💧"))
|
||
|
||
# 查找试剂容器
|
||
action_sequence.append(create_action_log("正在查找试剂容器...", "🔍"))
|
||
reagent_vessel = find_reagent_vessel(G, reagent)
|
||
action_sequence.append(create_action_log(f"找到试剂容器: {reagent_vessel}", "🧪"))
|
||
|
||
# 启动搅拌
|
||
if stir:
|
||
debug_print("🌪️ 准备启动搅拌...")
|
||
action_sequence.append(create_action_log("准备启动搅拌器", "🌪️"))
|
||
|
||
stirrer_id = find_connected_stirrer(G, vessel_id) # 🔧 使用 vessel_id
|
||
if stirrer_id:
|
||
action_sequence.append(create_action_log(f"启动搅拌器 {stirrer_id} (速度: {stir_speed} rpm)", "🔄"))
|
||
|
||
action_sequence.append({
|
||
"device_id": stirrer_id,
|
||
"action_name": "start_stir",
|
||
"action_kwargs": {
|
||
"vessel": {"id": vessel_id}, # 🔧 使用 vessel_id
|
||
"stir_speed": stir_speed,
|
||
"purpose": f"准备添加液体 {reagent}"
|
||
}
|
||
})
|
||
# 等待搅拌稳定
|
||
action_sequence.append(create_action_log("等待搅拌稳定...", "⏳"))
|
||
action_sequence.append({
|
||
"action_name": "wait",
|
||
"action_kwargs": {"time": 5}
|
||
})
|
||
|
||
# 计算流速
|
||
if final_time > 0:
|
||
flowrate = final_volume / final_time * 60 # mL/min
|
||
transfer_flowrate = flowrate
|
||
debug_print(f"⚡ 根据时间计算流速: {flowrate:.2f} mL/min")
|
||
else:
|
||
if rate_spec == "dropwise":
|
||
flowrate = 0.5 # 滴加,很慢
|
||
transfer_flowrate = 0.2
|
||
debug_print(f"💧 滴加模式,流速: {flowrate} mL/min")
|
||
elif viscous:
|
||
flowrate = 1.0 # 粘性液体
|
||
transfer_flowrate = 0.3
|
||
debug_print(f"🍯 粘性液体,流速: {flowrate} mL/min")
|
||
else:
|
||
flowrate = 2.5 # 正常流速
|
||
transfer_flowrate = 0.5
|
||
debug_print(f"⚡ 正常流速: {flowrate} mL/min")
|
||
|
||
action_sequence.append(create_action_log(f"设置流速: {flowrate:.2f} mL/min", "⚡"))
|
||
action_sequence.append(create_action_log(f"开始转移 {final_volume}mL 液体", "🚰"))
|
||
|
||
# 调用pump protocol
|
||
pump_actions = generate_pump_protocol_with_rinsing(
|
||
G=G,
|
||
from_vessel=reagent_vessel,
|
||
to_vessel=vessel_id, # 🔧 使用 vessel_id
|
||
volume=final_volume,
|
||
amount=amount,
|
||
time=final_time,
|
||
viscous=viscous,
|
||
rinsing_solvent="",
|
||
rinsing_volume=0.0,
|
||
rinsing_repeats=0,
|
||
solid=False,
|
||
flowrate=flowrate,
|
||
transfer_flowrate=transfer_flowrate,
|
||
rate_spec=rate_spec,
|
||
event=event,
|
||
through="",
|
||
**kwargs
|
||
)
|
||
action_sequence.extend(pump_actions)
|
||
debug_print(f"✅ 液体转移完成,添加了 {len(pump_actions)} 个动作")
|
||
action_sequence.append(create_action_log(f"液体转移完成 ({len(pump_actions)} 个操作)", "✅"))
|
||
|
||
except Exception as e:
|
||
debug_print(f"❌ 试剂添加失败: {str(e)}")
|
||
action_sequence.append(create_action_log(f"试剂添加失败: {str(e)}", "❌"))
|
||
# 添加错误日志
|
||
action_sequence.append({
|
||
"device_id": "system",
|
||
"action_name": "log_message",
|
||
"action_kwargs": {
|
||
"message": f"试剂 '{reagent}' 添加失败: {str(e)}"
|
||
}
|
||
})
|
||
|
||
# === 最终结果 ===
|
||
debug_print("=" * 60)
|
||
debug_print(f"🎉 添加试剂协议生成完成")
|
||
debug_print(f"📊 总动作数: {len(action_sequence)}")
|
||
debug_print(f"📋 处理总结:")
|
||
debug_print(f" 🧪 试剂: {reagent}")
|
||
debug_print(f" {add_emoji} 添加类型: {add_type}")
|
||
debug_print(f" 🥼 目标容器: {vessel_id}")
|
||
if is_liquid:
|
||
debug_print(f" 📏 体积: {final_volume}mL")
|
||
if is_solid:
|
||
debug_print(f" ⚖️ 质量: {final_mass}g")
|
||
debug_print(f" 🧬 摩尔: {mol}")
|
||
debug_print("=" * 60)
|
||
|
||
# 添加完成日志
|
||
summary_msg = f"试剂添加协议完成: {reagent} → {vessel_id}"
|
||
if is_liquid:
|
||
summary_msg += f" ({final_volume}mL)"
|
||
if is_solid:
|
||
summary_msg += f" ({final_mass}g)"
|
||
|
||
action_sequence.append(create_action_log(summary_msg, "🎉"))
|
||
|
||
return action_sequence
|
||
|
||
# === 便捷函数 ===
|
||
# 🔧 修改便捷函数的参数类型
|
||
|
||
def add_liquid_volume(G: nx.DiGraph, vessel: dict, reagent: str, volume: Union[str, float],
|
||
time: Union[str, float] = 0.0, rate_spec: str = "") -> List[Dict[str, Any]]:
|
||
"""添加指定体积的液体试剂"""
|
||
vessel_id = vessel["id"]
|
||
debug_print(f"💧 快速添加液体: {reagent} ({volume}) → {vessel_id}")
|
||
return generate_add_protocol(
|
||
G, vessel, reagent,
|
||
volume=volume,
|
||
time=time,
|
||
rate_spec=rate_spec
|
||
)
|
||
|
||
def add_solid_mass(G: nx.DiGraph, vessel: dict, reagent: str, mass: Union[str, float],
|
||
event: str = "") -> List[Dict[str, Any]]:
|
||
"""添加指定质量的固体试剂"""
|
||
vessel_id = vessel["id"]
|
||
debug_print(f"🧂 快速添加固体: {reagent} ({mass}) → {vessel_id}")
|
||
return generate_add_protocol(
|
||
G, vessel, reagent,
|
||
mass=mass,
|
||
event=event
|
||
)
|
||
|
||
def add_solid_moles(G: nx.DiGraph, vessel: dict, reagent: str, mol: str,
|
||
event: str = "") -> List[Dict[str, Any]]:
|
||
"""按摩尔数添加固体试剂"""
|
||
vessel_id = vessel["id"]
|
||
debug_print(f"🧬 按摩尔数添加固体: {reagent} ({mol}) → {vessel_id}")
|
||
return generate_add_protocol(
|
||
G, vessel, reagent,
|
||
mol=mol,
|
||
event=event
|
||
)
|
||
|
||
def add_dropwise_liquid(G: nx.DiGraph, vessel: dict, reagent: str, volume: Union[str, float],
|
||
time: Union[str, float] = "20 min", event: str = "") -> List[Dict[str, Any]]:
|
||
"""滴加液体试剂"""
|
||
vessel_id = vessel["id"]
|
||
debug_print(f"💧 滴加液体: {reagent} ({volume}) → {vessel_id} (用时: {time})")
|
||
return generate_add_protocol(
|
||
G, vessel, reagent,
|
||
volume=volume,
|
||
time=time,
|
||
rate_spec="dropwise",
|
||
event=event
|
||
)
|
||
|
||
def add_portionwise_solid(G: nx.DiGraph, vessel: dict, reagent: str, mass: Union[str, float],
|
||
time: Union[str, float] = "1 h", event: str = "") -> List[Dict[str, Any]]:
|
||
"""分批添加固体试剂"""
|
||
vessel_id = vessel["id"]
|
||
debug_print(f"🧂 分批添加固体: {reagent} ({mass}) → {vessel_id} (用时: {time})")
|
||
return generate_add_protocol(
|
||
G, vessel, reagent,
|
||
mass=mass,
|
||
time=time,
|
||
rate_spec="portionwise",
|
||
event=event
|
||
)
|
||
|
||
# 测试函数
|
||
def test_add_protocol():
|
||
"""测试添加协议的各种参数解析"""
|
||
print("=== ADD PROTOCOL 增强版测试 ===")
|
||
|
||
# 测试体积解析
|
||
debug_print("🧪 测试体积解析...")
|
||
volumes = ["2.7 mL", "2.67 mL", "?", 10.0, "1 L", "500 μL"]
|
||
for vol in volumes:
|
||
result = parse_volume_input(vol)
|
||
print(f"📏 体积解析: {vol} → {result}mL")
|
||
|
||
# 测试质量解析
|
||
debug_print("⚖️ 测试质量解析...")
|
||
masses = ["19.3 g", "4.5 g", 2.5, "500 mg", "1 kg"]
|
||
for mass in masses:
|
||
result = parse_mass_input(mass)
|
||
print(f"⚖️ 质量解析: {mass} → {result}g")
|
||
|
||
# 测试时间解析
|
||
debug_print("⏱️ 测试时间解析...")
|
||
times = ["1 h", "20 min", "30 s", 60.0, "?"]
|
||
for time in times:
|
||
result = parse_time_input(time)
|
||
print(f"⏱️ 时间解析: {time} → {result}s")
|
||
|
||
print("✅ 测试完成")
|
||
|
||
if __name__ == "__main__":
|
||
test_add_protocol() |