Skip to content

commands: improve error handling for id extraction #3075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
Jan 6, 2026
Merged

commands: improve error handling for id extraction #3075

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
897e152
commands: improve error handling for id extraction
LKuemmel Jan 5, 2026
5d3f1ff
flake8
LKuemmel Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 30 additions & 29 deletions packages/helpermodules/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,37 +76,38 @@ def __init__(self, event_command_completed: Event):

def _get_max_ids(self) -> None:
""" ermittelt die maximale ID vom Broker """
plan_extractors = {
"autolock_plan": lambda p: p.get("autolock", {}).get("plans", []),
"charge_template_scheduled_plan": lambda p: p.get("chargemode", {}).get("scheduled_charging",
{}).get("plans", []),
"charge_template_time_charging_plan": lambda p: p.get("time_charging", {}).get("plans", [])
}
try:
received_topics = ProcessBrokerBranch("").get_max_id()
for id_topic, topic_str, default in self.MAX_IDS["nested payload"]:
max_id = default
for topic, payload in received_topics.items():
if re.search(topic_str, topic) is not None:
if id_topic == "autolock_plan":
for plan in payload["autolock"]["plans"]:
max_id = max(plan["id"], max_id)
elif id_topic == "charge_template_scheduled_plan":
for plan in payload["chargemode"]["scheduled_charging"]["plans"]:
max_id = max(plan["id"], max_id)
elif id_topic == "charge_template_time_charging_plan":
for plan in payload["time_charging"]["plans"]:
max_id = max(plan["id"], max_id)
setattr(self, f'max_id_{id_topic}', max_id)
Pub().pub("openWB/set/command/max_id/"+id_topic, max_id)
for id_topic, topic_str, default in self.MAX_IDS["topic"]:
max_id = default
for topic in received_topics.keys():
if re.search(topic_str, topic) is not None:
max_id = max(int(get_index(topic)), max_id)
setattr(self, f'max_id_{id_topic}', max_id)
Pub().pub("openWB/set/command/max_id/"+id_topic, max_id)
for id_topic, topic_str, default in self.MAX_IDS["payload"]:
max_id = default
for topic, payload in received_topics.items():
if re.search(topic_str, topic) is not None:
max_id = max(payload["id"], max_id)
setattr(self, f'max_id_{id_topic}', max_id)
Pub().pub("openWB/set/command/max_id/"+id_topic, max_id)
for max_id_type in self.MAX_IDS.keys():
for id_topic, topic_str, default in self.MAX_IDS[max_id_type]:
max_id = default
for topic, payload in received_topics.items():
try:
if max_id_type == "nested payload":
if re.search(topic_str, topic) is not None:
extractor = plan_extractors.get(id_topic)
for plan in extractor(payload):
try:
max_id = max(plan["id"], max_id)
except Exception:
log.exception(f"Fehler beim Ermitteln der maximalen ID für {id_topic} "
f"beim {id_topic}")
elif max_id_type == "topic":
if re.search(topic_str, topic) is not None:
max_id = max(int(get_index(topic)), max_id)
elif max_id_type == "payload":
if re.search(topic_str, topic) is not None:
max_id = max(payload["id"], max_id)
except Exception:
log.exception(f"Fehler beim Ermitteln der maximalen ID für {id_topic}")
setattr(self, f'max_id_{id_topic}', max_id)
Pub().pub(f"openWB/set/command/max_id/{id_topic}", max_id)
except Exception:
log.exception("Fehler im Command-Modul")

Expand Down