添加了两个protocol的检索功能 (#51)

* 添加了两个protocol的检索liquid type功能

* fix workstation registry

* 修复了没连接的几个仪器的link,添加了container的icon

* 修改了json和注册表,现在大图全部的device都链接上了

* 修复了小图的json图,线全部连上了

* add work_station protocol handles (ports)

* fix workstation action handle

---------

Co-authored-by: Xuwznln <18435084+Xuwznln@users.noreply.github.com>
Co-authored-by: Junhan Chang <changjh@dp.tech>
This commit is contained in:
Kongchang Feng
2025-06-22 18:30:09 +08:00
committed by GitHub
parent 06b7962ef9
commit 96e9c76709
7 changed files with 1171 additions and 326 deletions

View File

@@ -301,9 +301,9 @@
} }
} }
], ],
"links": [ "links": [
{ {
"id": "link_pump1_valve1", "id": "link_pump1_to_valve1",
"source": "transfer_pump_1", "source": "transfer_pump_1",
"target": "multiway_valve_1", "target": "multiway_valve_1",
"type": "fluid", "type": "fluid",
@@ -313,7 +313,7 @@
} }
}, },
{ {
"id": "link_pump2_valve2", "id": "link_pump2_to_valve2",
"source": "transfer_pump_2", "source": "transfer_pump_2",
"target": "multiway_valve_2", "target": "multiway_valve_2",
"type": "fluid", "type": "fluid",
@@ -323,17 +323,7 @@
} }
}, },
{ {
"id": "link_valve1_air", "id": "link_valve1_to_water",
"source": "multiway_valve_1",
"target": "flask_air",
"type": "fluid",
"port": {
"multiway_valve_1": "6",
"flask_air": "top"
}
},
{
"id": "link_valve1_water",
"source": "multiway_valve_1", "source": "multiway_valve_1",
"target": "flask_water", "target": "flask_water",
"type": "fluid", "type": "fluid",
@@ -343,7 +333,7 @@
} }
}, },
{ {
"id": "link_valve1_acetone", "id": "link_valve1_to_acetone",
"source": "multiway_valve_1", "source": "multiway_valve_1",
"target": "flask_acetone", "target": "flask_acetone",
"type": "fluid", "type": "fluid",
@@ -353,7 +343,7 @@
} }
}, },
{ {
"id": "link_valve1_ethanol", "id": "link_valve1_to_ethanol",
"source": "multiway_valve_1", "source": "multiway_valve_1",
"target": "flask_ethanol", "target": "flask_ethanol",
"type": "fluid", "type": "fluid",
@@ -363,17 +353,27 @@
} }
}, },
{ {
"id": "link_valve1_valve2", "id": "link_valve1_to_air",
"source": "multiway_valve_1",
"target": "flask_air",
"type": "fluid",
"port": {
"multiway_valve_1": "6",
"flask_air": "top"
}
},
{
"id": "link_valve1_to_valve2_for_cleaning",
"source": "multiway_valve_1", "source": "multiway_valve_1",
"target": "multiway_valve_2", "target": "multiway_valve_2",
"type": "fluid", "type": "fluid",
"port": { "port": {
"multiway_valve_1": "5", "multiway_valve_1": "1",
"multiway_valve_2": "1" "multiway_valve_2": "8"
} }
}, },
{ {
"id": "link_valve2_main_reactor", "id": "link_valve2_to_main_reactor_in",
"source": "multiway_valve_2", "source": "multiway_valve_2",
"target": "main_reactor", "target": "main_reactor",
"type": "fluid", "type": "fluid",
@@ -383,7 +383,7 @@
} }
}, },
{ {
"id": "link_valve2_secondary_reactor", "id": "link_valve2_to_secondary_reactor_in",
"source": "multiway_valve_2", "source": "multiway_valve_2",
"target": "secondary_reactor", "target": "secondary_reactor",
"type": "fluid", "type": "fluid",
@@ -393,7 +393,27 @@
} }
}, },
{ {
"id": "link_valve2_waste", "id": "link_main_reactor_out_to_valve2",
"source": "main_reactor",
"target": "multiway_valve_2",
"type": "fluid",
"port": {
"main_reactor": "bottom",
"multiway_valve_2": "6"
}
},
{
"id": "link_secondary_reactor_out_to_valve2",
"source": "secondary_reactor",
"target": "multiway_valve_2",
"type": "fluid",
"port": {
"secondary_reactor": "bottom",
"multiway_valve_2": "7"
}
},
{
"id": "link_valve2_to_waste",
"source": "multiway_valve_2", "source": "multiway_valve_2",
"target": "waste_workup", "target": "waste_workup",
"type": "fluid", "type": "fluid",
@@ -403,17 +423,7 @@
} }
}, },
{ {
"id": "link_valve2_air_return", "id": "link_heatchill1_to_main_reactor",
"source": "multiway_valve_2",
"target": "flask_air",
"type": "fluid",
"port": {
"multiway_valve_2": "5",
"flask_air": "top"
}
},
{
"id": "link_heatchill1_main_reactor",
"source": "heatchill_1", "source": "heatchill_1",
"target": "main_reactor", "target": "main_reactor",
"type": "mechanical", "type": "mechanical",
@@ -421,6 +431,16 @@
"heatchill_1": "heatchill", "heatchill_1": "heatchill",
"main_reactor": "bind" "main_reactor": "bind"
} }
},
{
"id": "link_heatchill1_to_secondary_reactor",
"source": "heatchill_1",
"target": "secondary_reactor",
"type": "mechanical",
"port": {
"heatchill_1": "heatchill",
"secondary_reactor": "bind"
}
} }
] ]
} }

View File

