From 13bbb350602b46666f436057d349f72889529531 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Mon, 16 Jun 2025 13:08:08 +0200 Subject: [PATCH 01/25] cards display: switch to integrated plans --- .../cards/source/src/stores/mqtt.js | 20 ++++-- .../source/src/views/ChargePointsView.vue | 63 ++++++++++++------- 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/packages/modules/display_themes/cards/source/src/stores/mqtt.js b/packages/modules/display_themes/cards/source/src/stores/mqtt.js index 562b023f6a..f53d0eb91f 100644 --- a/packages/modules/display_themes/cards/source/src/stores/mqtt.js +++ b/packages/modules/display_themes/cards/source/src/stores/mqtt.js @@ -835,16 +835,24 @@ export const useMqttStore = defineStore("mqtt", { }, getChargePointConnectedVehicleScheduledChargingPlans(state) { return (chargePointId) => { - return state.getWildcardTopics( - `openWB/chargepoint/${chargePointId}/set/charge_template/chargemode/scheduled_charging/plans/+`, - ); + if (state.getChargePointConnectedVehicleChargeTemplate(chargePointId)) { + return state.getChargePointConnectedVehicleChargeTemplate( + chargePointId, + ).chargemode.scheduled_charging.plans; + } + return {}; }; }, getChargePointConnectedVehicleTimeChargingPlans(state) { return (chargePointId) => { - return state.getWildcardTopics( - `openWB/chargepoint/${chargePointId}/set/charge_template/time_charging/plans/+`, - ); + if ( + state.getChargePointConnectedVehicleChargeTemplate(chargePointId) + ) { + return state.getChargePointConnectedVehicleChargeTemplate( + chargePointId, + ).time_charging.plans; + } + return {}; }; }, diff --git a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue index ebbe1c61b4..e3f878e0fd 100644 --- a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue +++ b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue @@ -338,23 +338,34 @@ export default { } }, setChargePointConnectedVehicleScheduledChargingPlanActive( - plan_key, + id, + plan_id, active, ) { - const plan = this.mqttStore.updateState( - `${plan_key}`, + console.log(`setChargePointConnectedVehicleScheduledChargingPlanActive: ${id} ${plan_id} - ${active}`); + const templateTopic = `openWB/chargepoint/${id}/set/charge_template`; + const template = this.mqttStore.updateState( + templateTopic, active, - "active", + `chargemode.scheduled_charging.plans.${plan_id}.active`, + ); + this.$root.sendTopicToBroker( + templateTopic, + template, ); - this.$root.sendTopicToBroker(`${plan_key}`, plan); }, - setChargePointConnectedVehicleTimeChargingPlanActive(plan_key, active) { - const plan = this.mqttStore.updateState( - `${plan_key}`, + setChargePointConnectedVehicleTimeChargingPlanActive(id, plan_id, active) { + console.log(`setChargePointConnectedVehicleTimeChargingPlanActive: ${id} ${plan_id} - ${active}`); + const templateTopic = `openWB/chargepoint/${id}/set/charge_template`; + const template = this.mqttStore.updateState( + templateTopic, active, - "active", + `time_charging.plans.${plan_id}.active`, + ) + this.$root.sendTopicToBroker( + templateTopic, + template, ); - this.$root.sendTopicToBroker(`${plan_key}`, plan); }, }, }; @@ -1254,11 +1265,14 @@ export default { > @@ -1287,7 +1301,8 @@ export default { :color="plan.active ? 'success' : 'danger'" @click=" setChargePointConnectedVehicleScheduledChargingPlanActive( - planKey, + modalChargePointId, + plan.id, !plan.active, ) " @@ -1388,11 +1403,14 @@ export default { @@ -1421,7 +1439,8 @@ export default { :color="plan.active ? 'success' : 'danger'" @click=" setChargePointConnectedVehicleTimeChargingPlanActive( - planKey, + modalChargePointId, + plan.id, !plan.active, ) " From 1cf95df0084847da0b306516d3fd6da42436867c Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 17 Jun 2025 08:58:26 +0200 Subject: [PATCH 02/25] standard-legacy: switch to integrated plans --- .../web_themes/standard_legacy/web/index.html | 58 +++++++++++----- .../standard_legacy/web/processAllMqttMsg.js | 68 +++---------------- 2 files changed, 52 insertions(+), 74 deletions(-) diff --git a/packages/modules/web_themes/standard_legacy/web/index.html b/packages/modules/web_themes/standard_legacy/web/index.html index 685657de90..a45fefb34b 100644 --- a/packages/modules/web_themes/standard_legacy/web/index.html +++ b/packages/modules/web_themes/standard_legacy/web/index.html @@ -577,7 +577,9 @@

Termine Zeitladen

Es wurden noch keine Zeitpläne eingerichtet!
+ data-plan-type="time_charging" + data-plan="" + >
--
@@ -1547,7 +1549,7 @@

// some helper functions 'helperFunctions.js?ver=20250217', // functions for processing messages - 'processAllMqttMsg.js?ver=20250326', + 'processAllMqttMsg.js?ver=20250617', // respective Chart.js definition live 'livechart.js?ver=20250404', // respective Chart.js definition price based charging @@ -1627,14 +1629,26 @@

$('.container').on('click', '.charge-point-time-charge-pill', function (event) { event.stopPropagation(); - var parentChargePoint = $(this).closest('[data-cp]'); - var chargePointIndex = parseInt(parentChargePoint.data('cp')); - var planId = parseInt($(this).closest('.charge-point-time-charge-plan').data('plan')); + const parentChargePoint = $(this).closest('[data-cp]'); + const chargePointIndex = parseInt(parentChargePoint.data('cp')); + const planId = parseInt($(this).closest('.charge-point-time-charge-plan').data('plan')); if (!isNaN(chargePointIndex) && !isNaN(planId)) { - var plan = timeChargePlan[chargePointIndex][planId]; - if (plan !== undefined) { - plan.active = !plan.active; - publish(plan, `openWB/set/chargepoint/${chargePointIndex}/set/charge_template/time_charging/plans/${planId}`); + console.log('toggle time charge plan', chargePointIndex, planId); + const object = "chargeTemplate"; + const objectPath = "time_charging.plans." + planId + ".active"; + const topic = "openWB/set/chargepoint/" + chargePointIndex + "/set/charge_template"; + const option = !$(this).hasClass('charge-point-time-charge-active'); + if (typeof window[object] !== undefined && window[object][chargePointIndex] !== undefined) { + let currentObjectState = JSON.parse(JSON.stringify(window[object][chargePointIndex])); + currentObjectState = updateObject(currentObjectState, objectPath, option); + console.log( + 'toggle time charge plan', + 'topic: ' + topic, + currentObjectState, + ); + publish(currentObjectState, topic); + } else { + console.warn('no variable '+ object + ' found for charge point ' + chargePointIndex); } } }); @@ -1648,14 +1662,26 @@

$('.container').on('click', '.charge-point-schedule-plan-pill', function (event) { event.stopPropagation(); - var parentChargePoint = $(this).closest('[data-cp]'); - var chargePointIndex = parseInt(parentChargePoint.data('cp')); - var planId = parseInt($(this).closest('.charge-point-schedule-plan').data('plan')); + const parentChargePoint = $(this).closest('[data-cp]'); + const chargePointIndex = parseInt(parentChargePoint.data('cp')); + const planId = parseInt($(this).closest('.charge-point-schedule-plan').data('plan')); if (!isNaN(chargePointIndex) && !isNaN(planId)) { - var plan = schedulePlan[chargePointIndex][planId]; - if (plan !== undefined) { - plan.active = !plan.active; - publish(plan, `openWB/set/chargepoint/${chargePointIndex}/set/charge_template/chargemode/scheduled_charging/plans/${planId}`); + console.log('toggle schedule plan', chargePointIndex, planId); + const object = "chargeTemplate"; + const objectPath = "chargemode.scheduled_charging.plans." + planId + ".active"; + const topic = "openWB/set/chargepoint/" + chargePointIndex + "/set/charge_template"; + const option = !$(this).hasClass('charge-point-schedule-active'); + if (typeof window[object] !== undefined && window[object][chargePointIndex] !== undefined) { + let currentObjectState = JSON.parse(JSON.stringify(window[object][chargePointIndex])); + currentObjectState = updateObject(currentObjectState, objectPath, option); + console.log( + 'toggle schedule charge plan', + 'topic: ' + topic, + currentObjectState, + ); + publish(currentObjectState, topic); + } else { + console.warn('no variable '+ object + ' found for charge point ' + chargePointIndex); } } }); diff --git a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js index 8c9b15a0c3..ba7c1c49e2 100644 --- a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js +++ b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js @@ -11,8 +11,6 @@ var themeConfiguration = { }; var graphRefreshCounter = 0; var chargeTemplate = {}; -var schedulePlan = {}; -var timeChargePlan = {}; var vehicleSoc = {}; var evuCounterIndex = undefined; var chartLabels = { @@ -265,9 +263,12 @@ function refreshChargeTemplate(chargePointIndex) { // remove checkbox toggle button style as they will not function after cloning sourceElement.find('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle('destroy'); // now create any other schedule plan - if (chargePointIndex in schedulePlan) { + if ( + Object.prototype.hasOwnProperty.call(chargeTemplate[chargePointIndex].chargemode.scheduled_charging, 'plans') && + Object.keys(chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans).length > 0 + ) { chargePoint.find(".charge-point-schedule-plan-missing").addClass("hide"); - for (const [key, value] of Object.entries(schedulePlan[chargePointIndex])) { + for (const [key, value] of Object.entries(chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans)) { // console.debug("schedule", key, value); if (chargePoint.find('.charge-point-schedule-plan[data-plan=' + key + ']').length == 0) { // console.log('creating schedule plan with id "'+key+'"'); @@ -355,10 +356,12 @@ function refreshChargeTemplate(chargePointIndex) { // remove checkbox toggle button style as they will not function after cloning sourceElement.find('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle('destroy'); // now create any other schedule plan - if (chargePointIndex in timeChargePlan) { - // console.log("time charge plan found", chargePointIndex, timeChargePlan[chargePointIndex]); + if ( + Object.prototype.hasOwnProperty.call(chargeTemplate[chargePointIndex].time_charging, 'plans') && + Object.keys(chargeTemplate[chargePointIndex].time_charging.plans).length > 0 + ) { chargePoint.find(".charge-point-time-charge-plan-missing").addClass("hide"); - for (const [key, value] of Object.entries(timeChargePlan[chargePointIndex])) { + for (const [key, value] of Object.entries(chargeTemplate[chargePointIndex].time_charging.plans)) { // console.debug("schedule", key, value); if (chargePoint.find('.charge-point-time-charge-plan[data-plan=' + key + ']').length == 0) { // console.log('creating time charge plan with id "'+key+'"'); @@ -1061,57 +1064,6 @@ function processChargePointMessages(mqttTopic, mqttPayload) { delete chargeTemplate[chargePointIndex]; } refreshChargeTemplate(chargePointIndex); - } else if (mqttTopic.match(/^openwb\/chargepoint\/[0-9]+\/set\/charge_template\/chargemode\/scheduled_charging\/plans\/[0-9]+$/i)) { - chargePointIndex = getIndex(mqttTopic); - planIndex = mqttTopic.match(/[0-9]+$/i)[0]; - // check for empty payload - if (mqttPayload.length > 2) { - try { - const newPlan = JSON.parse(mqttPayload); - if (!(chargePointIndex in schedulePlan)) { - schedulePlan[chargePointIndex] = {}; - } - schedulePlan[chargePointIndex][planIndex] = newPlan; - } catch (error) { - console.error("error parsing schedule plan!"); - delete schedulePlan[chargePointIndex][planIndex]; - if (Object.keys(schedulePlan[chargePointIndex]).length == 0) { - delete schedulePlan[chargePointIndex]; - } - } - } else { - delete schedulePlan[chargePointIndex][planIndex]; - if (Object.keys(schedulePlan[chargePointIndex]).length == 0) { - delete schedulePlan[chargePointIndex]; - } - } - refreshChargeTemplate(chargePointIndex); - } else if (mqttTopic.match(/^openwb\/chargepoint\/[0-9]+\/set\/charge_template\/time_charging\/plans\/[0-9]+$/i)) { - chargePointIndex = getIndex(mqttTopic); - planIndex = mqttTopic.match(/[0-9]+$/i)[0]; - // check for empty payload - if (mqttPayload.length > 2) { - try { - // console.log("received time charge plan", chargePointIndex, planIndex, mqttPayload); - const newPlan = JSON.parse(mqttPayload); - if (!(chargePointIndex in timeChargePlan)) { - timeChargePlan[chargePointIndex] = {}; - } - timeChargePlan[chargePointIndex][planIndex] = newPlan; - } catch (error) { - console.error("error parsing time charge plan!"); - delete timeChargePlan[chargePointIndex][planIndex]; - if (Object.keys(timeChargePlan[chargePointIndex]).length == 0) { - delete timeChargePlan[chargePointIndex]; - } - } - } else { - delete timeChargePlan[chargePointIndex][planIndex]; - if (Object.keys(timeChargePlan[chargePointIndex]).length == 0) { - delete timeChargePlan[chargePointIndex]; - } - } - refreshChargeTemplate(chargePointIndex); } } From 9f580aac96b3cb830ae1117f5c9dd824a2a50887 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 16 Jun 2025 17:01:55 +0200 Subject: [PATCH 03/25] backend --- packages/control/chargepoint/chargepoint.py | 40 +------- packages/control/ev/charge_template.py | 4 - packages/helpermodules/command.py | 28 +++--- packages/helpermodules/subdata.py | 100 ++++++-------------- 4 files changed, 48 insertions(+), 124 deletions(-) diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py index cd2f1d9d3f..95593c7b9c 100644 --- a/packages/control/chargepoint/chargepoint.py +++ b/packages/control/chargepoint/chargepoint.py @@ -14,7 +14,6 @@ Tag-Liste: Tags, mit denen der Ladepunkt freigeschaltet werden kann. Ist diese leer, kann mit jedem Tag der Ladepunkt freigeschaltet werden. """ -import copy from dataclasses import asdict import dataclasses import logging @@ -35,7 +34,6 @@ from control.ev.ev import Ev from control import phase_switch from control.chargepoint.chargepoint_state import CHARGING_STATES, ChargepointState -from helpermodules.abstract_plans import ScheduledChargingPlan, TimeChargingPlan from helpermodules.broker import BrokerClient from helpermodules.phase_mapping import convert_single_evu_phase_to_cp_phase from helpermodules.pub import Pub @@ -800,41 +798,9 @@ def __get_payload(client, userdata, msg): Pub().pub(topic, "") def update_charge_template(self, charge_template: ChargeTemplate) -> None: - self._clear_template_topics(f'openWB/chargepoint/{self.num}/set/charge_template/#') - self.data.set.charge_template = copy.deepcopy(charge_template) - pub_template = copy.deepcopy(self.data.set.charge_template.data) - pub_template = dataclasses.asdict(pub_template) - pub_template["chargemode"]["scheduled_charging"]["plans"].clear() - pub_template["time_charging"]["plans"].clear() - Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template", pub_template) - for id, plan in self.data.set.charge_template.data.time_charging.plans.items(): - Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template/time_charging/plans/{id}", - dataclasses.asdict(plan)) - for id, plan in self.data.set.charge_template.data.chargemode.scheduled_charging.plans.items(): - Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template/chargemode/scheduled_charging/plans/{id}", - dataclasses.asdict(plan)) - - def update_bare_charge_template(self, charge_template: ChargeTemplate) -> None: - self._clear_template_topics(f"openWB/chargepoint/{self.num}/set/charge_template") - self.data.set.charge_template = copy.deepcopy(charge_template) - pub_template = copy.deepcopy(self.data.set.charge_template.data) - pub_template = dataclasses.asdict(pub_template) - pub_template["chargemode"]["scheduled_charging"]["plans"].clear() - pub_template["time_charging"]["plans"].clear() - Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template", pub_template) - - def update_charge_template_scheduled_plan(self, plan: ScheduledChargingPlan) -> None: - self._clear_template_topics( - f"openWB/chargepoint/{self.num}/set/charge_template/chargemode/scheduled_charging/plans/{plan.id}") - Pub().pub(f"openWB/set/chargepoint/{self.num}" - f"/set/charge_template/chargemode/scheduled_charging/plans/{plan.id}", - dataclasses.asdict(plan)) - - def update_charge_template_time_plan(self, plan: TimeChargingPlan) -> None: - self._clear_template_topics( - f"openWB/chargepoint/{self.num}/set/charge_template/time_charging/plans/{plan.id}") - Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template/time_charging/plans/{plan.id}", - dataclasses.asdict(plan)) + Pub().pub(f'openWB/chargepoint/{self.num}/set/charge_template', "") + Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template", + dataclasses.asdict(charge_template.data)) def _pub_connected_vehicle(self, vehicle: Ev): """ published die Daten, die zur Anzeige auf der Hauptseite benötigt werden. diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index e1b822304d..f2766985e3 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -17,15 +17,11 @@ def get_new_charge_template() -> dict: ct_default = asdict(ChargeTemplateData()) - ct_default["chargemode"]["scheduled_charging"].pop("plans") - ct_default["time_charging"].pop("plans") return ct_default def get_charge_template_default() -> dict: ct_default = asdict(ChargeTemplateData(name="Standard-Lade-Profil")) - ct_default["chargemode"]["scheduled_charging"].pop("plans") - ct_default["time_charging"].pop("plans") return ct_default diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 45609d3c35..7810d4cada 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -494,10 +494,11 @@ def addChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> No new_charge_template_schedule_plan = ScheduledChargingPlan() new_id = self.max_id_charge_template_scheduled_plan + 1 new_charge_template_schedule_plan.id = new_id + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.update({ + new_id: new_charge_template_schedule_plan}) Pub().pub( - f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}' - f'/chargemode/scheduled_charging/plans/{new_id}', - dataclass_utils.asdict(new_charge_template_schedule_plan)) + f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}', + dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) self.max_id_charge_template_scheduled_plan = new_id Pub().pub( "openWB/set/command/max_id/charge_template_scheduled_plan", new_id) @@ -515,10 +516,11 @@ def removeChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> payload, connection_id, f'Die ID \'{payload["data"]["plan"]}\' ist größer als die maximal vergebene ' f'ID \'{self.max_id_charge_template_scheduled_plan}\'.', MessageType.ERROR) + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.pop( + payload["data"]["plan"]) Pub().pub( - f'openWB/vehicle/template/charge_template/{payload["data"]["template"]}' - f'/chargemode/scheduled_charging/plans/{payload["data"]["plan"]}', - "") + f'openWB/vehicle/template/charge_template/{payload["data"]["template"]}', + dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) pub_user_message( payload, connection_id, f'Zielladen-Plan mit ID \'{payload["data"]["plan"]}\' von Profil ' @@ -537,10 +539,11 @@ def addChargeTemplateTimeChargingPlan(self, connection_id: str, payload: dict) - new_time_charging_plan = TimeChargingPlan() new_id = self.max_id_charge_template_time_charging_plan + 1 new_time_charging_plan.id = new_id + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans.update({ + new_id: new_time_charging_plan}) Pub().pub( - f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}' - f'/time_charging/plans/{new_id}', - dataclass_utils.asdict(new_time_charging_plan)) + f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}', + dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) self.max_id_charge_template_time_charging_plan = new_id Pub().pub( "openWB/set/command/max_id/charge_template_time_charging_plan", new_id) @@ -555,10 +558,11 @@ def removeChargeTemplateTimeChargingPlan(self, connection_id: str, payload: dict if self.max_id_charge_template_time_charging_plan < payload["data"]["plan"]: log.error(payload, connection_id, "Die ID ist größer als die maximal vergebene ID.", MessageType.ERROR) + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans.pop( + payload["data"]["plan"]) Pub().pub( - f'openWB/vehicle/template/charge_template/{payload["data"]["template"]}' - f'/time_charging/plans/{payload["data"]["plan"]}', - "") + f'openWB/vehicle/template/charge_template/{payload["data"]["template"]}', + dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) pub_user_message( payload, connection_id, f'Zeitladen-Plan mit ID \'{payload["data"]["plan"]}\' zu Profil ' diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index 30da426397..a329174d13 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -350,75 +350,26 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate], var.pop("ct"+index) if "ct"+index not in var: var["ct"+index] = ChargeTemplate() - self.process_charge_template_topic(var["ct"+index], msg) - if re.search("/vehicle/template/charge_template/[0-9]+", msg.topic) is not None: - # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird - for vehicle in self.ev_data.values(): - if vehicle.data.charge_template == int(index): - for cp in self.cp_data.values(): - if ((cp.chargepoint.data.set.charging_ev != -1 and - cp.chargepoint.data.set.charging_ev == vehicle.num) or - cp.chargepoint.data.config.ev == vehicle.num): - # UI sendet immer alle Topics, auch nicht geänderte. Damit die temporären Topics nicht - # mehrfach gepbulished werden, muss das publishen der temporären Topics 1:1 erfolgen. - if re.search("/vehicle/template/charge_template/[0-9]+$", msg.topic) is not None: - if decode_payload(msg.payload) == "": - Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/charge_template", "") - else: - cp.chargepoint.update_bare_charge_template(var["ct"+index]) - elif re.search("/vehicle/template/charge_template/[0-9]+/chargemode/scheduled_charging/" - "plans/[0-9]+", msg.topic) is not None: - plan_id = get_second_index(msg.topic) - if decode_payload(msg.payload) == "": - Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template/" - f"chargemode/scheduled_charging/plans/{plan_id}", "") - else: - cp.chargepoint.update_charge_template_scheduled_plan( - var["ct"+index].data.chargemode.scheduled_charging.plans[plan_id]) - elif re.search("/vehicle/template/charge_template/[0-9]+/time_charging/plans/[0-9]+", - msg.topic) is not None: - plan_id = get_second_index(msg.topic) - if decode_payload(msg.payload) == "": - Pub().pub( - f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template/" - f"time_charging/plans/{plan_id}", "") - else: - cp.chargepoint.update_charge_template_time_plan( - var["ct"+index].data.time_charging.plans[plan_id]) - except Exception: - log.exception("Fehler im subdata-Modul") - - def process_charge_template_topic(self, var: ChargeTemplate, msg: mqtt.MQTTMessage): - try: - if re.search("/chargemode/scheduled_charging/plans/[0-9]+$", msg.topic) is not None: - index_second = get_second_index(msg.topic) - if decode_payload(msg.payload) == "": - try: - var.data.chargemode.scheduled_charging.plans.pop(index_second) - except KeyError: - log.error(f"Es konnte kein Zielladen-Plan mit der ID {index_second} " - "in dem Lade-Profil gefunden werden.") - else: - var.data.chargemode.scheduled_charging.plans[ - index_second] = dataclass_from_dict(ScheduledChargingPlan, decode_payload(msg.payload)) - elif re.search("/time_charging/plans/[0-9]+$", msg.topic) is not None: - index_second = get_second_index(msg.topic) - if decode_payload(msg.payload) == "": - try: - var.data.time_charging.plans.pop(index_second) - except KeyError: - log.error("Es konnte kein Zeitladen-Plan mit der ID " + - str(index_second)+" in dem Lade-Profil gefunden werden.") - else: - var.data.time_charging.plans[ - index_second] = dataclass_from_dict(TimeChargingPlan, decode_payload(msg.payload)) - else: - # Pläne unverändert übernehmen - scheduled_charging_plans = var.data.chargemode.scheduled_charging.plans - time_charging_plans = var.data.time_charging.plans - var.data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload)) - var.data.time_charging.plans = time_charging_plans - var.data.chargemode.scheduled_charging.plans = scheduled_charging_plans + var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload)) + for plan_id, plan in var["ct"+index].data.chargemode.scheduled_charging.plans.items(): + var["ct" + + index].data.chargemode.scheduled_charging.plans[plan_id] = dataclass_from_dict(ScheduledChargingPlan, plan) + for plan_id, plan in var["ct"+index].data.time_charging.plans.items(): + var["ct"+index].data.time_charging.plans[plan_id] = dataclass_from_dict(TimeChargingPlan, plan) + # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird + for vehicle in self.ev_data.values(): + if vehicle.data.charge_template == int(index): + for cp in self.cp_data.values(): + if ((cp.chargepoint.data.set.charging_ev != -1 and + cp.chargepoint.data.set.charging_ev == vehicle.num) or + cp.chargepoint.data.config.ev == vehicle.num): + # UI sendet immer alle Topics, auch nicht geänderte. Damit die temporären Topics nicht + # mehrfach gepbulished werden, muss das publishen der temporären Topics 1:1 erfolgen. + if re.search("/vehicle/template/charge_template/[0-9]+$", msg.topic) is not None: + if decode_payload(msg.payload) == "": + Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template", "") + else: + cp.chargepoint.update_charge_template() except Exception: log.exception("Fehler im subdata-Modul") @@ -482,8 +433,15 @@ def process_chargepoint_topic(self, var: Dict[str, chargepoint.Chargepoint], msg Log, decode_payload(msg.payload)) else: if "charge_template" in msg.topic: - self.process_charge_template_topic( - var["cp"+index].chargepoint.data.set.charge_template, msg) + var["cp"+index].chargepoint.data.set.charge_template = ChargeTemplate() + var["cp"+index].chargepoint.data.set.charge_template.data = dataclass_from_dict( + ChargeTemplateData, decode_payload(msg.payload)) + for plan_id, plan in var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans.items(): + var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans[plan_id] = dataclass_from_dict( + ScheduledChargingPlan, plan) + for plan_id, plan in var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans.items(): + var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans[plan_id] = dataclass_from_dict( + TimeChargingPlan, plan) else: self.set_json_payload_class(var["cp"+index].chargepoint.data.set, msg) elif re.search("/chargepoint/[0-9]+/get/", msg.topic) is not None: From 87150b39ad7613a973eacd7aae1a915f5f17e269 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 08:00:40 +0200 Subject: [PATCH 04/25] fixes --- packages/control/chargepoint/chargepoint.py | 1 - packages/helpermodules/subdata.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py index 95593c7b9c..8cdb0734c2 100644 --- a/packages/control/chargepoint/chargepoint.py +++ b/packages/control/chargepoint/chargepoint.py @@ -798,7 +798,6 @@ def __get_payload(client, userdata, msg): Pub().pub(topic, "") def update_charge_template(self, charge_template: ChargeTemplate) -> None: - Pub().pub(f'openWB/chargepoint/{self.num}/set/charge_template', "") Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template", dataclasses.asdict(charge_template.data)) diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index a329174d13..7f185c09a0 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -369,7 +369,7 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate], if decode_payload(msg.payload) == "": Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template", "") else: - cp.chargepoint.update_charge_template() + cp.chargepoint.update_charge_template(var["ct"+index]) except Exception: log.exception("Fehler im subdata-Modul") From 32e4d0973df00050341d301d37c8c483e33dc22b Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 17 Jun 2025 09:26:38 +0200 Subject: [PATCH 05/25] standard legacy: switch to plan lists --- .../standard_legacy/web/processAllMqttMsg.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js index ba7c1c49e2..e77fe831ef 100644 --- a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js +++ b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js @@ -265,10 +265,11 @@ function refreshChargeTemplate(chargePointIndex) { // now create any other schedule plan if ( Object.prototype.hasOwnProperty.call(chargeTemplate[chargePointIndex].chargemode.scheduled_charging, 'plans') && - Object.keys(chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans).length > 0 + chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans.length > 0 ) { chargePoint.find(".charge-point-schedule-plan-missing").addClass("hide"); - for (const [key, value] of Object.entries(chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans)) { + for (const value of chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans) { + const key = value.id; // console.debug("schedule", key, value); if (chargePoint.find('.charge-point-schedule-plan[data-plan=' + key + ']').length == 0) { // console.log('creating schedule plan with id "'+key+'"'); @@ -358,10 +359,11 @@ function refreshChargeTemplate(chargePointIndex) { // now create any other schedule plan if ( Object.prototype.hasOwnProperty.call(chargeTemplate[chargePointIndex].time_charging, 'plans') && - Object.keys(chargeTemplate[chargePointIndex].time_charging.plans).length > 0 + chargeTemplate[chargePointIndex].time_charging.plans.length > 0 ) { chargePoint.find(".charge-point-time-charge-plan-missing").addClass("hide"); - for (const [key, value] of Object.entries(chargeTemplate[chargePointIndex].time_charging.plans)) { + for (const value of chargeTemplate[chargePointIndex].time_charging.plans) { + const key = value.id; // console.debug("schedule", key, value); if (chargePoint.find('.charge-point-time-charge-plan[data-plan=' + key + ']').length == 0) { // console.log('creating time charge plan with id "'+key+'"'); From d47cfafb42fa6882ecf1b2ccca6a633c2fba7437 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 17 Jun 2025 09:36:08 +0200 Subject: [PATCH 06/25] cards display: switch to plan lists --- .../cards/source/src/views/ChargePointsView.vue | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue index e3f878e0fd..561e5d9a4f 100644 --- a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue +++ b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue @@ -1268,10 +1268,8 @@ export default { !mqttStore.getChargePointConnectedVehicleScheduledChargingPlans( modalChargePointId, ) || - Object.keys( - mqttStore.getChargePointConnectedVehicleScheduledChargingPlans( - modalChargePointId, - ), + mqttStore.getChargePointConnectedVehicleScheduledChargingPlans( + modalChargePointId, ).length === 0 " color="warning" @@ -1406,10 +1404,8 @@ export default { !mqttStore.getChargePointConnectedVehicleTimeChargingPlans( modalChargePointId, ) || - Object.keys( - mqttStore.getChargePointConnectedVehicleTimeChargingPlans( - modalChargePointId, - ), + mqttStore.getChargePointConnectedVehicleTimeChargingPlans( + modalChargePointId, ).length === 0 " color="warning" From 84a3f8253ebf4fbd8c1204dae5d9bef3cc75334f Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 12:24:23 +0200 Subject: [PATCH 07/25] plans as list --- packages/control/ev/charge_template.py | 12 ++++++------ packages/helpermodules/command.py | 26 ++++++++++++++++---------- packages/helpermodules/subdata.py | 20 ++++++++++---------- packages/helpermodules/timecheck.py | 4 ++-- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index f2766985e3..d8878ef7bc 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -2,15 +2,15 @@ import datetime import logging import traceback -from typing import Optional, Tuple +from typing import List, Optional, Tuple from control import data from control.chargepoint.chargepoint_state import CHARGING_STATES from control.chargepoint.charging_type import ChargingType from control.chargepoint.control_parameter import ControlParameter from control.ev.ev_template import EvTemplate -from dataclass_utils.factories import empty_dict_factory -from helpermodules.abstract_plans import Limit, limit_factory, ScheduledChargingPlan +from dataclass_utils.factories import empty_list_factory +from helpermodules.abstract_plans import Limit, TimeChargingPlan, limit_factory, ScheduledChargingPlan from helpermodules import timecheck log = logging.getLogger(__name__) @@ -27,14 +27,14 @@ def get_charge_template_default() -> dict: @dataclass class ScheduledCharging: - plans: dict = field(default_factory=empty_dict_factory, metadata={ + plans: List[ScheduledChargingPlan] = field(default_factory=empty_list_factory, metadata={ "topic": ""}) # Dict[int,ScheduledChargingPlan] wird bei der dict to dataclass Konvertierung nicht unterstützt @dataclass class TimeCharging: active: bool = False - plans: dict = field(default_factory=empty_dict_factory, metadata={ + plans: List[TimeChargingPlan] = field(default_factory=empty_list_factory, metadata={ "topic": ""}) # Dict[int, TimeChargingPlan] wird bei der dict to dataclass Konvertierung nicht unterstützt @@ -316,7 +316,7 @@ def scheduled_charging_recent_plan(self, control_parameter: ControlParameter, soc_request_interval_offset: int) -> Optional[SelectedPlan]: plans_diff_end_date = [] - for p in self.data.chargemode.scheduled_charging.plans.values(): + for p in self.data.chargemode.scheduled_charging.plans: if p.active: if p.limit.selected == "soc" and soc is None: raise ValueError("Um Zielladen mit SoC-Ziel nutzen zu können, bitte ein SoC-Modul konfigurieren " diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 7810d4cada..b90f1b8a8e 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -51,9 +51,9 @@ class Command: ("mqtt_bridge", "system/mqtt/bridge", -1), ("charge_template", "vehicle/template/charge_template", 0), ("charge_template_scheduled_plan", - "vehicle/template/charge_template/+/chargemode/scheduled_charging/plans", + "vehicle/template/charge_template/+", -1), - ("charge_template_time_charging_plan", "vehicle/template/charge_template/+/time_charging/plans", -1), + ("charge_template_time_charging_plan", "vehicle/template/charge_template/+", -1), ("chargepoint_template", "chargepoint/template", 0), ("device", "system/device", -1), ("ev_template", "vehicle/template/ev_template", 0), @@ -494,8 +494,8 @@ def addChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> No new_charge_template_schedule_plan = ScheduledChargingPlan() new_id = self.max_id_charge_template_scheduled_plan + 1 new_charge_template_schedule_plan.id = new_id - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.update({ - new_id: new_charge_template_schedule_plan}) + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.append( + new_charge_template_schedule_plan) Pub().pub( f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}', dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) @@ -516,8 +516,11 @@ def removeChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> payload, connection_id, f'Die ID \'{payload["data"]["plan"]}\' ist größer als die maximal vergebene ' f'ID \'{self.max_id_charge_template_scheduled_plan}\'.', MessageType.ERROR) - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.pop( - payload["data"]["plan"]) + for plan in data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans: + if plan.id == payload["data"]["plan"]: + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.remove( + plan) + break Pub().pub( f'openWB/vehicle/template/charge_template/{payload["data"]["template"]}', dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) @@ -539,8 +542,8 @@ def addChargeTemplateTimeChargingPlan(self, connection_id: str, payload: dict) - new_time_charging_plan = TimeChargingPlan() new_id = self.max_id_charge_template_time_charging_plan + 1 new_time_charging_plan.id = new_id - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans.update({ - new_id: new_time_charging_plan}) + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans.append( + new_time_charging_plan) Pub().pub( f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}', dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) @@ -558,8 +561,11 @@ def removeChargeTemplateTimeChargingPlan(self, connection_id: str, payload: dict if self.max_id_charge_template_time_charging_plan < payload["data"]["plan"]: log.error(payload, connection_id, "Die ID ist größer als die maximal vergebene ID.", MessageType.ERROR) - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans.pop( - payload["data"]["plan"]) + for plan in data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans: + if plan.id == payload["data"]["plan"]: + data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans.remove( + plan) + break Pub().pub( f'openWB/vehicle/template/charge_template/{payload["data"]["template"]}', dataclass_utils.asdict(data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data)) diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index 7f185c09a0..ee15f38426 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -351,11 +351,11 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate], if "ct"+index not in var: var["ct"+index] = ChargeTemplate() var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload)) - for plan_id, plan in var["ct"+index].data.chargemode.scheduled_charging.plans.items(): + for plan in var["ct"+index].data.chargemode.scheduled_charging.plans: var["ct" + - index].data.chargemode.scheduled_charging.plans[plan_id] = dataclass_from_dict(ScheduledChargingPlan, plan) - for plan_id, plan in var["ct"+index].data.time_charging.plans.items(): - var["ct"+index].data.time_charging.plans[plan_id] = dataclass_from_dict(TimeChargingPlan, plan) + index].data.chargemode.scheduled_charging.plans.append(dataclass_from_dict(ScheduledChargingPlan, plan)) + for plan in var["ct"+index].data.time_charging.plans: + var["ct"+index].data.time_charging.plans.append(dataclass_from_dict(TimeChargingPlan, plan)) # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird for vehicle in self.ev_data.values(): if vehicle.data.charge_template == int(index): @@ -436,12 +436,12 @@ def process_chargepoint_topic(self, var: Dict[str, chargepoint.Chargepoint], msg var["cp"+index].chargepoint.data.set.charge_template = ChargeTemplate() var["cp"+index].chargepoint.data.set.charge_template.data = dataclass_from_dict( ChargeTemplateData, decode_payload(msg.payload)) - for plan_id, plan in var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans.items(): - var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans[plan_id] = dataclass_from_dict( - ScheduledChargingPlan, plan) - for plan_id, plan in var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans.items(): - var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans[plan_id] = dataclass_from_dict( - TimeChargingPlan, plan) + for plan in var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans: + var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans.append(dataclass_from_dict( + ScheduledChargingPlan, plan)) + for plan in var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans: + var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans.append(dataclass_from_dict( + TimeChargingPlan, plan)) else: self.set_json_payload_class(var["cp"+index].chargepoint.data.set, msg) elif re.search("/chargepoint/[0-9]+/get/", msg.topic) is not None: diff --git a/packages/helpermodules/timecheck.py b/packages/helpermodules/timecheck.py index 6568379b59..c7037d6bb7 100644 --- a/packages/helpermodules/timecheck.py +++ b/packages/helpermodules/timecheck.py @@ -46,12 +46,12 @@ def is_now_in_locking_time(now: datetime.datetime, T = TypeVar("T", AutolockPlan, TimeChargingPlan) -def check_plans_timeframe(plans: Dict[int, T]) -> Optional[T]: +def check_plans_timeframe(plans: List[T]) -> Optional[T]: """ gibt den ersten aktiven Plan zurück. None, falls kein Plan aktiv ist. """ state = False try: - for plan in plans.values(): + for plan in plans: if plan.active: state = check_timeframe(plan) if state: From d0a2f1639af2236434058bf61d12647d51ceb9b1 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 13:37:56 +0200 Subject: [PATCH 08/25] autolock update config --- .../chargepoint/chargepoint_template.py | 9 ++- packages/helpermodules/abstract_plans.py | 1 + packages/helpermodules/command.py | 68 ++++++++++++------- packages/helpermodules/update_config.py | 37 ++++++++-- 4 files changed, 82 insertions(+), 33 deletions(-) diff --git a/packages/control/chargepoint/chargepoint_template.py b/packages/control/chargepoint/chargepoint_template.py index 1e70a34af4..2aa71249f4 100644 --- a/packages/control/chargepoint/chargepoint_template.py +++ b/packages/control/chargepoint/chargepoint_template.py @@ -1,12 +1,12 @@ from dataclasses import asdict, dataclass, field import logging import traceback -from typing import Dict, List +from typing import List from control import data from control.ev import ev as ev_module from control.chargepoint.charging_type import ChargingType -from dataclass_utils.factories import empty_dict_factory, empty_list_factory +from dataclass_utils.factories import empty_list_factory from helpermodules.abstract_plans import AutolockPlan from helpermodules import timecheck @@ -16,18 +16,17 @@ def get_chargepoint_template_default(): default = asdict(CpTemplateData()) - default["autolock"].pop("plans") return default def get_autolock_plan_default(): - return asdict(AutolockPlan()) + return AutolockPlan() @dataclass class Autolock: active: bool = False - plans: Dict[int, AutolockPlan] = field(default_factory=empty_dict_factory) + plans: List[AutolockPlan] = field(default_factory=empty_list_factory) wait_for_charging_end: bool = False diff --git a/packages/helpermodules/abstract_plans.py b/packages/helpermodules/abstract_plans.py index 99271cf6dd..5373255829 100644 --- a/packages/helpermodules/abstract_plans.py +++ b/packages/helpermodules/abstract_plans.py @@ -85,4 +85,5 @@ class TimeChargingPlan(TimeframePlan): @dataclass class AutolockPlan(TimeframePlan): + id: Optional[int] = None name: str = "neuer Plan für Sperren nach Uhrzeit" diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index b90f1b8a8e..57b2df2ecc 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -1,3 +1,4 @@ +import copy from dataclasses import asdict import importlib import json @@ -18,7 +19,7 @@ from control.ev.charge_template import get_new_charge_template from control.ev.ev_template import EvTemplateData from helpermodules import pub -from helpermodules.abstract_plans import ScheduledChargingPlan, TimeChargingPlan +from helpermodules.abstract_plans import AutolockPlan, ScheduledChargingPlan, TimeChargingPlan from helpermodules.utils.run_command import run_command # ToDo: move to module commands if implemented from modules.backup_clouds.onedrive.api import generateMSALAuthCode, retrieveMSALTokens @@ -47,7 +48,7 @@ class Command: """ """ # Tuple: (Name der maximalen ID, Topic zur Ermittlung, Default-Wert) - MAX_IDS = [("autolock_plan", "chargepoint/template/+/autolock", -1), + MAX_IDS = [("autolock_plan", "chargepoint/template/+", -1), ("mqtt_bridge", "system/mqtt/bridge", -1), ("charge_template", "vehicle/template/charge_template", 0), ("charge_template_scheduled_plan", @@ -76,16 +77,27 @@ def _get_max_ids(self) -> None: received_topics = ProcessBrokerBranch("").get_max_id() for id_topic, topic_str, default in self.MAX_IDS: max_id = default - for topic in received_topics: + for topic, payload in received_topics.items(): search_str = "openWB/" + topic_str.replace("+", "[0-9]+") result = re.search('^('+search_str+'/*).*$', topic) if result is not None: topic_found = result.group(1) topic_rest = topic.replace(topic_found, "") - current_id_regex = re.search('^([0-9]+)/*.*$', topic_rest) - if current_id_regex is not None: - current_id = int(current_id_regex.group(1)) - max_id = max(current_id, max_id) + # Bei Plänen sind die Pläne in einer Liste im jeweiligen Profil. + if id_topic == "autolock_plan": + for plan in payload["autolock"]["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) + elif id_topic == "charge_template_scheduled_plan": + for plan in payload["chargemode"]["scheduled_charging"]["plans"]: + max_id = max(plan["id"], max_id) + else: + current_id_regex = re.search('^([0-9]+)/*.*$', topic_rest) + if current_id_regex is not None: + current_id = int(current_id_regex.group(1)) + max_id = max(current_id, max_id) setattr(self, f'max_id_{id_topic}', max_id) Pub().pub("openWB/set/command/max_id/"+id_topic, max_id) except Exception: @@ -389,14 +401,19 @@ def addAutolockPlan(self, connection_id: str, payload: dict) -> None: """ # check if "payload" contains "data.copy" if "data" in payload and "copy" in payload["data"]: - new_autolock_plan = asdict(data.data.cp_template_data[f'cpt{payload["data"]["template"]}'] - .data.autolock.plans[f'{payload["data"]["copy"]}']).copy() + for plan in data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data.autolock.plans: + if plan.id == payload["data"]["copy"]: + new_autolock_plan = copy.deepcopy(plan) + break new_autolock_plan["name"] = f'Kopie von {new_autolock_plan["name"]}' else: new_autolock_plan = get_autolock_plan_default() new_id = self.max_id_autolock_plan + 1 + new_autolock_plan.id = new_id + data.data.cp_template_data[f'ct{payload["data"]["template"]}'].data.autolock.plans.append( + new_autolock_plan) Pub().pub(f'openWB/set/chargepoint/template/{payload["data"]["template"]}/autolock/{new_id}', - new_autolock_plan) + asdict(data.data.cp_template_data[f'ct{payload["data"]["template"]}'].data)) self.max_id_autolock_plan = new_id Pub().pub("openWB/set/command/max_id/autolock_plan", new_id) pub_user_message( @@ -413,10 +430,13 @@ def removeAutolockPlan(self, connection_id: str, payload: dict) -> None: payload, connection_id, f'Die ID \'{payload["data"]["plan"]}\' ist größer als die ' f'maximal vergebene ID \'{self.max_id_autolock_plan}\'.', MessageType.ERROR) + for plan in data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data.autolock.plans: + if plan.id == payload["data"]["plan"]: + data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data.autolock.plans.remove(plan) + break Pub().pub( - f'openWB/chargepoint/template/{payload["data"]["template"]}' - f'/autolock/{payload["data"]["plan"]}', - "") + f'openWB/chargepoint/template/{payload["data"]["template"]}', + dataclass_utils.asdict(data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data)) pub_user_message( payload, connection_id, f'Plan für Sperren nach Uhrzeit mit ID \'{payload["data"]["plan"]}\' vom Profil ' @@ -485,10 +505,10 @@ def addChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> No """ # check if "payload" contains "data.copy" if "data" in payload and "copy" in payload["data"]: - new_charge_template_schedule_plan = ( - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'] - .data.chargemode.scheduled_charging.plans[f'{payload["data"]["copy"]}'] - ) + for plan in data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans: + if plan.id == payload["data"]["copy"]: + new_charge_template_schedule_plan = copy.deepcopy(plan) + break new_charge_template_schedule_plan.name = f'Kopie von {new_charge_template_schedule_plan.name}' else: new_charge_template_schedule_plan = ScheduledChargingPlan() @@ -535,8 +555,10 @@ def addChargeTemplateTimeChargingPlan(self, connection_id: str, payload: dict) - """ # check if "payload" contains "data.copy" if "data" in payload and "copy" in payload["data"]: - new_time_charging_plan = (data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'] - .data.time_charging.plans[f'{payload["data"]["copy"]}']) + for plan in data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.time_charging.plans: + if plan.id == payload["data"]["copy"]: + new_time_charging_plan = copy.deepcopy(plan) + break new_time_charging_plan.name = f'Kopie von {new_time_charging_plan.name}' else: new_time_charging_plan = TimeChargingPlan() @@ -977,14 +999,14 @@ def remove_topics(self): """ BrokerClient("processBrokerBranch", self.on_connect, self.__on_message_rm).start_finite_loop() - def get_max_id(self) -> List[str]: + def get_max_id(self) -> Dict[str, str]: try: - self.received_topics = [] + self.received_topics = {} BrokerClient("processBrokerBranch", self.on_connect, self.__on_message_max_id).start_finite_loop() return self.received_topics except Exception: log.exception("Fehler im Command-Modul") - return [] + return {} def check_mqtt_bridge_exists(self, name: str) -> bool: try: @@ -1047,7 +1069,7 @@ def __on_message_rm(self, client, userdata, msg): def __on_message_max_id(self, client, userdata, msg): try: - self.received_topics.append(msg.topic) + self.received_topics.update({msg.topic: decode_payload(msg.payload)}) except Exception: log.exception("Fehler in ProcessBrokerBranch") diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index a55883a1d8..527cfe585d 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -56,7 +56,7 @@ class UpdateConfig: - DATASTORE_VERSION = 84 + DATASTORE_VERSION = 85 valid_topic = [ "^openWB/bat/config/configured$", @@ -89,7 +89,7 @@ class UpdateConfig: "^openWB/chargepoint/get/daily_exported$", "^openWB/chargepoint/get/daily_imported$", "^openWB/chargepoint/template/[0-9]+$", - "^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$", + "^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$", # OBSOLET seit 2.1.8 "^openWB/chargepoint/[0-9]+/config$", "^openWB/chargepoint/[0-9]+/control_parameter/chargemode$", "^openWB/chargepoint/[0-9]+/control_parameter/current_plan$", @@ -141,8 +141,6 @@ class UpdateConfig: "^openWB/chargepoint/[0-9]+/get/rfid$", "^openWB/chargepoint/[0-9]+/get/rfid_timestamp$", "^openWB/chargepoint/[0-9]+/set/charging_ev$", - "^openWB/chargepoint/[0-9]+/set/charge_template/time_charging/plans/[0-9]+$", - "^openWB/chargepoint/[0-9]+/set/charge_template/chargemode/scheduled_charging/plans/[0-9]+$", "^openWB/chargepoint/[0-9]+/set/charge_template$", "^openWB/chargepoint/[0-9]+/set/current$", "^openWB/chargepoint/[0-9]+/set/energy_to_charge$", @@ -350,7 +348,8 @@ class UpdateConfig: "^openWB/vehicle/set/vehicle_update_completed$", "^openWB/vehicle/template/ev_template/[0-9]+$", - "^openWB/vehicle/template/charge_template/[0-9]+/time_charging/plans/[0-9]+$", + "^openWB/vehicle/template/charge_template/[0-9]+/time_charging/plans/[0-9]+$", # OBSOLET seit 2.1.8 + # OBSOLET seit 2.1.8 "^openWB/vehicle/template/charge_template/[0-9]+/chargemode/scheduled_charging/plans/[0-9]+$", "^openWB/vehicle/template/charge_template/[0-9]+", "^openWB/vehicle/[0-9]+/charge_template$", @@ -2253,3 +2252,31 @@ def upgrade(topic: str, payload) -> None: return {component_topic: config_payload} self._loop_all_received_topics(upgrade) self.__update_topic("openWB/system/datastore_version", 84) + + def upgrade_datastore_84(self) -> None: + def upgrade(topic: str, payload) -> Optional[dict]: + if re.search("^openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None: + index = get_index(topic) + template = decode_payload(payload) + for template_topic, template_payload in self.all_received_topics.items(): + if re.search(f"openWB/vehicle/template/charge_template/{index}/chargemode/scheduled_charging/plans/" + "[0-9]+$", template_topic) is not None: + plan = decode_payload(template_payload) + template["chargemode"]["scheduled_charging"]["plans"].append(plan) + elif re.search(f"openWB/vehicle/template/charge_template/{index}/time_charging/plans/" + "[0-9]+$", template_topic) is not None: + plan = decode_payload(template_payload) + template["time_charging"]["plans"].append(plan) + return {topic: template} + elif re.search("openWB/chargepoint/template/[0-9]+$", topic) is not None: + index = get_index(topic) + template = decode_payload(payload) + for template_topic, template_payload in self.all_received_topics.items(): + if re.search("^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$") is not None: + plan = decode_payload(template_payload) + if plan.get("id") is None: + plan["id"] = int(get_second_index(template_topic)) + template["autolock"]["plans"].append(plan) + return {topic: template} + self._loop_all_received_topics(upgrade) + self.__update_topic("openWB/system/datastore_version", 85) From 5cb3af1850778d31df50150e905ab6b1ffda3dc1 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 14:39:37 +0200 Subject: [PATCH 09/25] fixes, remove subdata workaround --- packages/control/ev/charge_template.py | 4 +++- .../dataclass_utils/_dataclass_from_dict.py | 17 +++++++++++------ packages/helpermodules/subdata.py | 11 ----------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index d8878ef7bc..d54b2e57a8 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -343,7 +343,9 @@ def scheduled_charging_recent_plan(self, plan_id = list(plan_dict.keys())[0] plan_end_time = list(plan_dict.values())[0] - plan = self.data.chargemode.scheduled_charging.plans[str(plan_id)] + for p in self.data.chargemode.scheduled_charging.plans: + if p.id == plan_id: + plan = p remaining_time, missing_amount, phases, duration = self._calc_remaining_time( plan, plan_end_time, soc, ev_template, used_amount, max_hw_phases, phase_switch_supported, diff --git a/packages/dataclass_utils/_dataclass_from_dict.py b/packages/dataclass_utils/_dataclass_from_dict.py index 069431311c..6980d761c7 100644 --- a/packages/dataclass_utils/_dataclass_from_dict.py +++ b/packages/dataclass_utils/_dataclass_from_dict.py @@ -2,7 +2,7 @@ import inspect from inspect import FullArgSpec, isclass import typing -from typing import TypeVar, Type, Union, get_origin +from typing import TypeVar, Type, Union, get_args, get_origin T = TypeVar('T') @@ -46,15 +46,20 @@ def _get_argument_value(arg_spec: FullArgSpec, index: int, parameters: dict): def _dataclass_from_dict_recurse(value, requested_type: Type[T]): + if get_origin(requested_type) == list: + # Extrahiere den generischen Typ der Liste + if get_args(requested_type): + generic_type = get_args(requested_type)[0] + # Konvertiere jedes Element der Liste in den generischen Typ + return [_dataclass_from_dict_recurse(item, generic_type) for item in value] + if isinstance(value, dict) and not ( _is_optional_of_dict(requested_type) or issubclass(requested_type if isclass(requested_type) else type(bool), dict)): return dataclass_from_dict(requested_type, value) - else: - if isinstance(requested_type, type) and issubclass(requested_type, Enum): - return requested_type(value) - else: - return value + if isinstance(requested_type, type) and issubclass(requested_type, Enum): + return requested_type(value) + return value def _is_optional_of_dict(requested_type): diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index ee15f38426..c14d43e71b 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -351,11 +351,6 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate], if "ct"+index not in var: var["ct"+index] = ChargeTemplate() var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload)) - for plan in var["ct"+index].data.chargemode.scheduled_charging.plans: - var["ct" + - index].data.chargemode.scheduled_charging.plans.append(dataclass_from_dict(ScheduledChargingPlan, plan)) - for plan in var["ct"+index].data.time_charging.plans: - var["ct"+index].data.time_charging.plans.append(dataclass_from_dict(TimeChargingPlan, plan)) # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird for vehicle in self.ev_data.values(): if vehicle.data.charge_template == int(index): @@ -436,12 +431,6 @@ def process_chargepoint_topic(self, var: Dict[str, chargepoint.Chargepoint], msg var["cp"+index].chargepoint.data.set.charge_template = ChargeTemplate() var["cp"+index].chargepoint.data.set.charge_template.data = dataclass_from_dict( ChargeTemplateData, decode_payload(msg.payload)) - for plan in var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans: - var["cp"+index].chargepoint.data.set.charge_template.data.chargemode.scheduled_charging.plans.append(dataclass_from_dict( - ScheduledChargingPlan, plan)) - for plan in var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans: - var["cp"+index].chargepoint.data.set.charge_template.data.time_charging.plans.append(dataclass_from_dict( - TimeChargingPlan, plan)) else: self.set_json_payload_class(var["cp"+index].chargepoint.data.set, msg) elif re.search("/chargepoint/[0-9]+/get/", msg.topic) is not None: From dbd0d3c59bc57ebe3e6c753b9e727e823edc96d0 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 15:24:17 +0200 Subject: [PATCH 10/25] fixes --- packages/helpermodules/command.py | 6 +++--- packages/helpermodules/subdata.py | 20 +++++--------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 57b2df2ecc..4137cd62b5 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -410,10 +410,10 @@ def addAutolockPlan(self, connection_id: str, payload: dict) -> None: new_autolock_plan = get_autolock_plan_default() new_id = self.max_id_autolock_plan + 1 new_autolock_plan.id = new_id - data.data.cp_template_data[f'ct{payload["data"]["template"]}'].data.autolock.plans.append( + data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data.autolock.plans.append( new_autolock_plan) - Pub().pub(f'openWB/set/chargepoint/template/{payload["data"]["template"]}/autolock/{new_id}', - asdict(data.data.cp_template_data[f'ct{payload["data"]["template"]}'].data)) + Pub().pub(f'openWB/set/chargepoint/template/{payload["data"]["template"]}', + asdict(data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data)) self.max_id_autolock_plan = new_id Pub().pub("openWB/set/command/max_id/autolock_plan", new_id) pub_user_message( diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index c14d43e71b..fb366abdce 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -500,22 +500,12 @@ def process_chargepoint_template_topic(self, var: Dict[str, chargepoint.CpTempla try: index = get_index(msg.topic) payload = decode_payload(msg.payload) - if re.search("/chargepoint/template/[0-9]+/autolock/", msg.topic) is not None: - index_second = get_second_index(msg.topic) - if payload == "": - var["cpt"+index].data.autolock.plans.pop(index_second) - else: - var["cpt"+index].data.autolock.plans[ - index_second] = dataclass_from_dict(AutolockPlan, payload) + if payload == "": + var.pop("cpt"+index) else: - if payload == "": - var.pop("cpt"+index) - else: - if "cpt"+index not in var: - var["cpt"+index] = CpTemplate() - autolock_plans = var["cpt"+index].data.autolock.plans - var["cpt"+index].data = dataclass_from_dict(CpTemplateData, payload) - var["cpt"+index].data.autolock.plans = autolock_plans + if "cpt"+index not in var: + var["cpt"+index] = CpTemplate() + var["cpt"+index].data = dataclass_from_dict(CpTemplateData, payload) except Exception: log.exception("Fehler im subdata-Modul") From 7f5ef2ba13fd35551adcf1b869e8b2d53aa65f03 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 15:35:42 +0200 Subject: [PATCH 11/25] fixes, pytest --- .../chargepoint/chargepoint_template.py | 4 ---- packages/control/ev/charge_template_test.py | 2 +- packages/helpermodules/command.py | 18 +++++++++++------- packages/helpermodules/subdata.py | 1 - packages/helpermodules/timecheck.py | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/control/chargepoint/chargepoint_template.py b/packages/control/chargepoint/chargepoint_template.py index 2aa71249f4..f028416714 100644 --- a/packages/control/chargepoint/chargepoint_template.py +++ b/packages/control/chargepoint/chargepoint_template.py @@ -19,10 +19,6 @@ def get_chargepoint_template_default(): return default -def get_autolock_plan_default(): - return AutolockPlan() - - @dataclass class Autolock: active: bool = False diff --git a/packages/control/ev/charge_template_test.py b/packages/control/ev/charge_template_test.py index 8c09973a89..16fd9ad7cd 100644 --- a/packages/control/ev/charge_template_test.py +++ b/packages/control/ev/charge_template_test.py @@ -199,7 +199,7 @@ def test_scheduled_charging_recent_plan(end_time_mock, plan_mock_0 = Mock(spec=ScheduledChargingPlan, active=True, current=14, id=0, limit=Limit(selected="amount")) plan_mock_1 = Mock(spec=ScheduledChargingPlan, active=True, current=14, id=1, limit=Limit(selected="amount")) plan_mock_2 = Mock(spec=ScheduledChargingPlan, active=True, current=14, id=2, limit=Limit(selected="amount")) - ct.data.chargemode.scheduled_charging.plans = {"0": plan_mock_0, "1": plan_mock_1, "2": plan_mock_2} + ct.data.chargemode.scheduled_charging.plans = [plan_mock_0, plan_mock_1, plan_mock_2] # execution selected_plan = ct.scheduled_charging_recent_plan( diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 4137cd62b5..9afade5891 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -6,7 +6,7 @@ import subprocess from threading import Event import time -from typing import Dict, List, Optional +from typing import Dict, Optional import re import traceback from pathlib import Path @@ -14,7 +14,7 @@ import paho.mqtt.client as mqtt from control.chargelog import chargelog from control.chargepoint import chargepoint -from control.chargepoint.chargepoint_template import get_autolock_plan_default, get_chargepoint_template_default +from control.chargepoint.chargepoint_template import get_chargepoint_template_default from control.ev.charge_template import get_new_charge_template from control.ev.ev_template import EvTemplateData @@ -407,7 +407,7 @@ def addAutolockPlan(self, connection_id: str, payload: dict) -> None: break new_autolock_plan["name"] = f'Kopie von {new_autolock_plan["name"]}' else: - new_autolock_plan = get_autolock_plan_default() + new_autolock_plan = AutolockPlan() new_id = self.max_id_autolock_plan + 1 new_autolock_plan.id = new_id data.data.cp_template_data[f'cpt{payload["data"]["template"]}'].data.autolock.plans.append( @@ -505,7 +505,8 @@ def addChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> No """ # check if "payload" contains "data.copy" if "data" in payload and "copy" in payload["data"]: - for plan in data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans: + for plan in data.data.ev_charge_template_data[ + f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans: if plan.id == payload["data"]["copy"]: new_charge_template_schedule_plan = copy.deepcopy(plan) break @@ -514,7 +515,8 @@ def addChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> No new_charge_template_schedule_plan = ScheduledChargingPlan() new_id = self.max_id_charge_template_scheduled_plan + 1 new_charge_template_schedule_plan.id = new_id - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.append( + data.data.ev_charge_template_data[ + f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.append( new_charge_template_schedule_plan) Pub().pub( f'openWB/set/vehicle/template/charge_template/{payload["data"]["template"]}', @@ -536,9 +538,11 @@ def removeChargeTemplateSchedulePlan(self, connection_id: str, payload: dict) -> payload, connection_id, f'Die ID \'{payload["data"]["plan"]}\' ist größer als die maximal vergebene ' f'ID \'{self.max_id_charge_template_scheduled_plan}\'.', MessageType.ERROR) - for plan in data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans: + for plan in data.data.ev_charge_template_data[ + f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans: if plan.id == payload["data"]["plan"]: - data.data.ev_charge_template_data[f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.remove( + data.data.ev_charge_template_data[ + f'ct{payload["data"]["template"]}'].data.chargemode.scheduled_charging.plans.remove( plan) break Pub().pub( diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index fb366abdce..7ebe68eaaf 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -21,7 +21,6 @@ from control.limiting_value import LoadmanagementLimit from control.optional_data import Ocpp from helpermodules import graph, system -from helpermodules.abstract_plans import AutolockPlan, ScheduledChargingPlan, TimeChargingPlan from helpermodules.broker import BrokerClient from helpermodules.messaging import MessageType, pub_system_message from helpermodules.utils import ProcessingCounter diff --git a/packages/helpermodules/timecheck.py b/packages/helpermodules/timecheck.py index c7037d6bb7..b144d45b3d 100644 --- a/packages/helpermodules/timecheck.py +++ b/packages/helpermodules/timecheck.py @@ -2,7 +2,7 @@ """ import logging import datetime -from typing import Dict, List, Optional, Tuple, TypeVar, Union +from typing import List, Optional, Tuple, TypeVar, Union from helpermodules.utils.error_handling import ImportErrorContext with ImportErrorContext(): From 886382be58eab9e12f7c629e7f835442d1343138 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 16:06:42 +0200 Subject: [PATCH 12/25] fixes --- packages/helpermodules/update_config.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 527cfe585d..22858532d2 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -2258,6 +2258,10 @@ def upgrade(topic: str, payload) -> Optional[dict]: if re.search("^openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None: index = get_index(topic) template = decode_payload(payload) + if template["chargemode"]["scheduled_charging"].get("plans") is None: + template["chargemode"]["scheduled_charging"]["plans"] = [] + if template["time_charging"].get("plans") is None: + template["time_charging"]["plans"] = [] for template_topic, template_payload in self.all_received_topics.items(): if re.search(f"openWB/vehicle/template/charge_template/{index}/chargemode/scheduled_charging/plans/" "[0-9]+$", template_topic) is not None: @@ -2272,7 +2276,7 @@ def upgrade(topic: str, payload) -> Optional[dict]: index = get_index(topic) template = decode_payload(payload) for template_topic, template_payload in self.all_received_topics.items(): - if re.search("^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$") is not None: + if re.search("^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$", template_topic) is not None: plan = decode_payload(template_payload) if plan.get("id") is None: plan["id"] = int(get_second_index(template_topic)) From e50e0b0e1a507cca02ec7dc6b2f7c52cf0674589 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Tue, 17 Jun 2025 16:17:38 +0200 Subject: [PATCH 13/25] fixes --- packages/helpermodules/update_config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index 22858532d2..fc6d38da0e 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -2275,6 +2275,8 @@ def upgrade(topic: str, payload) -> Optional[dict]: elif re.search("openWB/chargepoint/template/[0-9]+$", topic) is not None: index = get_index(topic) template = decode_payload(payload) + if template["autolock"].get("plans") is None: + template["autolock"]["plans"] = [] for template_topic, template_payload in self.all_received_topics.items(): if re.search("^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$", template_topic) is not None: plan = decode_payload(template_payload) From e329cebab6d632781e2053cabf71daf8599ed1e9 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Wed, 18 Jun 2025 07:40:27 +0200 Subject: [PATCH 14/25] fix copying auto lock plan --- packages/helpermodules/command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 9afade5891..d375aec7ec 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -405,7 +405,7 @@ def addAutolockPlan(self, connection_id: str, payload: dict) -> None: if plan.id == payload["data"]["copy"]: new_autolock_plan = copy.deepcopy(plan) break - new_autolock_plan["name"] = f'Kopie von {new_autolock_plan["name"]}' + new_autolock_plan.name = f'Kopie von {new_autolock_plan.name}' else: new_autolock_plan = AutolockPlan() new_id = self.max_id_autolock_plan + 1 From 9ad549d665722964bc9332570a692161d34416b4 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 18 Jun 2025 08:12:20 +0200 Subject: [PATCH 15/25] fix initial once timestamp, fix max ids --- packages/helpermodules/abstract_plans.py | 2 +- packages/helpermodules/command.py | 68 +++++++++++++----------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/packages/helpermodules/abstract_plans.py b/packages/helpermodules/abstract_plans.py index 5373255829..570cd6f346 100644 --- a/packages/helpermodules/abstract_plans.py +++ b/packages/helpermodules/abstract_plans.py @@ -4,7 +4,7 @@ def once_factory() -> List: - return [datetime.datetime.today().strftime("%Y%m%d"), datetime.datetime.today().strftime("%Y%m%d")] + return [datetime.datetime.today().strftime("%Y-%m-%d"), datetime.datetime.today().strftime("%Y-%m-%d")] def weekly_factory() -> List: diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index d375aec7ec..8e25f0a277 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -31,7 +31,7 @@ from helpermodules.create_debug import create_debug_log from helpermodules.pub import Pub, pub_single from helpermodules.subdata import SubData -from helpermodules.utils.topic_parser import decode_payload +from helpermodules.utils.topic_parser import decode_payload, get_index from control import bat, bridge, data, counter, counter_all, pv from control.ev import ev from modules.chargepoints.internal_openwb.chargepoint_module import ChargepointModule @@ -47,21 +47,23 @@ class Command: """ """ - # Tuple: (Name der maximalen ID, Topic zur Ermittlung, Default-Wert) - MAX_IDS = [("autolock_plan", "chargepoint/template/+", -1), - ("mqtt_bridge", "system/mqtt/bridge", -1), - ("charge_template", "vehicle/template/charge_template", 0), - ("charge_template_scheduled_plan", - "vehicle/template/charge_template/+", - -1), - ("charge_template_time_charging_plan", "vehicle/template/charge_template/+", -1), - ("chargepoint_template", "chargepoint/template", 0), - ("device", "system/device", -1), - ("ev_template", "vehicle/template/ev_template", 0), - ("vehicle", "vehicle", 0), - ("io_action", "io/action", -1), - ("io_device", "system/io", -1), - ] + # Tuple: (Name der maximalen ID, Regex-Topic zur Ermittlung, Default-Wert) + MAX_IDS = { + "nested payload": + [("autolock_plan", "openWB/chargepoint/template/[0-9]+$", -1), + ("charge_template_scheduled_plan", "openWB/vehicle/template/charge_template/[0-9]+$", -1), + ("charge_template_time_charging_plan", "openWB/vehicle/template/charge_template/[0-9]+$", -1)], + "topic": + [("mqtt_bridge", "openWB/system/mqtt/bridge", -1), + ("vehicle", "openWB/vehicle/[0-9]+/name$", 0)], + "payload": + [("charge_template", "openWB/vehicle/template/charge_template/[0-9]+$", 0), + ("chargepoint_template", "openWB/chargepoint/template/[0-9]+$", 0), + ("device", "openWB/system/device/[0-9]+/config$", -1), + ("ev_template", "openWB/vehicle/template/ev_template/[0-9]+$", 0), + ("io_action", "openWB/io/action/[0-9]+/config$", -1), + ("io_device", "openWB/system/io/[0-9]+/config$", -1)], + } def __init__(self, event_command_completed: Event): try: @@ -75,29 +77,33 @@ def _get_max_ids(self) -> None: """ ermittelt die maximale ID vom Broker """ try: received_topics = ProcessBrokerBranch("").get_max_id() - for id_topic, topic_str, default in self.MAX_IDS: + for id_topic, topic_str, default in self.MAX_IDS["nested payload"]: max_id = default for topic, payload in received_topics.items(): - search_str = "openWB/" + topic_str.replace("+", "[0-9]+") - result = re.search('^('+search_str+'/*).*$', topic) - if result is not None: - topic_found = result.group(1) - topic_rest = topic.replace(topic_found, "") - # Bei Plänen sind die Pläne in einer Liste im jeweiligen Profil. + 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_time_charging_plan": - for plan in payload["time_charging"]["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) - else: - current_id_regex = re.search('^([0-9]+)/*.*$', topic_rest) - if current_id_regex is not None: - current_id = int(current_id_regex.group(1)) - max_id = max(current_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) except Exception: From 817c3a9d12b65061372fcbb400714f8b37a9ada8 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 18 Jun 2025 08:27:01 +0200 Subject: [PATCH 16/25] add missing ids in templates --- packages/helpermodules/update_config.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index fc6d38da0e..d5afc170d0 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -2258,6 +2258,8 @@ def upgrade(topic: str, payload) -> Optional[dict]: if re.search("^openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None: index = get_index(topic) template = decode_payload(payload) + if template.get("id") is None: + template["id"] = int(index) if template["chargemode"]["scheduled_charging"].get("plans") is None: template["chargemode"]["scheduled_charging"]["plans"] = [] if template["time_charging"].get("plans") is None: @@ -2272,11 +2274,18 @@ def upgrade(topic: str, payload) -> Optional[dict]: plan = decode_payload(template_payload) template["time_charging"]["plans"].append(plan) return {topic: template} + elif re.search("^openWB/vehicle/template/ev_template/[0-9]+$", topic) is not None: + template = decode_payload(payload) + if template.get("id") is None: + template["id"] = int(get_index(topic)) + return {topic: template} elif re.search("openWB/chargepoint/template/[0-9]+$", topic) is not None: index = get_index(topic) template = decode_payload(payload) if template["autolock"].get("plans") is None: template["autolock"]["plans"] = [] + if template.get("id") is None: + template["id"] = int(index) for template_topic, template_payload in self.all_received_topics.items(): if re.search("^openWB/chargepoint/template/[0-9]+/autolock/[0-9]+$", template_topic) is not None: plan = decode_payload(template_payload) From 1e1e1d88e72618ead93540cb362b75e81f877e24 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 18 Jun 2025 09:57:45 +0200 Subject: [PATCH 17/25] fix --- packages/helpermodules/subdata.py | 45 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py index 7ebe68eaaf..f07b62b436 100644 --- a/packages/helpermodules/subdata.py +++ b/packages/helpermodules/subdata.py @@ -347,23 +347,23 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate], if decode_payload(msg.payload) == "": if "ct"+index in var: var.pop("ct"+index) - if "ct"+index not in var: - var["ct"+index] = ChargeTemplate() - var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload)) - # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird - for vehicle in self.ev_data.values(): - if vehicle.data.charge_template == int(index): - for cp in self.cp_data.values(): - if ((cp.chargepoint.data.set.charging_ev != -1 and - cp.chargepoint.data.set.charging_ev == vehicle.num) or - cp.chargepoint.data.config.ev == vehicle.num): - # UI sendet immer alle Topics, auch nicht geänderte. Damit die temporären Topics nicht - # mehrfach gepbulished werden, muss das publishen der temporären Topics 1:1 erfolgen. - if re.search("/vehicle/template/charge_template/[0-9]+$", msg.topic) is not None: - if decode_payload(msg.payload) == "": - Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template", "") - else: - cp.chargepoint.update_charge_template(var["ct"+index]) + if "ct"+index not in var: + var["ct"+index] = ChargeTemplate() + var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload)) + # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird + for vehicle in self.ev_data.values(): + if vehicle.data.charge_template == int(index): + for cp in self.cp_data.values(): + if ((cp.chargepoint.data.set.charging_ev != -1 and + cp.chargepoint.data.set.charging_ev == vehicle.num) or + cp.chargepoint.data.config.ev == vehicle.num): + # UI sendet immer alle Topics, auch nicht geänderte. Damit die temporären Topics nicht + # mehrfach gepbulished werden, muss das publishen der temporären Topics 1:1 erfolgen. + if re.search("/vehicle/template/charge_template/[0-9]+$", msg.topic) is not None: + if decode_payload(msg.payload) == "": + Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template", "") + else: + cp.chargepoint.update_charge_template(var["ct"+index]) except Exception: log.exception("Fehler im subdata-Modul") @@ -425,13 +425,12 @@ def process_chargepoint_topic(self, var: Dict[str, chargepoint.Chargepoint], msg if re.search("/chargepoint/[0-9]+/set/log$", msg.topic) is not None: var["cp"+index].chargepoint.data.set.log = dataclass_from_dict( Log, decode_payload(msg.payload)) + elif "charge_template" in msg.topic: + var["cp"+index].chargepoint.data.set.charge_template = ChargeTemplate() + var["cp"+index].chargepoint.data.set.charge_template.data = dataclass_from_dict( + ChargeTemplateData, decode_payload(msg.payload)) else: - if "charge_template" in msg.topic: - var["cp"+index].chargepoint.data.set.charge_template = ChargeTemplate() - var["cp"+index].chargepoint.data.set.charge_template.data = dataclass_from_dict( - ChargeTemplateData, decode_payload(msg.payload)) - else: - self.set_json_payload_class(var["cp"+index].chargepoint.data.set, msg) + self.set_json_payload_class(var["cp"+index].chargepoint.data.set, msg) elif re.search("/chargepoint/[0-9]+/get/", msg.topic) is not None: if re.search("/chargepoint/[0-9]+/get/connected_vehicle/", msg.topic) is not None: self.set_json_payload_class(var["cp"+index].chargepoint.data.get.connected_vehicle, msg) From 84f6e8d44057299bc89798a62f3cc6ad52eab7c2 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 18 Jun 2025 11:53:21 +0200 Subject: [PATCH 18/25] fix once --- packages/control/chargepoint/chargepoint.py | 6 +++-- packages/control/ev/charge_template_test.py | 6 ++--- packages/helpermodules/abstract_plans.py | 28 ++++++++++++++++----- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py index 8cdb0734c2..391ba80cb3 100644 --- a/packages/control/chargepoint/chargepoint.py +++ b/packages/control/chargepoint/chargepoint.py @@ -868,11 +868,13 @@ def chargemode_support_phase_switch(self) -> bool: control_parameter.chargemode == Chargemode.ECO_CHARGING) and control_parameter.submode == Chargemode.PV_CHARGING and self.data.set.charge_template.data.chargemode.pv_charging.phases_to_use == 0) + for p in self.data.set.charge_template.data.chargemode.scheduled_charging.plans: + if p.id == self.data.control_parameter.current_plan: + plan = p scheduled_auto_switch = ( control_parameter.chargemode == Chargemode.SCHEDULED_CHARGING and control_parameter.submode == Chargemode.PV_CHARGING and - self.data.set.charge_template.data.chargemode.scheduled_charging.plans[ - str(self.data.control_parameter.current_plan)].phases_to_use_pv == 0) + plan.phases_to_use_pv == 0) return (pv_auto_switch or scheduled_auto_switch) def failed_phase_switches_reached(self) -> bool: diff --git a/packages/control/ev/charge_template_test.py b/packages/control/ev/charge_template_test.py index 16fd9ad7cd..55a90c91cf 100644 --- a/packages/control/ev/charge_template_test.py +++ b/packages/control/ev/charge_template_test.py @@ -284,7 +284,7 @@ def test_scheduled_charging_calc_current(plan_data: SelectedPlan, plan = ScheduledChargingPlan(active=True, id=0) plan.limit.selected = selected # json verwandelt Keys in strings - ct.data.chargemode.scheduled_charging.plans = {"0": plan} + ct.data.chargemode.scheduled_charging.plans = [plan] if plan_data: plan_data.plan = plan @@ -318,9 +318,9 @@ def test_scheduled_charging_calc_current_electricity_tariff(loading_hour, expect # setup ct = ChargeTemplate() plan = ScheduledChargingPlan(active=True) + plan.et_active = True plan.limit.selected = "soc" - ct.data.chargemode.scheduled_charging.plans = {"0": plan} - ct.data.chargemode.scheduled_charging.plans["0"].et_active = True + ct.data.chargemode.scheduled_charging.plans = [plan] # für Github-Test keinen Zeitstempel verwenden mock_et_get_loading_hours = Mock(return_value=[datetime.datetime( year=2022, month=5, day=16, hour=8, minute=0).timestamp()]) diff --git a/packages/helpermodules/abstract_plans.py b/packages/helpermodules/abstract_plans.py index 570cd6f346..a2dbc4a4fb 100644 --- a/packages/helpermodules/abstract_plans.py +++ b/packages/helpermodules/abstract_plans.py @@ -3,10 +3,14 @@ from typing import List, Optional -def once_factory() -> List: +def once_period_factory() -> List: return [datetime.datetime.today().strftime("%Y-%m-%d"), datetime.datetime.today().strftime("%Y-%m-%d")] +def once_date_factory() -> List: + return datetime.datetime.today().strftime("%Y-%m-%d") + + def weekly_factory() -> List: return [False]*7 @@ -27,14 +31,25 @@ def limit_factory() -> Limit: @dataclass -class Frequency: +class FrequencyPeriod: + selected: str = "daily" + once: List[str] = field(default_factory=once_period_factory) + weekly: List[bool] = field(default_factory=weekly_factory) + + +def frequency_period_factory() -> FrequencyPeriod: + return FrequencyPeriod() + + +@dataclass +class FrequencyDate: selected: str = "daily" - once: List[str] = field(default_factory=once_factory) + once: str = field(default_factory=once_date_factory) weekly: List[bool] = field(default_factory=weekly_factory) -def frequency_factory() -> Frequency: - return Frequency() +def frequency_date_factory() -> FrequencyDate: + return FrequencyDate() @dataclass @@ -52,12 +67,12 @@ def scheduled_limit_factory() -> ScheduledLimit: @dataclass class PlanBase: active: bool = True - frequency: Frequency = field(default_factory=frequency_factory) @dataclass class TimeframePlan(PlanBase): time: List[str] = field(default_factory=time_factory) # ToDo: aktuelle Zeit verwenden + 1 Stunde + frequency: FrequencyPeriod = field(default_factory=frequency_period_factory) @dataclass @@ -65,6 +80,7 @@ class ScheduledChargingPlan(PlanBase): current: int = 14 dc_current: float = 145 et_active: bool = False + frequency: FrequencyDate = field(default_factory=frequency_date_factory) id: Optional[int] = None name: str = "neuer Zielladen-Plan" limit: ScheduledLimit = field(default_factory=scheduled_limit_factory) From e4eae26e13b9cfdcd6450a13bdf9409b08e00a9b Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 18 Jun 2025 14:24:21 +0200 Subject: [PATCH 19/25] fix once --- packages/helpermodules/update_config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py index d5afc170d0..552e550e47 100644 --- a/packages/helpermodules/update_config.py +++ b/packages/helpermodules/update_config.py @@ -2268,6 +2268,8 @@ def upgrade(topic: str, payload) -> Optional[dict]: if re.search(f"openWB/vehicle/template/charge_template/{index}/chargemode/scheduled_charging/plans/" "[0-9]+$", template_topic) is not None: plan = decode_payload(template_payload) + if isinstance(plan["frequency"]["once"], List): + plan["frequency"]["once"] = plan["frequency"]["once"][0] template["chargemode"]["scheduled_charging"]["plans"].append(plan) elif re.search(f"openWB/vehicle/template/charge_template/{index}/time_charging/plans/" "[0-9]+$", template_topic) is not None: From ea4c2b6d5e5b34d64a354811d2531bf3562d612c Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 30 Jun 2025 15:25:41 +0200 Subject: [PATCH 20/25] fix pytest --- packages/control/ev/charge_template_test.py | 2 +- packages/helpermodules/timecheck_test.py | 33 +++++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/control/ev/charge_template_test.py b/packages/control/ev/charge_template_test.py index 55a90c91cf..c9ba2ef6b6 100644 --- a/packages/control/ev/charge_template_test.py +++ b/packages/control/ev/charge_template_test.py @@ -230,7 +230,7 @@ def test_scheduled_charging_recent_plan_fulfilled(end_time_mock, expected_plan_n plan_mock_0 = Mock(spec=ScheduledChargingPlan, active=True, current=14, id=0, limit=Limit(selected="amount")) plan_mock_1 = Mock(spec=ScheduledChargingPlan, active=True, current=14, id=1, limit=Limit(selected="amount")) plan_mock_2 = Mock(spec=ScheduledChargingPlan, active=True, current=14, id=2, limit=Limit(selected="amount")) - ct.data.chargemode.scheduled_charging.plans = {"0": plan_mock_0, "1": plan_mock_1, "2": plan_mock_2} + ct.data.chargemode.scheduled_charging.plans = [plan_mock_0, plan_mock_1, plan_mock_2] # execution selected_plan = ct.scheduled_charging_recent_plan( diff --git a/packages/helpermodules/timecheck_test.py b/packages/helpermodules/timecheck_test.py index 72d72c5e34..e22afce0ac 100644 --- a/packages/helpermodules/timecheck_test.py +++ b/packages/helpermodules/timecheck_test.py @@ -4,7 +4,8 @@ import pytest from helpermodules import timecheck -from helpermodules.abstract_plans import AutolockPlan, Frequency, ScheduledChargingPlan, TimeChargingPlan +from helpermodules.abstract_plans import (AutolockPlan, FrequencyDate, FrequencyPeriod, ScheduledChargingPlan, + TimeChargingPlan) class Params: @@ -43,7 +44,7 @@ def test_check_end_time(time: str, plan_fulfilled: bool, expected_remaining_time: float): # setup - plan = Mock(spec=ScheduledChargingPlan, time=time, frequency=Mock(spec=Frequency, selected=selected,)) + plan = Mock(spec=ScheduledChargingPlan, time=time, frequency=Mock(spec=FrequencyDate, selected=selected,)) if date: setattr(plan.frequency, selected, date) @@ -74,42 +75,42 @@ def test_get_next_charging_day(weekday: int, weekly: List[bool], expected_days: @pytest.mark.parametrize( "plan, now, expected_state", [pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], - frequency=Frequency(selected="once", once=["2022-05-16", "2022-05-16"])), + frequency=FrequencyPeriod(selected="once", once=["2022-05-16", "2022-05-16"])), "2022-05-16 9:50", False, id="once, 10-12 at 9.50"), pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], - frequency=Frequency(selected="once", once=["2022-05-16", "2022-05-16"])), + frequency=FrequencyPeriod(selected="once", once=["2022-05-16", "2022-05-16"])), "2022-05-16 10:50", True, id="once, 10-12 at 10.50"), pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], - frequency=Frequency(selected="once", once=["2022-05-16", "2022-05-16"])), + frequency=FrequencyPeriod(selected="once", once=["2022-05-16", "2022-05-16"])), "2022-05-16 13:50", False, id="once, 10-12 at 13.50"), - pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], frequency=Frequency(selected="daily")), + pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], frequency=FrequencyPeriod(selected="daily")), "2022-05-16 11:50", True, id="daily, 10-12 at 11.50"), - pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], frequency=Frequency(selected="daily")), + pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], frequency=FrequencyPeriod(selected="daily")), "2022-05-16 22:50", True, id="daily, 22-02 at 22.50"), - pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], frequency=Frequency(selected="daily")), + pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], frequency=FrequencyPeriod(selected="daily")), "2022-05-17 1:50", True, id="daily, 22-02 at 1.50"), - pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], frequency=Frequency(selected="daily")), + pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], frequency=FrequencyPeriod(selected="daily")), "2022-05-17 2:50", False, id="daily, 22-02 at 2.50"), pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], - frequency=Frequency(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), "2022-05-16 10:50", True, id="weekly, 10-12 at 10.50"), pytest.param(TimeChargingPlan(active=True, time=["10:00", "12:00"], - frequency=Frequency(selected="weekly", weekly=[0, 1, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[0, 1, 0, 0, 0, 0, 0])), "2022-05-16 10:50", False, id="weekly, 10-12 at 10.50"), pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], - frequency=Frequency(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), "2022-05-16 22:50", True, id="weekly, 22-02 at 22.50"), pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], - frequency=Frequency(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), "2022-05-17 1:50", True, id="weekly, 22-02 at 1.50"), pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], - frequency=Frequency(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), "2022-05-16 1:50", False, id="weekly, 22-02 at 1.50, weekday before"), pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], - frequency=Frequency(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), "2022-05-18 1:50", False, id="weekly, 22-02 at 1.50, weekday after"), pytest.param(TimeChargingPlan(active=True, time=["22:00", "2:00"], - frequency=Frequency(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), + frequency=FrequencyPeriod(selected="weekly", weekly=[1, 0, 0, 0, 0, 0, 0])), "2022-05-17 2:50", False, id="weekly, 22-02 at 2.50"), ] ) From d3ca837ebe2b182ce351fbd3c2453efcf23fdf30 Mon Sep 17 00:00:00 2001 From: cshagen Date: Mon, 30 Jun 2025 15:58:28 +0200 Subject: [PATCH 21/25] Colors theme: adapt to integrated charging plans (#2495) * adapt to integrated charging plans * align time charging information to new temporary template * fix pricechart axis --- .../cpConfig/CPChargeConfigPanel.vue | 21 +++- .../cpConfig/CPConfigScheduled.vue | 112 ++++++++++++------ .../cpConfig/CPConfigTimed.vue | 111 +++++++++++------ .../cpConfig/ScheduleDetails.vue | 82 +++++++++++++ .../cpConfig/TimePlanDetails.vue | 85 +++++++++++++ .../src/components/chargePointList/model.ts | 34 +++--- .../chargePointList/processMessages.ts | 72 +---------- .../priceChart/GlobalPriceChart.vue | 3 +- .../src/components/priceChart/PriceChart.vue | 6 +- .../colors/web/assets/index-5WLEKoXm.js | 6 - .../colors/web/assets/index-BsF3Z_3u.js | 6 + ...{index-CQ1x0KFk.css => index-DIVik25a.css} | 2 +- .../modules/web_themes/colors/web/index.html | 4 +- 13 files changed, 376 insertions(+), 168 deletions(-) create mode 100644 packages/modules/web_themes/colors/source/src/components/chargePointList/cpConfig/ScheduleDetails.vue create mode 100644 packages/modules/web_themes/colors/source/src/components/chargePointList/cpConfig/TimePlanDetails.vue delete mode 100644 packages/modules/web_themes/colors/web/assets/index-5WLEKoXm.js create mode 100644 packages/modules/web_themes/colors/web/assets/index-BsF3Z_3u.js rename packages/modules/web_themes/colors/web/assets/{index-CQ1x0KFk.css => index-DIVik25a.css} (73%) diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/cpConfig/CPChargeConfigPanel.vue b/packages/modules/web_themes/colors/source/src/components/chargePointList/cpConfig/CPChargeConfigPanel.vue index 7a87bc5011..0b553129e9 100755 --- a/packages/modules/web_themes/colors/source/src/components/chargePointList/cpConfig/CPChargeConfigPanel.vue +++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/cpConfig/CPChargeConfigPanel.vue @@ -54,6 +54,13 @@ > + + +