fix vessel_id param passing in protocols

This commit is contained in:
Junhan Chang
2025-07-25 17:38:17 +08:00
parent 1b086a85f5
commit 0584bd5e04
10 changed files with 94 additions and 10 deletions

View File

@@ -346,7 +346,16 @@ def generate_add_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
# 🔧 修改:更新容器的液体体积(假设有 liquid_volume 字段)
if "data" in vessel and "liquid_volume" in vessel["data"]:

View File

@@ -237,7 +237,10 @@ def generate_adjust_ph_protocol(
# 统一处理vessel参数
if isinstance(vessel, dict):
vessel_id = list(vessel.values())[0].get("id", "")
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)

View File

@@ -181,7 +181,16 @@ def generate_clean_vessel_protocol(
clean_protocol = generate_clean_vessel_protocol(G, {"id": "main_reactor"}, "water", 100.0, 60.0, 2)
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
action_sequence = []

View File

@@ -288,7 +288,16 @@ def generate_evacuateandrefill_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
# 硬编码重复次数为 3
repeats = 3

View File

@@ -201,7 +201,16 @@ def generate_evaporate_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
debug_print("🌟" * 20)
debug_print("🌪️ 开始生成蒸发协议(支持单位和体积运算)✨")

View File

@@ -68,7 +68,16 @@ def generate_filter_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
debug_print("🌊" * 20)
debug_print("🚀 开始生成过滤协议(支持体积运算)✨")

View File

@@ -217,7 +217,16 @@ def generate_heat_chill_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
debug_print("🌡️" * 20)
debug_print("🚀 开始生成加热冷却协议支持vessel字典")

View File

@@ -170,7 +170,16 @@ def generate_hydrogenate_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
action_sequence = []

View File

@@ -287,7 +287,16 @@ def generate_recrystallize_protocol(
"""
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
action_sequence = []

View File

@@ -418,7 +418,16 @@ def generate_separate_protocol(
raise ValueError("必须提供vessel字典参数")
# 🔧 核心修改从字典中提取容器ID
vessel_id = vessel["id"]
# 统一处理vessel参数
if isinstance(vessel, dict):
if "id" not in vessel:
vessel_id = list(vessel.values())[0].get("id", "")
else:
vessel_id = vessel.get("id", "")
vessel_data = vessel.get("data", {})
else:
vessel_id = str(vessel)
vessel_data = G.nodes[vessel_id].get("data", {}) if vessel_id in G.nodes() else {}
debug_print("🌀" * 20)
debug_print("🚀 开始生成分离协议支持vessel字典和体积运算")