@@ -1,8 +1,8 @@
{ {
"nodes": [ "nodes": [
{ {
"id": "ComprehensiveProtocolStation", "id": "OrganicSynthesisStation",
"name": "综合协议测试工作站", "name": "有机化学流程综合测试工作站",
"children": [ "children": [
"multiway_valve_1", "multiway_valve_1",
"multiway_valve_2", "multiway_valve_2",
@@ -69,7 +69,7 @@
"id": "multiway_valve_1", "id": "multiway_valve_1",
"name": "八通阀门1", "name": "八通阀门1",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_multiway_valve", "class": "virtual_multiway_valve",
"position": { "position": {
@@ -89,7 +89,7 @@
"id": "multiway_valve_2", "id": "multiway_valve_2",
"name": "八通阀门2", "name": "八通阀门2",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_multiway_valve", "class": "virtual_multiway_valve",
"position": { "position": {
@@ -109,7 +109,7 @@
"id": "transfer_pump_1", "id": "transfer_pump_1",
"name": "转移泵1", "name": "转移泵1",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_transfer_pump", "class": "virtual_transfer_pump",
"position": { "position": {
@@ -130,7 +130,7 @@
"id": "transfer_pump_2", "id": "transfer_pump_2",
"name": "转移泵2", "name": "转移泵2",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_transfer_pump", "class": "virtual_transfer_pump",
"position": { "position": {
@@ -151,7 +151,7 @@
"id": "reagent_bottle_1", "id": "reagent_bottle_1",
"name": "试剂瓶1-DMF", "name": "试剂瓶1-DMF",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -172,7 +172,7 @@
"id": "reagent_bottle_2", "id": "reagent_bottle_2",
"name": "试剂瓶2-乙酸乙酯", "name": "试剂瓶2-乙酸乙酯",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -193,7 +193,7 @@
"id": "reagent_bottle_3", "id": "reagent_bottle_3",
"name": "试剂瓶3-己烷", "name": "试剂瓶3-己烷",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -214,7 +214,7 @@
"id": "reagent_bottle_4", "id": "reagent_bottle_4",
"name": "试剂瓶4-甲醇", "name": "试剂瓶4-甲醇",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -235,7 +235,7 @@
"id": "reagent_bottle_5", "id": "reagent_bottle_5",
"name": "试剂瓶5-水", "name": "试剂瓶5-水",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -256,7 +256,7 @@
"id": "centrifuge_1", "id": "centrifuge_1",
"name": "离心机", "name": "离心机",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_centrifuge", "class": "virtual_centrifuge",
"position": { "position": {
@@ -278,7 +278,7 @@
"id": "rotavap_1", "id": "rotavap_1",
"name": "旋转蒸发仪", "name": "旋转蒸发仪",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_rotavap", "class": "virtual_rotavap",
"position": { "position": {
@@ -300,7 +300,7 @@
"id": "main_reactor", "id": "main_reactor",
"name": "主反应器", "name": "主反应器",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -324,7 +324,7 @@
"id": "heater_1", "id": "heater_1",
"name": "加热器", "name": "加热器",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_heatchill", "class": "virtual_heatchill",
"position": { "position": {
@@ -345,7 +345,7 @@
"id": "stirrer_1", "id": "stirrer_1",
"name": "搅拌器1", "name": "搅拌器1",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_stirrer", "class": "virtual_stirrer",
"position": { "position": {
@@ -365,7 +365,7 @@
"id": "stirrer_2", "id": "stirrer_2",
"name": "搅拌器2", "name": "搅拌器2",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_stirrer", "class": "virtual_stirrer",
"position": { "position": {
@@ -385,7 +385,7 @@
"id": "waste_bottle_1", "id": "waste_bottle_1",
"name": "废液瓶1", "name": "废液瓶1",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -404,7 +404,7 @@
"id": "waste_bottle_2", "id": "waste_bottle_2",
"name": "废液瓶2", "name": "废液瓶2",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -423,7 +423,7 @@
"id": "solenoid_valve_1", "id": "solenoid_valve_1",
"name": "电磁阀1", "name": "电磁阀1",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_solenoid_valve", "class": "virtual_solenoid_valve",
"position": { "position": {
@@ -444,7 +444,7 @@
"id": "solenoid_valve_2", "id": "solenoid_valve_2",
"name": "电磁阀2", "name": "电磁阀2",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_solenoid_valve", "class": "virtual_solenoid_valve",
"position": { "position": {
@@ -465,7 +465,7 @@
"id": "vacuum_pump_1", "id": "vacuum_pump_1",
"name": "真空泵", "name": "真空泵",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_vacuum_pump", "class": "virtual_vacuum_pump",
"position": { "position": {
@@ -486,7 +486,7 @@
"id": "gas_source_1", "id": "gas_source_1",
"name": "气源", "name": "气源",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_gas_source", "class": "virtual_gas_source",
"position": { "position": {
@@ -504,7 +504,7 @@
"id": "filter_1", "id": "filter_1",
"name": "过滤器", "name": "过滤器",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_filter", "class": "virtual_filter",
"position": { "position": {
@@ -525,7 +525,7 @@
"id": "column_1", "id": "column_1",
"name": "洗脱柱", "name": "洗脱柱",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_column", "class": "virtual_column",
"position": { "position": {
@@ -547,7 +547,7 @@
"id": "separator_1", "id": "separator_1",
"name": "分液器", "name": "分液器",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "device", "type": "device",
"class": "virtual_separator", "class": "virtual_separator",
"position": { "position": {
@@ -568,7 +568,7 @@
"id": "collection_bottle_1", "id": "collection_bottle_1",
"name": "接收瓶1", "name": "接收瓶1",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -587,7 +587,7 @@
"id": "collection_bottle_2", "id": "collection_bottle_2",
"name": "接收瓶2", "name": "接收瓶2",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -606,7 +606,7 @@
"id": "collection_bottle_3", "id": "collection_bottle_3",
"name": "接收瓶3", "name": "接收瓶3",
"children": [], "children": [],
"parent": "ComprehensiveProtocolStation", "parent": "OrganicSynthesisStation",
"type": "container", "type": "container",
"class": "container", "class": "container",
"position": { "position": {
@@ -852,6 +852,46 @@
"heater_1": "heatchill", "heater_1": "heatchill",
"main_reactor": "bind" "main_reactor": "bind"
} }
},
{
"id": "link_separator_waste2",
"source": "separator_1",
"target": "waste_bottle_2",
"type": "fluid",
"port": {
"separator_1": "top_phase_out",
"waste_bottle_2": "top"
}
},
{
"id": "mech_stirrer2_separator",
"source": "stirrer_2",
"target": "separator_1",
"type": "mechanical",
"port": {
"stirrer_2": "stirrer",
"separator_1": "bind"
}
},
{
"id": "link_filter_filtrate_to_collection1",
"source": "filter_1",
"target": "collection_bottle_1",
"type": "transport",
"port": {
"filter_1": "filtrate_out",
"collection_bottle_1": "top"
}
},
{
"id": "link_filter_retentate_to_waste1",
"source": "filter_1",
"target": "waste_bottle_1",
"type": "transport",
"port": {
"filter_1": "retentate_out",
"waste_bottle_1": "top"
}
} }
] ]
} }

View File

@@ -5,7 +5,10 @@ from .pump_protocol import generate_pump_protocol_with_rinsing
def find_reagent_vessel(G: nx.DiGraph, reagent: str) -> str: def find_reagent_vessel(G: nx.DiGraph, reagent: str) -> str:
""" """
根据试剂名称查找对应的试剂瓶 根据试剂名称查找对应的试剂瓶,支持多种匹配模式:
1. 容器名称匹配(如 flask_DMF, reagent_bottle_1-DMF
2. 容器内液体类型匹配(如 liquid_type: "DMF", name: "ethanol"
3. 试剂名称匹配(如 reagent_name: "DMF", config.reagent: "ethyl_acetate"
Args: Args:
G: 网络图 G: 网络图
@@ -17,23 +20,184 @@ def find_reagent_vessel(G: nx.DiGraph, reagent: str) -> str:
Raises: Raises:
ValueError: 如果找不到对应的试剂瓶 ValueError: 如果找不到对应的试剂瓶
""" """
# 按照pump_protocol的命名规则查找试剂瓶 print(f"ADD_PROTOCOL: 正在查找试剂 '{reagent}' 的容器...")
reagent_vessel_id = f"flask_{reagent}"
if reagent_vessel_id in G.nodes(): # 第一步:通过容器名称匹配
return reagent_vessel_id possible_names = [
f"flask_{reagent}", # flask_DMF, flask_ethanol
f"bottle_{reagent}", # bottle_DMF, bottle_ethanol
f"vessel_{reagent}", # vessel_DMF, vessel_ethanol
f"{reagent}_flask", # DMF_flask, ethanol_flask
f"{reagent}_bottle", # DMF_bottle, ethanol_bottle
f"{reagent}", # 直接用试剂名
f"reagent_{reagent}", # reagent_DMF, reagent_ethanol
f"reagent_bottle_{reagent}", # reagent_bottle_DMF
]
# 如果直接匹配失败,尝试模糊匹配 # 尝试名称匹配
for node in G.nodes(): for vessel_name in possible_names:
if node.startswith('flask_') and reagent.lower() in node.lower(): if vessel_name in G.nodes():
return node print(f"ADD_PROTOCOL: 通过名称匹配找到容器: {vessel_name}")
return vessel_name
# 如果还是找不到,列出所有可用的试剂瓶 # 第二步:通过模糊名称匹配(名称中包含试剂名)
available_flasks = [node for node in G.nodes() for node_id in G.nodes():
if node.startswith('flask_') if G.nodes[node_id].get('type') == 'container':
and G.nodes[node].get('type') == 'container'] # 检查节点ID或名称中是否包含试剂名
node_name = G.nodes[node_id].get('name', '').lower()
if (reagent.lower() in node_id.lower() or
reagent.lower() in node_name):
print(f"ADD_PROTOCOL: 通过模糊名称匹配找到容器: {node_id} (名称: {node_name})")
return node_id
raise ValueError(f"找不到试剂 '{reagent}' 对应的试剂瓶。可用试剂瓶: {available_flasks}") # 第三步:通过液体类型匹配
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
vessel_data = G.nodes[node_id].get('data', {})
liquids = vessel_data.get('liquid', [])
for liquid in liquids:
if isinstance(liquid, dict):
# 支持两种格式的液体类型字段
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
reagent_name = vessel_data.get('reagent_name', '')
config_reagent = G.nodes[node_id].get('config', {}).get('reagent', '')
# 检查多个可能的字段
if (liquid_type.lower() == reagent.lower() or
reagent_name.lower() == reagent.lower() or
config_reagent.lower() == reagent.lower()):
print(f"ADD_PROTOCOL: 通过液体类型匹配找到容器: {node_id}")
print(f" - liquid_type: {liquid_type}")
print(f" - reagent_name: {reagent_name}")
print(f" - config.reagent: {config_reagent}")
return node_id
# 第四步:列出所有可用的容器信息帮助调试
available_containers = []
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
vessel_data = G.nodes[node_id].get('data', {})
config_data = G.nodes[node_id].get('config', {})
liquids = vessel_data.get('liquid', [])
container_info = {
'id': node_id,
'name': G.nodes[node_id].get('name', ''),
'liquid_types': [],
'reagent_name': vessel_data.get('reagent_name', ''),
'config_reagent': config_data.get('reagent', '')
}
for liquid in liquids:
if isinstance(liquid, dict):
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
if liquid_type:
container_info['liquid_types'].append(liquid_type)
available_containers.append(container_info)
print(f"ADD_PROTOCOL: 可用容器列表:")
for container in available_containers:
print(f" - {container['id']}: {container['name']}")
print(f" 液体类型: {container['liquid_types']}")
print(f" 试剂名称: {container['reagent_name']}")
print(f" 配置试剂: {container['config_reagent']}")
raise ValueError(f"找不到试剂 '{reagent}' 对应的试剂瓶。尝试了名称匹配: {possible_names}")
def find_reagent_vessel_by_any_match(G: nx.DiGraph, reagent: str) -> str:
"""
增强版试剂容器查找,支持各种匹配方式的别名函数
"""
return find_reagent_vessel(G, reagent)
def get_vessel_reagent_volume(G: nx.DiGraph, vessel: str) -> float:
"""获取容器中的试剂体积"""
if vessel not in G.nodes():
return 0.0
vessel_data = G.nodes[vessel].get('data', {})
liquids = vessel_data.get('liquid', [])
total_volume = 0.0
for liquid in liquids:
if isinstance(liquid, dict):
# 支持两种格式:新格式 (name, volume) 和旧格式 (liquid_type, liquid_volume)
volume = liquid.get('volume') or liquid.get('liquid_volume', 0.0)
total_volume += volume
return total_volume
def get_vessel_reagent_types(G: nx.DiGraph, vessel: str) -> List[str]:
"""获取容器中所有试剂的类型"""
if vessel not in G.nodes():
return []
vessel_data = G.nodes[vessel].get('data', {})
liquids = vessel_data.get('liquid', [])
reagent_types = []
for liquid in liquids:
if isinstance(liquid, dict):
# 支持两种格式的试剂类型字段
reagent_type = liquid.get('liquid_type') or liquid.get('name', '')
if reagent_type:
reagent_types.append(reagent_type)
# 同时检查配置中的试剂信息
config_reagent = G.nodes[vessel].get('config', {}).get('reagent', '')
reagent_name = vessel_data.get('reagent_name', '')
if config_reagent and config_reagent not in reagent_types:
reagent_types.append(config_reagent)
if reagent_name and reagent_name not in reagent_types:
reagent_types.append(reagent_name)
return reagent_types
def find_vessels_by_reagent(G: nx.DiGraph, reagent: str) -> List[str]:
"""
根据试剂类型查找所有匹配的容器
返回匹配容器的ID列表
"""
matching_vessels = []
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
# 检查容器名称匹配
node_name = G.nodes[node_id].get('name', '').lower()
if reagent.lower() in node_id.lower() or reagent.lower() in node_name:
matching_vessels.append(node_id)
continue
# 检查试剂类型匹配
vessel_data = G.nodes[node_id].get('data', {})
liquids = vessel_data.get('liquid', [])
config_data = G.nodes[node_id].get('config', {})
# 检查 reagent_name 和 config.reagent
reagent_name = vessel_data.get('reagent_name', '').lower()
config_reagent = config_data.get('reagent', '').lower()
if (reagent.lower() == reagent_name or
reagent.lower() == config_reagent):
matching_vessels.append(node_id)
continue
# 检查液体列表
for liquid in liquids:
if isinstance(liquid, dict):
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
if liquid_type.lower() == reagent.lower():
matching_vessels.append(node_id)
break
return matching_vessels
def find_connected_stirrer(G: nx.DiGraph, vessel: str) -> str: def find_connected_stirrer(G: nx.DiGraph, vessel: str) -> str:
@@ -49,7 +213,7 @@ def find_connected_stirrer(G: nx.DiGraph, vessel: str) -> str:
""" """
# 查找所有搅拌器节点 # 查找所有搅拌器节点
stirrer_nodes = [node for node in G.nodes() stirrer_nodes = [node for node in G.nodes()
if G.nodes[node].get('class') == 'virtual_stirrer'] if (G.nodes[node].get('class') or '') == 'virtual_stirrer']
# 检查哪个搅拌器与目标容器相连 # 检查哪个搅拌器与目标容器相连
for stirrer in stirrer_nodes: for stirrer in stirrer_nodes:
@@ -74,10 +238,10 @@ def generate_add_protocol(
purpose: str = "添加试剂" purpose: str = "添加试剂"
) -> List[Dict[str, Any]]: ) -> List[Dict[str, Any]]:
""" """
生成添加试剂的协议序列 生成添加试剂的协议序列,支持智能试剂匹配
基于pump_protocol的成熟算法实现试剂添加功能 基于pump_protocol的成熟算法实现试剂添加功能
1. 自动查找试剂瓶 1. 智能查找试剂瓶(支持名称匹配、液体类型匹配、试剂配置匹配)
2. **先启动搅拌,再进行转移** - 确保试剂添加更均匀 2. **先启动搅拌,再进行转移** - 确保试剂添加更均匀
3. 使用pump_protocol实现液体转移 3. 使用pump_protocol实现液体转移
@@ -102,24 +266,41 @@ def generate_add_protocol(
""" """
action_sequence = [] action_sequence = []
print(f"ADD_PROTOCOL: 开始生成添加试剂协议")
print(f" - 目标容器: {vessel}")
print(f" - 试剂: {reagent}")
print(f" - 体积: {volume} mL")
print(f" - 质量: {mass} g")
print(f" - 搅拌: {stir} (速度: {stir_speed} RPM)")
print(f" - 粘稠: {viscous}")
print(f" - 目的: {purpose}")
# 1. 验证目标容器存在 # 1. 验证目标容器存在
if vessel not in G.nodes(): if vessel not in G.nodes():
raise ValueError(f"目标容器 '{vessel}' 不存在于系统中") raise ValueError(f"目标容器 '{vessel}' 不存在于系统中")
# 2. 查找试剂瓶 # 2. 智能查找试剂瓶
try: try:
reagent_vessel = find_reagent_vessel(G, reagent) reagent_vessel = find_reagent_vessel(G, reagent)
print(f"ADD_PROTOCOL: 找到试剂容器: {reagent_vessel}")
except ValueError as e: except ValueError as e:
raise ValueError(f"无法找到试剂 '{reagent}': {str(e)}") raise ValueError(f"无法找到试剂 '{reagent}': {str(e)}")
# 3. 验证是否存在从试剂瓶到目标容器的路径 # 3. 验证试剂容器中的试剂体积
available_volume = get_vessel_reagent_volume(G, reagent_vessel)
print(f"ADD_PROTOCOL: 试剂容器 {reagent_vessel} 中有 {available_volume} mL 试剂")
if available_volume < volume:
print(f"ADD_PROTOCOL: 警告 - 试剂容器中的试剂不足!需要 {volume} mL可用 {available_volume} mL")
# 4. 验证是否存在从试剂瓶到目标容器的路径
try: try:
path = nx.shortest_path(G, source=reagent_vessel, target=vessel) path = nx.shortest_path(G, source=reagent_vessel, target=vessel)
print(f"ADD_PROTOCOL: 找到路径 {reagent_vessel} -> {vessel}: {path}") print(f"ADD_PROTOCOL: 找到路径 {reagent_vessel} -> {vessel}: {path}")
except nx.NetworkXNoPath: except nx.NetworkXNoPath:
raise ValueError(f"从试剂瓶 '{reagent_vessel}' 到目标容器 '{vessel}' 没有可用路径") raise ValueError(f"从试剂瓶 '{reagent_vessel}' 到目标容器 '{vessel}' 没有可用路径")
# 4. **先启动搅拌** - 关键改进! # 5. **先启动搅拌** - 关键改进!
if stir: if stir:
try: try:
stirrer_id = find_connected_stirrer(G, vessel) stirrer_id = find_connected_stirrer(G, vessel)
@@ -140,15 +321,21 @@ def generate_add_protocol(
action_sequence.append(stir_action) action_sequence.append(stir_action)
print(f"ADD_PROTOCOL: 已添加搅拌动作,速度 {stir_speed} RPM") print(f"ADD_PROTOCOL: 已添加搅拌动作,速度 {stir_speed} RPM")
# 等待搅拌稳定
action_sequence.append({
"action_name": "wait",
"action_kwargs": {"time": 5}
})
else: else:
print(f"ADD_PROTOCOL: 警告 - 需要搅拌但未找到与容器 {vessel} 相连的搅拌器") print(f"ADD_PROTOCOL: 警告 - 需要搅拌但未找到与容器 {vessel} 相连的搅拌器")
except Exception as e: except Exception as e:
print(f"ADD_PROTOCOL: 搅拌器配置出错: {str(e)}") print(f"ADD_PROTOCOL: 搅拌器配置出错: {str(e)}")
# 5. 如果指定了体积,执行液体转移 # 6. 如果指定了体积,执行液体转移
if volume > 0: if volume > 0:
# 5.1 计算流速参数 # 6.1 计算流速参数
if time > 0: if time > 0:
# 根据时间计算流速 # 根据时间计算流速
transfer_flowrate = volume / time transfer_flowrate = volume / time
@@ -165,7 +352,7 @@ def generate_add_protocol(
print(f"ADD_PROTOCOL: 准备转移 {volume} mL 从 {reagent_vessel}{vessel}") print(f"ADD_PROTOCOL: 准备转移 {volume} mL 从 {reagent_vessel}{vessel}")
print(f"ADD_PROTOCOL: 转移流速={transfer_flowrate} mL/s, 注入流速={flowrate} mL/s") print(f"ADD_PROTOCOL: 转移流速={transfer_flowrate} mL/s, 注入流速={flowrate} mL/s")
# 5.2 使用pump_protocol的核心算法实现液体转移 # 6.2 使用pump_protocol的核心算法实现液体转移
try: try:
pump_actions = generate_pump_protocol_with_rinsing( pump_actions = generate_pump_protocol_with_rinsing(
G=G, G=G,
@@ -190,6 +377,8 @@ def generate_add_protocol(
raise ValueError(f"生成泵协议时出错: {str(e)}") raise ValueError(f"生成泵协议时出错: {str(e)}")
print(f"ADD_PROTOCOL: 生成了 {len(action_sequence)} 个动作") print(f"ADD_PROTOCOL: 生成了 {len(action_sequence)} 个动作")
print(f"ADD_PROTOCOL: 添加试剂协议生成完成")
return action_sequence return action_sequence
@@ -210,7 +399,7 @@ def generate_add_protocol_with_cleaning(
cleaning_repeats: int = 1 cleaning_repeats: int = 1
) -> List[Dict[str, Any]]: ) -> List[Dict[str, Any]]:
""" """
生成带清洗的添加试剂协议 生成带清洗的添加试剂协议,支持智能试剂匹配
与普通添加协议的区别是会在添加后进行管道清洗 与普通添加协议的区别是会在添加后进行管道清洗
@@ -235,7 +424,7 @@ def generate_add_protocol_with_cleaning(
""" """
action_sequence = [] action_sequence = []
# 1. 查找试剂瓶 # 1. 智能查找试剂瓶
reagent_vessel = find_reagent_vessel(G, reagent) reagent_vessel = find_reagent_vessel(G, reagent)
# 2. **先启动搅拌** # 2. **先启动搅拌**
@@ -251,6 +440,12 @@ def generate_add_protocol_with_cleaning(
"purpose": f"{purpose}: 启动搅拌,准备添加 {reagent}" "purpose": f"{purpose}: 启动搅拌,准备添加 {reagent}"
} }
}) })
# 等待搅拌稳定
action_sequence.append({
"action_name": "wait",
"action_kwargs": {"time": 5}
})
# 3. 计算流速 # 3. 计算流速
if time > 0: if time > 0:
@@ -296,7 +491,7 @@ def generate_sequential_add_protocol(
final_stir_time: float = 300.0 final_stir_time: float = 300.0
) -> List[Dict[str, Any]]: ) -> List[Dict[str, Any]]:
""" """
生成连续添加多种试剂的协议 生成连续添加多种试剂的协议,支持智能试剂匹配
Args: Args:
G: 网络图 G: 网络图
@@ -313,13 +508,13 @@ def generate_sequential_add_protocol(
Example: Example:
reagents = [ reagents = [
{ {
"reagent": "DMF", "reagent": "DMF", # 会匹配 reagent_bottle_1 (reagent_name: "DMF")
"volume": 10.0, "volume": 10.0,
"viscous": False, "viscous": False,
"stir_speed": 300.0 "stir_speed": 300.0
}, },
{ {
"reagent": "ethyl_acetate", "reagent": "ethyl_acetate", # 会匹配 reagent_bottle_2 (reagent_name: "ethyl_acetate")
"volume": 5.0, "volume": 5.0,
"viscous": False, "viscous": False,
"stir_speed": 350.0 "stir_speed": 350.0
@@ -328,14 +523,17 @@ def generate_sequential_add_protocol(
""" """
action_sequence = [] action_sequence = []
print(f"ADD_PROTOCOL: 开始连续添加 {len(reagents)} 种试剂到容器 {vessel}")
for i, reagent_params in enumerate(reagents): for i, reagent_params in enumerate(reagents):
print(f"ADD_PROTOCOL: 处理第 {i+1}/{len(reagents)} 个试剂: {reagent_params.get('reagent')}") reagent_name = reagent_params.get('reagent')
print(f"ADD_PROTOCOL: 处理第 {i+1}/{len(reagents)} 个试剂: {reagent_name}")
# 生成单个试剂的添加协议 # 生成单个试剂的添加协议
add_actions = generate_add_protocol( add_actions = generate_add_protocol(
G=G, G=G,
vessel=vessel, vessel=vessel,
reagent=reagent_params.get('reagent'), reagent=reagent_name,
volume=reagent_params.get('volume', 0.0), volume=reagent_params.get('volume', 0.0),
mass=reagent_params.get('mass', 0.0), mass=reagent_params.get('mass', 0.0),
amount=reagent_params.get('amount', ''), amount=reagent_params.get('amount', ''),
@@ -343,7 +541,7 @@ def generate_sequential_add_protocol(
stir=stir_between_additions, stir=stir_between_additions,
stir_speed=reagent_params.get('stir_speed', 300.0), stir_speed=reagent_params.get('stir_speed', 300.0),
viscous=reagent_params.get('viscous', False), viscous=reagent_params.get('viscous', False),
purpose=reagent_params.get('purpose', f'添加试剂 {i+1}') purpose=reagent_params.get('purpose', f'添加试剂 {reagent_name} ({i+1}/{len(reagents)})')
) )
action_sequence.extend(add_actions) action_sequence.extend(add_actions)
@@ -352,17 +550,23 @@ def generate_sequential_add_protocol(
if i < len(reagents) - 1: # 不是最后一个试剂 if i < len(reagents) - 1: # 不是最后一个试剂
action_sequence.append({ action_sequence.append({
"action_name": "wait", "action_name": "wait",
"action_kwargs": {"time": 2} "action_kwargs": {"time": 10} # 试剂混合时间
}) })
# 最终搅拌 # 最终搅拌
if final_stir: if final_stir:
stirrer_id = find_connected_stirrer(G, vessel) stirrer_id = find_connected_stirrer(G, vessel)
if stirrer_id: if stirrer_id:
print(f"ADD_PROTOCOL: 添加最终搅拌动作,速度 {final_stir_speed} RPM时间 {final_stir_time}")
action_sequence.extend([ action_sequence.extend([
{ {
"action_name": "wait", "device_id": stirrer_id,
"action_kwargs": {"time": final_stir_time} "action_name": "stir",
"action_kwargs": {
"stir_time": final_stir_time,
"stir_speed": final_stir_speed,
"settling_time": 30.0
}
} }
]) ])
@@ -370,10 +574,52 @@ def generate_sequential_add_protocol(
return action_sequence return action_sequence
# 便捷函数:常用添加方案
def generate_organic_add_protocol(
G: nx.DiGraph,
vessel: str,
organic_reagent: str,
volume: float,
stir_speed: float = 400.0
) -> List[Dict[str, Any]]:
"""有机试剂添加:慢速、搅拌"""
return generate_add_protocol(
G, vessel, organic_reagent, volume, 0.0, "", 0.0,
True, stir_speed, False, f"添加有机试剂 {organic_reagent}"
)
def generate_viscous_add_protocol(
G: nx.DiGraph,
vessel: str,
viscous_reagent: str,
volume: float,
addition_time: float = 120.0
) -> List[Dict[str, Any]]:
"""粘稠试剂添加:慢速、长时间"""
return generate_add_protocol(
G, vessel, viscous_reagent, volume, 0.0, "", addition_time,
True, 250.0, True, f"缓慢添加粘稠试剂 {viscous_reagent}"
)
def generate_solvent_add_protocol(
G: nx.DiGraph,
vessel: str,
solvent: str,
volume: float
) -> List[Dict[str, Any]]:
"""溶剂添加:快速、无需特殊处理"""
return generate_add_protocol(
G, vessel, solvent, volume, 0.0, "", 0.0,
False, 300.0, False, f"添加溶剂 {solvent}"
)
# 使用示例和测试函数 # 使用示例和测试函数
def test_add_protocol(): def test_add_protocol():
"""测试添加协议的示例""" """测试添加协议的示例"""
print("=== ADD PROTOCOL 测试 ===") print("=== ADD PROTOCOL 智能匹配测试 ===")
print("测试完成") print("测试完成")

View File

@@ -5,9 +5,13 @@ from .pump_protocol import generate_pump_protocol
def find_solvent_vessel(G: nx.DiGraph, solvent: str) -> str: def find_solvent_vessel(G: nx.DiGraph, solvent: str) -> str:
""" """
查找溶剂容器,支持多种命名模式 查找溶剂容器,支持多种匹配模式
1. 容器名称匹配(如 flask_water, reagent_bottle_1-DMF
2. 容器内液体类型匹配(如 liquid_type: "DMF", "ethanol"
""" """
# 可能的溶剂容器命名模式 print(f"CLEAN_VESSEL: 正在查找溶剂 '{solvent}' 的容器...")
# 第一步:通过容器名称匹配
possible_names = [ possible_names = [
f"flask_{solvent}", # flask_water, flask_ethanol f"flask_{solvent}", # flask_water, flask_ethanol
f"bottle_{solvent}", # bottle_water, bottle_ethanol f"bottle_{solvent}", # bottle_water, bottle_ethanol
@@ -16,13 +20,87 @@ def find_solvent_vessel(G: nx.DiGraph, solvent: str) -> str:
f"{solvent}_bottle", # water_bottle, ethanol_bottle f"{solvent}_bottle", # water_bottle, ethanol_bottle
f"{solvent}", # 直接用溶剂名 f"{solvent}", # 直接用溶剂名
f"solvent_{solvent}", # solvent_water, solvent_ethanol f"solvent_{solvent}", # solvent_water, solvent_ethanol
f"reagent_bottle_{solvent}", # reagent_bottle_DMF
] ]
# 尝试名称匹配
for vessel_name in possible_names: for vessel_name in possible_names:
if vessel_name in G.nodes(): if vessel_name in G.nodes():
print(f"CLEAN_VESSEL: 通过名称匹配找到容器: {vessel_name}")
return vessel_name return vessel_name
raise ValueError(f"未找到溶剂 '{solvent}' 的容器。尝试了以下名称: {possible_names}") # 第二步:通过模糊名称匹配(名称中包含溶剂名)
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
# 检查节点ID或名称中是否包含溶剂名
node_name = G.nodes[node_id].get('name', '').lower()
if (solvent.lower() in node_id.lower() or
solvent.lower() in node_name):
print(f"CLEAN_VESSEL: 通过模糊名称匹配找到容器: {node_id} (名称: {node_name})")
return node_id
# 第三步:通过液体类型匹配
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
vessel_data = G.nodes[node_id].get('data', {})
liquids = vessel_data.get('liquid', [])
for liquid in liquids:
if isinstance(liquid, dict):
# 支持两种格式的液体类型字段
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
reagent_name = vessel_data.get('reagent_name', '')
config_reagent = G.nodes[node_id].get('config', {}).get('reagent', '')
# 检查多个可能的字段
if (liquid_type.lower() == solvent.lower() or
reagent_name.lower() == solvent.lower() or
config_reagent.lower() == solvent.lower()):
print(f"CLEAN_VESSEL: 通过液体类型匹配找到容器: {node_id}")
print(f" - liquid_type: {liquid_type}")
print(f" - reagent_name: {reagent_name}")
print(f" - config.reagent: {config_reagent}")
return node_id
# 第四步:列出所有可用的容器信息帮助调试
available_containers = []
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
vessel_data = G.nodes[node_id].get('data', {})
config_data = G.nodes[node_id].get('config', {})
liquids = vessel_data.get('liquid', [])
container_info = {
'id': node_id,
'name': G.nodes[node_id].get('name', ''),
'liquid_types': [],
'reagent_name': vessel_data.get('reagent_name', ''),
'config_reagent': config_data.get('reagent', '')
}
for liquid in liquids:
if isinstance(liquid, dict):
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
if liquid_type:
container_info['liquid_types'].append(liquid_type)
available_containers.append(container_info)
print(f"CLEAN_VESSEL: 可用容器列表:")
for container in available_containers:
print(f" - {container['id']}: {container['name']}")
print(f" 液体类型: {container['liquid_types']}")
print(f" 试剂名称: {container['reagent_name']}")
print(f" 配置试剂: {container['config_reagent']}")
raise ValueError(f"未找到溶剂 '{solvent}' 的容器。尝试了名称匹配: {possible_names}")
def find_solvent_vessel_by_any_match(G: nx.DiGraph, solvent: str) -> str:
"""
增强版溶剂容器查找,支持各种匹配方式的别名函数
"""
return find_solvent_vessel(G, solvent)
def find_waste_vessel(G: nx.DiGraph) -> str: def find_waste_vessel(G: nx.DiGraph) -> str:
@@ -281,4 +359,81 @@ def generate_organic_clean_protocol(
) )
action_sequence.extend(water_actions) action_sequence.extend(water_actions)
return action_sequence return action_sequence
def get_vessel_liquid_volume(G: nx.DiGraph, vessel: str) -> float:
"""获取容器中的液体体积(修复版)"""
if vessel not in G.nodes():
return 0.0
vessel_data = G.nodes[vessel].get('data', {})
liquids = vessel_data.get('liquid', [])
total_volume = 0.0
for liquid in liquids:
if isinstance(liquid, dict):
# 支持两种格式:新格式 (name, volume) 和旧格式 (liquid_type, liquid_volume)
volume = liquid.get('volume') or liquid.get('liquid_volume', 0.0)
total_volume += volume
return total_volume
def get_vessel_liquid_types(G: nx.DiGraph, vessel: str) -> List[str]:
"""获取容器中所有液体的类型"""
if vessel not in G.nodes():
return []
vessel_data = G.nodes[vessel].get('data', {})
liquids = vessel_data.get('liquid', [])
liquid_types = []
for liquid in liquids:
if isinstance(liquid, dict):
# 支持两种格式的液体类型字段
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
if liquid_type:
liquid_types.append(liquid_type)
return liquid_types
def find_vessel_by_content(G: nx.DiGraph, content: str) -> List[str]:
"""
根据内容物查找所有匹配的容器
返回匹配容器的ID列表
"""
matching_vessels = []
for node_id in G.nodes():
if G.nodes[node_id].get('type') == 'container':
# 检查容器名称匹配
node_name = G.nodes[node_id].get('name', '').lower()
if content.lower() in node_id.lower() or content.lower() in node_name:
matching_vessels.append(node_id)
continue
# 检查液体类型匹配
vessel_data = G.nodes[node_id].get('data', {})
liquids = vessel_data.get('liquid', [])
config_data = G.nodes[node_id].get('config', {})
# 检查 reagent_name 和 config.reagent
reagent_name = vessel_data.get('reagent_name', '').lower()
config_reagent = config_data.get('reagent', '').lower()
if (content.lower() == reagent_name or
content.lower() == config_reagent):
matching_vessels.append(node_id)
continue
# 检查液体列表
for liquid in liquids:
if isinstance(liquid, dict):
liquid_type = liquid.get('liquid_type') or liquid.get('name', '')
if liquid_type.lower() == content.lower():
matching_vessels.append(node_id)
break
return matching_vessels

View File

@@ -845,6 +845,14 @@ virtual_separator:
data_source: executor data_source: executor
data_key: top_outlet data_key: top_outlet
description: "上相(轻相)液体输出口" description: "上相(轻相)液体输出口"
- handler_key: bind
label: bind
io_type: target
data_type: mechanical
side: WEST
data_source: handle
data_key: mechanical_port
description: "用于连接搅拌器等机械设备的接口"
schema: schema:
type: object type: object
properties: properties:

View File

@@ -3,248 +3,623 @@ workstation:
class: class:
module: unilabos.ros.nodes.presets.protocol_node:ROS2ProtocolNode module: unilabos.ros.nodes.presets.protocol_node:ROS2ProtocolNode
type: ros2 type: ros2
action_value_mappings: action_value_mappings:
AddProtocol: AddProtocol:
type: Add type: Add
goal: goal:
vessel: vessel vessel: vessel
reagent: reagent reagent: reagent
volume: volume volume: volume
mass: mass mass: mass
amount: amount amount: amount
time: time time: time
stir: stir stir: stir
stir_speed: stir_speed stir_speed: stir_speed
viscous: viscous viscous: viscous
purpose: purpose purpose: purpose
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: reagent
label: Reagent
data_type: resource
data_source: handle
data_key: reagent
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
AGVTransferProtocol: AGVTransferProtocol:
type: AGVTransfer type: AGVTransfer
goal: goal:
from_repo: from_repo from_repo: from_repo
from_repo_position: from_repo_position from_repo_position: from_repo_position
to_repo: to_repo to_repo: to_repo
to_repo_position: to_repo_position to_repo_position: to_repo_position
feedback: {} feedback: {}
result: {} result: {}
CentrifugeProtocol: CentrifugeProtocol:
type: Centrifuge type: Centrifuge
goal: goal:
vessel: vessel vessel: vessel
speed: speed speed: speed
time: time time: time
temp: temp temp: temp
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
CleanProtocol: CleanProtocol:
type: Clean type: Clean
goal: goal:
vessel: vessel vessel: vessel
solvent: solvent solvent: solvent
volume: volume volume: volume
temp: temp temp: temp
repeats: repeats repeats: repeats
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: solvent
label: Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
CleanVesselProtocol: CleanVesselProtocol:
type: CleanVessel type: CleanVessel
goal: goal:
vessel: vessel vessel: vessel
solvent: solvent solvent: solvent
volume: volume volume: volume
temp: temp temp: temp
repeats: repeats repeats: repeats
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: solvent
label: Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
DissolveProtocol: DissolveProtocol:
type: Dissolve type: Dissolve
goal: goal:
vessel: vessel vessel: vessel
solvent: solvent solvent: solvent
volume: volume volume: volume
amount: amount amount: amount
temp: temp temp: temp
time: time time: time
stir_speed: stir_speed stir_speed: stir_speed
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: solvent
label: Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
EvacuateAndRefillProtocol: EvacuateAndRefillProtocol:
type: EvacuateAndRefill type: EvacuateAndRefill
goal: goal:
vessel: vessel vessel: vessel
gas: gas gas: gas
repeats: repeats repeats: repeats
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
EvaporateProtocol: EvaporateProtocol:
type: Evaporate type: Evaporate
goal: goal:
vessel: vessel vessel: vessel
pressure: pressure pressure: pressure
temp: temp temp: temp
time: time time: time
stir_speed: stir_speed stir_speed: stir_speed
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
FilterProtocol: FilterProtocol:
type: Filter type: Filter
goal: goal:
vessel: vessel vessel: vessel
filtrate_vessel: filtrate_vessel filtrate_vessel: filtrate_vessel
stir: stir stir: stir
stir_speed: stir_speed stir_speed: stir_speed
temp: temp temp: temp
continue_heatchill: continue_heatchill continue_heatchill: continue_heatchill
volume: volume volume: volume
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: filtrate_vessel
label: Filtrate Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
- handler_key: filtrate_out
label: Filtrate Vessel
data_type: resource
data_source: executor
data_key: vessel
FilterThroughProtocol: FilterThroughProtocol:
type: FilterThrough type: FilterThrough
goal: goal:
from_vessel: from_vessel from_vessel: from_vessel
to_vessel: to_vessel to_vessel: to_vessel
filter_through: filter_through filter_through: filter_through
eluting_solvent: eluting_solvent eluting_solvent: eluting_solvent
eluting_volume: eluting_volume eluting_volume: eluting_volume
eluting_repeats: eluting_repeats eluting_repeats: eluting_repeats
residence_time: residence_time residence_time: residence_time
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: from_vessel
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
- handler_key: solvent
label: Eluting Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: from_vessel_out
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel_out
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
HeatChillProtocol: HeatChillProtocol:
type: HeatChill type: HeatChill
goal: goal:
vessel: vessel vessel: vessel
temp: temp temp: temp
time: time time: time
stir: stir stir: stir
stir_speed: stir_speed stir_speed: stir_speed
purpose: purpose purpose: purpose
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
HeatChillStartProtocol: HeatChillStartProtocol:
type: HeatChillStart type: HeatChillStart
goal: goal:
vessel: vessel vessel: vessel
temp: temp temp: temp
purpose: purpose purpose: purpose
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
HeatChillStopProtocol: HeatChillStopProtocol:
type: HeatChillStop type: HeatChillStop
goal: goal:
vessel: vessel vessel: vessel
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
PumpTransferProtocol: PumpTransferProtocol:
type: PumpTransfer type: PumpTransfer
goal: goal:
from_vessel: from_vessel from_vessel: from_vessel
to_vessel: to_vessel to_vessel: to_vessel
volume: volume volume: volume
amount: amount amount: amount
time: time time: time
viscous: viscous viscous: viscous
rinsing_solvent: rinsing_solvent rinsing_solvent: rinsing_solvent
rinsing_volume: rinsing_volume rinsing_volume: rinsing_volume
rinsing_repeats: rinsing_repeats rinsing_repeats: rinsing_repeats
solid: solid solid: solid
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: from_vessel
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
- handler_key: solvent
label: Rinsing Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: from_vessel_out
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel_out
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
RunColumnProtocol: RunColumnProtocol:
type: RunColumn type: RunColumn
goal: goal:
from_vessel: from_vessel from_vessel: from_vessel
to_vessel: to_vessel to_vessel: to_vessel
column: column column: column
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: from_vessel
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
output:
- handler_key: from_vessel_out
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel_out
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
SeparateProtocol: SeparateProtocol:
type: Separate type: Separate
goal: goal:
purpose: purpose purpose: purpose
product_phase: product_phase product_phase: product_phase
from_vessel: from_vessel from_vessel: from_vessel
separation_vessel: separation_vessel separation_vessel: separation_vessel
to_vessel: to_vessel to_vessel: to_vessel
waste_phase_to_vessel: waste_phase_to_vessel waste_phase_to_vessel: waste_phase_to_vessel
solvent: solvent solvent: solvent
solvent_volume: solvent_volume solvent_volume: solvent_volume
through: through through: through
repeats: repeats repeats: repeats
stir_time: stir_time stir_time: stir_time
stir_speed: stir_speed stir_speed: stir_speed
settling_time: settling_time settling_time: settling_time
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: from_vessel
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
- handler_key: solvent
label: Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: from_vessel_out
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel_out
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
StartStirProtocol: StartStirProtocol:
type: StartStir type: StartStir
goal: goal:
vessel: vessel vessel: vessel
stir_speed: stir_speed stir_speed: stir_speed
purpose: purpose purpose: purpose
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
StirProtocol: StirProtocol:
type: Stir type: Stir
goal: goal:
stir_time: stir_time stir_time: stir_time
stir_speed: stir_speed stir_speed: stir_speed
settling_time: settling_time settling_time: settling_time
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
StopStirProtocol: StopStirProtocol:
type: StopStir type: StopStir
goal: goal:
vessel: vessel vessel: vessel
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel
data_type: resource
data_source: executor
data_key: vessel
TransferProtocol: TransferProtocol:
type: Transfer type: Transfer
goal: goal:
from_vessel: from_vessel from_vessel: from_vessel
to_vessel: to_vessel to_vessel: to_vessel
volume: volume volume: volume
amount: amount amount: amount
time: time time: time
viscous: viscous viscous: viscous
rinsing_solvent: rinsing_solvent rinsing_solvent: rinsing_solvent
rinsing_volume: rinsing_volume rinsing_volume: rinsing_volume
rinsing_repeats: rinsing_repeats rinsing_repeats: rinsing_repeats
solid: solid solid: solid
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: from_vessel
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
- handler_key: solvent
label: Rinsing Solvent
data_type: resource
data_source: handle
data_key: solvent
output:
- handler_key: from_vessel_out
label: From Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: to_vessel_out
label: To Vessel
data_type: resource
data_source: executor
data_key: vessel
WashSolidProtocol: WashSolidProtocol:
type: WashSolid type: WashSolid
goal: goal:
vessel: vessel vessel: vessel
solvent: solvent solvent: solvent
volume: volume volume: volume
filtrate_vessel: filtrate_vessel filtrate_vessel: filtrate_vessel
temp: temp temp: temp
stir: stir stir: stir
stir_speed: stir_speed stir_speed: stir_speed
time: time time: time
repeats: repeats repeats: repeats
feedback: {} feedback: {}
result: {} result: {}
handles:
input:
- handler_key: vessel
label: Vessel
data_type: resource
data_source: handle
data_key: vessel
- handler_key: solvent
label: Solvent
data_type: resource
data_source: handle
data_key: solvent
- handler_key: filtrate_vessel
label: Filtrate Vessel
data_type: resource
data_source: executor
data_key: vessel
output:
- handler_key: vessel_out
label: Vessel Out
data_type: resource
data_source: handle
data_key: vessel
- handler_key: filtrate_vessel_out
label: Filtrate Vessel
data_type: resource
data_source: executor
data_key: vessel

View File

@@ -1,5 +1,6 @@
container: container:
description: regular organic container description: regular organic container
icon: Flask.webp
class: class:
module: unilabos.resources.container:RegularContainer module: unilabos.resources.container:RegularContainer
type: unilabos type: unilabos