Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts how ChargeTemplate instances are instantiated and how MQTT topic metadata is attached, aiming to “fix cp metadata” for chargepoint charge templates.
Changes:
- Removed static
metadata={"topic": ...}fromChargeTemplate.dataand introduced factory helpers to create templates with/without topic metadata. - Updated multiple call sites (runtime + tests) to use the new factory helpers instead of
ChargeTemplate(). - Updated chargepoint data wiring and removed the explicit publish in
Chargepoint.update_charge_template().
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| packages/helpermodules/subdata.py | Uses new factory helpers when creating charge templates from subscribed topics. |
| packages/control/ev/ev.py | Initializes Ev.charge_template via the “without metadata” factory. |
| packages/control/ev/charge_template_test.py | Updates tests to construct templates via the new factory. |
| packages/control/ev/charge_template.py | Removes static field metadata and adds new instantiate helper functions. |
| packages/control/counter_test.py | Updates tests to use the new factory. |
| packages/control/chargepoint/chargepoint_data.py | Switches Set.charge_template default factory to metadata-aware instantiation. |
| packages/control/chargepoint/chargepoint.py | Removes explicit MQTT publish from update_charge_template(). |
| packages/control/auto_phase_switch_test.py | Updates tests to use the new factory. |
| packages/control/algorithm/additional_current_test.py | Updates tests to use the new factory. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
+698
to
+701
| def instantiate_charge_template_with_metadata() -> ChargeTemplate: | ||
| template = ChargeTemplate() | ||
| template.__dataclass_fields__['data'].metadata = {"topic": "set/charge_template"} | ||
| return template |
| class Set: | ||
| charge_template: ChargeTemplate = field(default_factory=charge_template_factory, | ||
| metadata={"topic": "set/charge_template"}) | ||
| charge_template: ChargeTemplate = field(default_factory=instantiate_charge_template_with_metadata) |
|
|
||
| def update_charge_template(self, charge_template: ChargeTemplate) -> None: | ||
| # Prüfen, ob ein temporäres Ladeprofil aktiv ist und dieses übernehmen | ||
| self.data.set.charge_template = charge_template |
This reverts commit e723f19.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes the MQTT topic metadata wiring for chargepoint charge template updates so that the published payload on .../set/charge_template matches the expected ChargeTemplateData shape.
Changes:
- Move the
topic: set/charge_templatemetadata toChargeTemplate.data(the actual payload object). - Remove the
topicmetadata fromChargepointData.Set.charge_templateto allow recursive publishing to the nesteddatafield.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
packages/control/ev/charge_template.py |
Sets ChargeTemplate.data metadata topic to set/charge_template so the published payload is ChargeTemplateData. |
packages/control/chargepoint/chargepoint_data.py |
Removes topic metadata from Set.charge_template to avoid publishing a wrapped { "data": ... } payload and enable nested publishing. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.