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>
479 lines
18 KiB
Python
479 lines
18 KiB
Python
from typing import List, Dict, Any, Union
|
||
import networkx as nx
|
||
import logging
|
||
import re
|
||
|
||
from .utils.unit_parser import parse_time_input
|
||
|
||
logger = logging.getLogger(__name__)
|
||
|
||
def debug_print(message):
|
||
"""调试输出"""
|
||
logger.info(f"[STIR] {message}")
|
||
|
||
|
||
def find_connected_stirrer(G: nx.DiGraph, vessel: str = None) -> str:
|
||
"""查找与指定容器相连的搅拌设备"""
|
||
debug_print(f"🔍 查找搅拌设备,目标容器: {vessel} 🥽")
|
||
|
||
# 🔧 查找所有搅拌设备
|
||
stirrer_nodes = []
|
||
for node in G.nodes():
|
||
node_data = G.nodes[node]
|
||
node_class = node_data.get('class', '') or ''
|
||
|
||
if 'stirrer' in node_class.lower() or 'virtual_stirrer' in node_class:
|
||
stirrer_nodes.append(node)
|
||
debug_print(f"🎉 找到搅拌设备: {node} 🌪️")
|
||
|
||
# 🔗 检查连接
|
||
if vessel and stirrer_nodes:
|
||
for stirrer in stirrer_nodes:
|
||
if G.has_edge(stirrer, vessel) or G.has_edge(vessel, stirrer):
|
||
debug_print(f"✅ 搅拌设备 '{stirrer}' 与容器 '{vessel}' 相连 🔗")
|
||
return stirrer
|
||
|
||
# 🎯 使用第一个可用设备
|
||
if stirrer_nodes:
|
||
selected = stirrer_nodes[0]
|
||
debug_print(f"🔧 使用第一个搅拌设备: {selected} 🌪️")
|
||
return selected
|
||
|
||
# 🆘 默认设备
|
||
debug_print("⚠️ 未找到搅拌设备,使用默认设备 🌪️")
|
||
return "stirrer_1"
|
||
|
||
def validate_and_fix_params(stir_time: float, stir_speed: float, settling_time: float) -> tuple:
|
||
"""验证和修正参数"""
|
||
# ⏰ 搅拌时间验证
|
||
if stir_time < 0:
|
||
debug_print(f"⚠️ 搅拌时间 {stir_time}s 无效,修正为 100s 🕐")
|
||
stir_time = 100.0
|
||
elif stir_time > 100: # 限制为100s
|
||
debug_print(f"⚠️ 搅拌时间 {stir_time}s 过长,仿真运行时,修正为 100s 🕐")
|
||
stir_time = 100.0
|
||
else:
|
||
debug_print(f"✅ 搅拌时间 {stir_time}s ({stir_time/60:.1f}分钟) 有效 ⏰")
|
||
|
||
# 🌪️ 搅拌速度验证
|
||
if stir_speed < 10.0 or stir_speed > 1500.0:
|
||
debug_print(f"⚠️ 搅拌速度 {stir_speed} RPM 超出范围,修正为 300 RPM 🌪️")
|
||
stir_speed = 300.0
|
||
else:
|
||
debug_print(f"✅ 搅拌速度 {stir_speed} RPM 在正常范围内 🌪️")
|
||
|
||
# ⏱️ 沉降时间验证
|
||
if settling_time < 0 or settling_time > 600: # 限制为10分钟
|
||
debug_print(f"⚠️ 沉降时间 {settling_time}s 超出范围,修正为 60s ⏱️")
|
||
settling_time = 60.0
|
||
else:
|
||
debug_print(f"✅ 沉降时间 {settling_time}s 在正常范围内 ⏱️")
|
||
|
||
return stir_time, stir_speed, settling_time
|
||
|
||
def extract_vessel_id(vessel: Union[str, dict]) -> str:
|
||
"""
|
||
从vessel参数中提取vessel_id
|
||
|
||
Args:
|
||
vessel: vessel字典或vessel_id字符串
|
||
|
||
Returns:
|
||
str: vessel_id
|
||
"""
|
||
if isinstance(vessel, dict):
|
||
vessel_id = list(vessel.values())[0].get("id", "")
|
||
debug_print(f"🔧 从vessel字典提取ID: {vessel_id}")
|
||
return vessel_id
|
||
elif isinstance(vessel, str):
|
||
debug_print(f"🔧 vessel参数为字符串: {vessel}")
|
||
return vessel
|
||
else:
|
||
debug_print(f"⚠️ 无效的vessel参数类型: {type(vessel)}")
|
||
return ""
|
||
|
||
def get_vessel_display_info(vessel: Union[str, dict]) -> str:
|
||
"""
|
||
获取容器的显示信息(用于日志)
|
||
|
||
Args:
|
||
vessel: vessel字典或vessel_id字符串
|
||
|
||
Returns:
|
||
str: 显示信息
|
||
"""
|
||
if isinstance(vessel, dict):
|
||
vessel_id = vessel.get("id", "unknown")
|
||
vessel_name = vessel.get("name", "")
|
||
if vessel_name:
|
||
return f"{vessel_id} ({vessel_name})"
|
||
else:
|
||
return vessel_id
|
||
else:
|
||
return str(vessel)
|
||
|
||
def generate_stir_protocol(
|
||
G: nx.DiGraph,
|
||
vessel: Union[str, dict], # 支持vessel字典或字符串
|
||
time: Union[str, float, int] = "300",
|
||
stir_time: Union[str, float, int] = "0",
|
||
time_spec: str = "",
|
||
event: str = "",
|
||
stir_speed: float = 300.0,
|
||
settling_time: Union[str, float] = "60",
|
||
**kwargs
|
||
) -> List[Dict[str, Any]]:
|
||
"""生成搅拌操作的协议序列 - 修复vessel参数传递"""
|
||
|
||
# 🔧 核心修改:正确处理vessel参数
|
||
vessel_id = extract_vessel_id(vessel)
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
|
||
# 🔧 关键修复:确保vessel_resource是完整的Resource对象
|
||
if isinstance(vessel, dict):
|
||
vessel_resource = vessel # 已经是完整的Resource字典
|
||
debug_print(f"✅ 使用传入的vessel Resource对象")
|
||
else:
|
||
# 如果只是字符串,构建一个基本的Resource对象
|
||
vessel_resource = {
|
||
"id": vessel,
|
||
"name": "",
|
||
"category": "",
|
||
"children": [],
|
||
"config": "",
|
||
"data": "",
|
||
"parent": "",
|
||
"pose": {
|
||
"orientation": {"w": 1.0, "x": 0.0, "y": 0.0, "z": 0.0},
|
||
"position": {"x": 0.0, "y": 0.0, "z": 0.0}
|
||
},
|
||
"sample_id": "",
|
||
"type": ""
|
||
}
|
||
debug_print(f"🔧 构建了基本的vessel Resource对象: {vessel}")
|
||
|
||
debug_print("🌪️" * 20)
|
||
debug_print("🚀 开始生成搅拌协议(支持vessel字典)✨")
|
||
debug_print(f"📝 输入参数:")
|
||
debug_print(f" 🥽 vessel: {vessel_display} (ID: {vessel_id})")
|
||
debug_print(f" ⏰ time: {time}")
|
||
debug_print(f" 🕐 stir_time: {stir_time}")
|
||
debug_print(f" 🎯 time_spec: {time_spec}")
|
||
debug_print(f" 🌪️ stir_speed: {stir_speed} RPM")
|
||
debug_print(f" ⏱️ settling_time: {settling_time}")
|
||
debug_print("🌪️" * 20)
|
||
|
||
# 📋 参数验证
|
||
debug_print("📍 步骤1: 参数验证... 🔧")
|
||
if not vessel_id: # 🔧 使用 vessel_id
|
||
debug_print("❌ vessel 参数不能为空! 😱")
|
||
raise ValueError("vessel 参数不能为空")
|
||
|
||
if vessel_id not in G.nodes(): # 🔧 使用 vessel_id
|
||
debug_print(f"❌ 容器 '{vessel_id}' 不存在于系统中! 😞")
|
||
raise ValueError(f"容器 '{vessel_id}' 不存在于系统中")
|
||
|
||
debug_print("✅ 基础参数验证通过 🎯")
|
||
|
||
# 🔄 参数解析
|
||
debug_print("📍 步骤2: 参数解析... ⚡")
|
||
|
||
# 确定实际时间(优先级:time_spec > stir_time > time)
|
||
if time_spec:
|
||
parsed_time = parse_time_input(time_spec)
|
||
debug_print(f"🎯 使用time_spec: '{time_spec}' → {parsed_time}s")
|
||
elif stir_time not in ["0", 0, 0.0]:
|
||
parsed_time = parse_time_input(stir_time)
|
||
debug_print(f"🎯 使用stir_time: {stir_time} → {parsed_time}s")
|
||
else:
|
||
parsed_time = parse_time_input(time)
|
||
debug_print(f"🎯 使用time: {time} → {parsed_time}s")
|
||
|
||
# 解析沉降时间
|
||
parsed_settling_time = parse_time_input(settling_time)
|
||
|
||
# 🕐 模拟运行时间优化
|
||
debug_print(" ⏱️ 检查模拟运行时间限制...")
|
||
original_stir_time = parsed_time
|
||
original_settling_time = parsed_settling_time
|
||
|
||
# 搅拌时间限制为60秒
|
||
stir_time_limit = 60.0
|
||
if parsed_time > stir_time_limit:
|
||
parsed_time = stir_time_limit
|
||
debug_print(f" 🎮 搅拌时间优化: {original_stir_time}s → {parsed_time}s ⚡")
|
||
|
||
# 沉降时间限制为30秒
|
||
settling_time_limit = 30.0
|
||
if parsed_settling_time > settling_time_limit:
|
||
parsed_settling_time = settling_time_limit
|
||
debug_print(f" 🎮 沉降时间优化: {original_settling_time}s → {parsed_settling_time}s ⚡")
|
||
|
||
# 参数修正
|
||
parsed_time, stir_speed, parsed_settling_time = validate_and_fix_params(
|
||
parsed_time, stir_speed, parsed_settling_time
|
||
)
|
||
|
||
debug_print(f"🎯 最终参数: time={parsed_time}s, speed={stir_speed}RPM, settling={parsed_settling_time}s")
|
||
|
||
# 🔍 查找设备
|
||
debug_print("📍 步骤3: 查找搅拌设备... 🔍")
|
||
try:
|
||
stirrer_id = find_connected_stirrer(G, vessel_id) # 🔧 使用 vessel_id
|
||
debug_print(f"🎉 使用搅拌设备: {stirrer_id} ✨")
|
||
except Exception as e:
|
||
debug_print(f"❌ 设备查找失败: {str(e)} 😭")
|
||
raise ValueError(f"无法找到搅拌设备: {str(e)}")
|
||
|
||
# 🚀 生成动作
|
||
debug_print("📍 步骤4: 生成搅拌动作... 🌪️")
|
||
|
||
action_sequence = []
|
||
stir_action = {
|
||
"device_id": stirrer_id,
|
||
"action_name": "stir",
|
||
"action_kwargs": {
|
||
# 🔧 关键修复:传递vessel_id字符串,而不是完整的Resource对象
|
||
"vessel": {"id": vessel_id}, # 传递字符串ID,不是Resource对象
|
||
"time": str(time),
|
||
"event": event,
|
||
"time_spec": time_spec,
|
||
"stir_time": float(parsed_time),
|
||
"stir_speed": float(stir_speed),
|
||
"settling_time": float(parsed_settling_time)
|
||
}
|
||
}
|
||
action_sequence.append(stir_action)
|
||
debug_print("✅ 搅拌动作已添加 🌪️✨")
|
||
|
||
# 显示时间优化信息
|
||
if original_stir_time != parsed_time or original_settling_time != parsed_settling_time:
|
||
debug_print(f" 🎭 模拟优化说明:")
|
||
debug_print(f" 搅拌时间: {original_stir_time/60:.1f}分钟 → {parsed_time/60:.1f}分钟")
|
||
debug_print(f" 沉降时间: {original_settling_time/60:.1f}分钟 → {parsed_settling_time/60:.1f}分钟")
|
||
|
||
# 🎊 总结
|
||
debug_print("🎊" * 20)
|
||
debug_print(f"🎉 搅拌协议生成完成! ✨")
|
||
debug_print(f"📊 总动作数: {len(action_sequence)} 个")
|
||
debug_print(f"🥽 搅拌容器: {vessel_display}")
|
||
debug_print(f"🌪️ 搅拌参数: {stir_speed} RPM, {parsed_time}s, 沉降 {parsed_settling_time}s")
|
||
debug_print(f"⏱️ 预计总时间: {(parsed_time + parsed_settling_time)/60:.1f} 分钟 ⌛")
|
||
debug_print("🎊" * 20)
|
||
|
||
return action_sequence
|
||
|
||
def generate_start_stir_protocol(
|
||
G: nx.DiGraph,
|
||
vessel: Union[str, dict],
|
||
stir_speed: float = 300.0,
|
||
purpose: str = "",
|
||
**kwargs
|
||
) -> List[Dict[str, Any]]:
|
||
"""生成开始搅拌操作的协议序列 - 修复vessel参数传递"""
|
||
|
||
# 🔧 核心修改:正确处理vessel参数
|
||
vessel_id = extract_vessel_id(vessel)
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
|
||
# 🔧 关键修复:确保vessel_resource是完整的Resource对象
|
||
if isinstance(vessel, dict):
|
||
vessel_resource = vessel # 已经是完整的Resource字典
|
||
debug_print(f"✅ 使用传入的vessel Resource对象")
|
||
else:
|
||
# 如果只是字符串,构建一个基本的Resource对象
|
||
vessel_resource = {
|
||
"id": vessel,
|
||
"name": "",
|
||
"category": "",
|
||
"children": [],
|
||
"config": "",
|
||
"data": "",
|
||
"parent": "",
|
||
"pose": {
|
||
"orientation": {"w": 1.0, "x": 0.0, "y": 0.0, "z": 0.0},
|
||
"position": {"x": 0.0, "y": 0.0, "z": 0.0}
|
||
},
|
||
"sample_id": "",
|
||
"type": ""
|
||
}
|
||
debug_print(f"🔧 构建了基本的vessel Resource对象: {vessel}")
|
||
|
||
debug_print("🔄 开始生成启动搅拌协议(修复vessel参数)✨")
|
||
debug_print(f"🥽 vessel: {vessel_display} (ID: {vessel_id})")
|
||
debug_print(f"🌪️ speed: {stir_speed} RPM")
|
||
debug_print(f"🎯 purpose: {purpose}")
|
||
|
||
# 基础验证
|
||
if not vessel_id or vessel_id not in G.nodes():
|
||
debug_print("❌ 容器验证失败!")
|
||
raise ValueError("vessel 参数无效")
|
||
|
||
# 参数修正
|
||
if stir_speed < 10.0 or stir_speed > 1500.0:
|
||
debug_print(f"⚠️ 搅拌速度修正: {stir_speed} → 300 RPM 🌪️")
|
||
stir_speed = 300.0
|
||
|
||
# 查找设备
|
||
stirrer_id = find_connected_stirrer(G, vessel_id)
|
||
|
||
# 🔧 关键修复:传递vessel_id字符串
|
||
action_sequence = [{
|
||
"device_id": stirrer_id,
|
||
"action_name": "start_stir",
|
||
"action_kwargs": {
|
||
# 🔧 关键修复:传递vessel_id字符串,而不是完整的Resource对象
|
||
"vessel": {"id": vessel_id}, # 传递字符串ID,不是Resource对象
|
||
"stir_speed": stir_speed,
|
||
"purpose": purpose or f"启动搅拌 {stir_speed} RPM"
|
||
}
|
||
}]
|
||
|
||
debug_print(f"✅ 启动搅拌协议生成完成 🎯")
|
||
return action_sequence
|
||
|
||
def generate_stop_stir_protocol(
|
||
G: nx.DiGraph,
|
||
vessel: Union[str, dict],
|
||
**kwargs
|
||
) -> List[Dict[str, Any]]:
|
||
"""生成停止搅拌操作的协议序列 - 修复vessel参数传递"""
|
||
|
||
# 🔧 核心修改:正确处理vessel参数
|
||
vessel_id = extract_vessel_id(vessel)
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
|
||
# 🔧 关键修复:确保vessel_resource是完整的Resource对象
|
||
if isinstance(vessel, dict):
|
||
vessel_resource = vessel # 已经是完整的Resource字典
|
||
debug_print(f"✅ 使用传入的vessel Resource对象")
|
||
else:
|
||
# 如果只是字符串,构建一个基本的Resource对象
|
||
vessel_resource = {
|
||
"id": vessel,
|
||
"name": "",
|
||
"category": "",
|
||
"children": [],
|
||
"config": "",
|
||
"data": "",
|
||
"parent": "",
|
||
"pose": {
|
||
"orientation": {"w": 1.0, "x": 0.0, "y": 0.0, "z": 0.0},
|
||
"position": {"x": 0.0, "y": 0.0, "z": 0.0}
|
||
},
|
||
"sample_id": "",
|
||
"type": ""
|
||
}
|
||
debug_print(f"🔧 构建了基本的vessel Resource对象: {vessel}")
|
||
|
||
debug_print("🛑 开始生成停止搅拌协议(修复vessel参数)✨")
|
||
debug_print(f"🥽 vessel: {vessel_display} (ID: {vessel_id})")
|
||
|
||
# 基础验证
|
||
if not vessel_id or vessel_id not in G.nodes():
|
||
debug_print("❌ 容器验证失败!")
|
||
raise ValueError("vessel 参数无效")
|
||
|
||
# 查找设备
|
||
stirrer_id = find_connected_stirrer(G, vessel_id)
|
||
|
||
# 🔧 关键修复:传递vessel_id字符串
|
||
action_sequence = [{
|
||
"device_id": stirrer_id,
|
||
"action_name": "stop_stir",
|
||
"action_kwargs": {
|
||
# 🔧 关键修复:传递vessel_id字符串,而不是完整的Resource对象
|
||
"vessel": {"id": vessel_id}, # 传递字符串ID,不是Resource对象
|
||
}
|
||
}]
|
||
|
||
debug_print(f"✅ 停止搅拌协议生成完成 🎯")
|
||
return action_sequence
|
||
|
||
# 🔧 新增:便捷函数
|
||
def stir_briefly(G: nx.DiGraph, vessel: Union[str, dict],
|
||
speed: float = 300.0) -> List[Dict[str, Any]]:
|
||
"""短时间搅拌(30秒)"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"⚡ 短时间搅拌: {vessel_display} @ {speed}RPM (30s)")
|
||
return generate_stir_protocol(G, vessel, time="30", stir_speed=speed)
|
||
|
||
def stir_slowly(G: nx.DiGraph, vessel: Union[str, dict],
|
||
time: Union[str, float] = "10 min") -> List[Dict[str, Any]]:
|
||
"""慢速搅拌"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"🐌 慢速搅拌: {vessel_display} @ 150RPM")
|
||
return generate_stir_protocol(G, vessel, time=time, stir_speed=150.0)
|
||
|
||
def stir_vigorously(G: nx.DiGraph, vessel: Union[str, dict],
|
||
time: Union[str, float] = "5 min") -> List[Dict[str, Any]]:
|
||
"""剧烈搅拌"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"💨 剧烈搅拌: {vessel_display} @ 800RPM")
|
||
return generate_stir_protocol(G, vessel, time=time, stir_speed=800.0)
|
||
|
||
def stir_for_reaction(G: nx.DiGraph, vessel: Union[str, dict],
|
||
time: Union[str, float] = "1 h") -> List[Dict[str, Any]]:
|
||
"""反应搅拌(标准速度,长时间)"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"🧪 反应搅拌: {vessel_display} @ 400RPM")
|
||
return generate_stir_protocol(G, vessel, time=time, stir_speed=400.0)
|
||
|
||
def stir_for_dissolution(G: nx.DiGraph, vessel: Union[str, dict],
|
||
time: Union[str, float] = "15 min") -> List[Dict[str, Any]]:
|
||
"""溶解搅拌(中等速度)"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"💧 溶解搅拌: {vessel_display} @ 500RPM")
|
||
return generate_stir_protocol(G, vessel, time=time, stir_speed=500.0)
|
||
|
||
def stir_gently(G: nx.DiGraph, vessel: Union[str, dict],
|
||
time: Union[str, float] = "30 min") -> List[Dict[str, Any]]:
|
||
"""温和搅拌"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"🍃 温和搅拌: {vessel_display} @ 200RPM")
|
||
return generate_stir_protocol(G, vessel, time=time, stir_speed=200.0)
|
||
|
||
def stir_overnight(G: nx.DiGraph, vessel: Union[str, dict]) -> List[Dict[str, Any]]:
|
||
"""过夜搅拌(模拟时缩短为2小时)"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"🌙 过夜搅拌(模拟2小时): {vessel_display} @ 300RPM")
|
||
return generate_stir_protocol(G, vessel, time="2 h", stir_speed=300.0)
|
||
|
||
def start_continuous_stirring(G: nx.DiGraph, vessel: Union[str, dict],
|
||
speed: float = 300.0, purpose: str = "continuous stirring") -> List[Dict[str, Any]]:
|
||
"""开始连续搅拌"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"🔄 开始连续搅拌: {vessel_display} @ {speed}RPM")
|
||
return generate_start_stir_protocol(G, vessel, stir_speed=speed, purpose=purpose)
|
||
|
||
def stop_all_stirring(G: nx.DiGraph, vessel: Union[str, dict]) -> List[Dict[str, Any]]:
|
||
"""停止所有搅拌"""
|
||
vessel_display = get_vessel_display_info(vessel)
|
||
debug_print(f"🛑 停止搅拌: {vessel_display}")
|
||
return generate_stop_stir_protocol(G, vessel)
|
||
|
||
# 测试函数
|
||
def test_stir_protocol():
|
||
"""测试搅拌协议"""
|
||
debug_print("🧪 === STIR PROTOCOL 测试 === ✨")
|
||
|
||
# 测试vessel参数处理
|
||
debug_print("🔧 测试vessel参数处理...")
|
||
|
||
# 测试字典格式
|
||
vessel_dict = {"id": "flask_1", "name": "反应瓶1"}
|
||
vessel_id = extract_vessel_id(vessel_dict)
|
||
vessel_display = get_vessel_display_info(vessel_dict)
|
||
debug_print(f" 字典格式: {vessel_dict} → ID: {vessel_id}, 显示: {vessel_display}")
|
||
|
||
# 测试字符串格式
|
||
vessel_str = "flask_2"
|
||
vessel_id = extract_vessel_id(vessel_str)
|
||
vessel_display = get_vessel_display_info(vessel_str)
|
||
debug_print(f" 字符串格式: {vessel_str} → ID: {vessel_id}, 显示: {vessel_display}")
|
||
|
||
debug_print("✅ 测试完成 🎉")
|
||
|
||
if __name__ == "__main__":
|
||
test_stir_protocol()
|