Matching OCPP 2.0.1 payload types to OCPP 2.0.1 json schema (#680) #3
Conversation
This file contains 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
Also includes a pull request template. Contributes to mobilityhouse#671
…rate the same as before. the enums and datatypes had an overlapping dataclass, both called UnitOfMeasureType. changed the enum to UnitOfMeasureUnitType.
…changes made to nested dataclasses don't affect functionality
…pe. eliminates breaking change.
From the readme in the ocpp 2.0.1 edition 3 zipfile https://openchargealliance.org/my-oca/ocpp/: For historical reasons not all documents have the same release date. OCPP 2.0.1 Edition 3 is the same as OCPP 2.0.1 Edition 2 including all errata up and until OCPP-2.0.1_edition2_errata_2024-04 (2024-04-30). The errata do not affect any schemas of OCPP messages. The errata do contain changes to requirements or even new requirements, but only in cases where a requirement contains an obvious error and would not or could not be implemented literally. New requirements were only added when they were already implicitly there. No code changes needed to library then => Updated readme to mention edition 3 support.
ajmirsky
changed the title
ajmirsky
changed the title
See discussion at mobilityhouse#676 --------- Co-authored-by: Peter Astrand <[email protected]> Co-authored-by: Patrick Roelke <[email protected]>
- Issues that are stale for 30 days will be marked as `stale` - Issues that are marked as `stale` for more than 14 days will be automatically closed. - No changes will be done to PRs
Bumps [black](https://github.com/psf/black) from 22.12.0 to 24.3.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/psf/black/releases">black's releases</a>.</em></p> <blockquote> <h2>24.3.0</h2> <h3>Highlights</h3> <p>This release is a milestone: it fixes Black's first CVE security vulnerability. If you run Black on untrusted input, or if you habitually put thousands of leading tab characters in your docstrings, you are strongly encouraged to upgrade immediately to fix <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-21503">CVE-2024-21503</a>.</p> <p>This release also fixes a bug in Black's AST safety check that allowed Black to make incorrect changes to certain f-strings that are valid in Python 3.12 and higher.</p> <h3>Stable style</h3> <ul> <li>Don't move comments along with delimiters, which could cause crashes (<a href="https://redirect.github.com/psf/black/issues/4248">#4248</a>)</li> <li>Strengthen AST safety check to catch more unsafe changes to strings. Previous versions of Black would incorrectly format the contents of certain unusual f-strings containing nested strings with the same quote type. Now, Black will crash on such strings until support for the new f-string syntax is implemented. (<a href="https://redirect.github.com/psf/black/issues/4270">#4270</a>)</li> <li>Fix a bug where line-ranges exceeding the last code line would not work as expected (<a href="https://redirect.github.com/psf/black/issues/4273">#4273</a>)</li> </ul> <h3>Performance</h3> <ul> <li>Fix catastrophic performance on docstrings that contain large numbers of leading tab characters. This fixes <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-21503">CVE-2024-21503</a>. (<a href="https://redirect.github.com/psf/black/issues/4278">#4278</a>)</li> </ul> <h3>Documentation</h3> <ul> <li>Note what happens when <code>--check</code> is used with <code>--quiet</code> (<a href="https://redirect.github.com/psf/black/issues/4236">#4236</a>)</li> </ul> <h2>24.2.0</h2> <h3>Stable style</h3> <ul> <li>Fixed a bug where comments where mistakenly removed along with redundant parentheses (<a href="https://redirect.github.com/psf/black/issues/4218">#4218</a>)</li> </ul> <h3>Preview style</h3> <ul> <li>Move the <code>hug_parens_with_braces_and_square_brackets</code> feature to the unstable style due to an outstanding crash and proposed formatting tweaks (<a href="https://redirect.github.com/psf/black/issues/4198">#4198</a>)</li> <li>Fixed a bug where base expressions caused inconsistent formatting of ** in tenary expression (<a href="https://redirect.github.com/psf/black/issues/4154">#4154</a>)</li> <li>Checking for newline before adding one on docstring that is almost at the line limit (<a href="https://redirect.github.com/psf/black/issues/4185">#4185</a>)</li> <li>Remove redundant parentheses in <code>case</code> statement <code>if</code> guards (<a href="https://redirect.github.com/psf/black/issues/4214">#4214</a>).</li> </ul> <h3>Configuration</h3> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/psf/black/blob/main/CHANGES.md">black's changelog</a>.</em></p> <blockquote> <h2>24.3.0</h2> <h3>Highlights</h3> <p>This release is a milestone: it fixes Black's first CVE security vulnerability. If you run Black on untrusted input, or if you habitually put thousands of leading tab characters in your docstrings, you are strongly encouraged to upgrade immediately to fix <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-21503">CVE-2024-21503</a>.</p> <p>This release also fixes a bug in Black's AST safety check that allowed Black to make incorrect changes to certain f-strings that are valid in Python 3.12 and higher.</p> <h3>Stable style</h3> <ul> <li>Don't move comments along with delimiters, which could cause crashes (<a href="https://redirect.github.com/psf/black/issues/4248">#4248</a>)</li> <li>Strengthen AST safety check to catch more unsafe changes to strings. Previous versions of Black would incorrectly format the contents of certain unusual f-strings containing nested strings with the same quote type. Now, Black will crash on such strings until support for the new f-string syntax is implemented. (<a href="https://redirect.github.com/psf/black/issues/4270">#4270</a>)</li> <li>Fix a bug where line-ranges exceeding the last code line would not work as expected (<a href="https://redirect.github.com/psf/black/issues/4273">#4273</a>)</li> </ul> <h3>Performance</h3> <ul> <li>Fix catastrophic performance on docstrings that contain large numbers of leading tab characters. This fixes <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-21503">CVE-2024-21503</a>. (<a href="https://redirect.github.com/psf/black/issues/4278">#4278</a>)</li> </ul> <h3>Documentation</h3> <ul> <li>Note what happens when <code>--check</code> is used with <code>--quiet</code> (<a href="https://redirect.github.com/psf/black/issues/4236">#4236</a>)</li> </ul> <h2>24.2.0</h2> <h3>Stable style</h3> <ul> <li>Fixed a bug where comments where mistakenly removed along with redundant parentheses (<a href="https://redirect.github.com/psf/black/issues/4218">#4218</a>)</li> </ul> <h3>Preview style</h3> <ul> <li>Move the <code>hug_parens_with_braces_and_square_brackets</code> feature to the unstable style due to an outstanding crash and proposed formatting tweaks (<a href="https://redirect.github.com/psf/black/issues/4198">#4198</a>)</li> <li>Fixed a bug where base expressions caused inconsistent formatting of ** in tenary expression (<a href="https://redirect.github.com/psf/black/issues/4154">#4154</a>)</li> <li>Checking for newline before adding one on docstring that is almost at the line limit (<a href="https://redirect.github.com/psf/black/issues/4185">#4185</a>)</li> <li>Remove redundant parentheses in <code>case</code> statement <code>if</code> guards (<a href="https://redirect.github.com/psf/black/issues/4214">#4214</a>).</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/psf/black/commit/552baf822992936134cbd31a38f69c8cfe7c0f05"><code>552baf8</code></a> Prepare release 24.3.0 (<a href="https://redirect.github.com/psf/black/issues/4279">#4279</a>)</li> <li><a href="https://github.com/psf/black/commit/f00093672628d212b8965a8993cee8bedf5fe9b8"><code>f000936</code></a> Fix catastrophic performance in lines_with_leading_tabs_expanded() (<a href="https://redirect.github.com/psf/black/issues/4278">#4278</a>)</li> <li><a href="https://github.com/psf/black/commit/7b5a657285f38126bf28483478bbd9ea928077ec"><code>7b5a657</code></a> Fix --line-ranges behavior when ranges are at EOF (<a href="https://redirect.github.com/psf/black/issues/4273">#4273</a>)</li> <li><a href="https://github.com/psf/black/commit/1abcffc81816257985678f08c61584ed4287f22a"><code>1abcffc</code></a> Use regex where we ignore case on windows (<a href="https://redirect.github.com/psf/black/issues/4252">#4252</a>)</li> <li><a href="https://github.com/psf/black/commit/719e67462c80574c81a96faa144886de6da84489"><code>719e674</code></a> Fix 4227: Improve documentation for --quiet --check (<a href="https://redirect.github.com/psf/black/issues/4236">#4236</a>)</li> <li><a href="https://github.com/psf/black/commit/e5510afc06cd238cd0cba4095283943a870a7e7b"><code>e5510af</code></a> update plugin url for Thonny (<a href="https://redirect.github.com/psf/black/issues/4259">#4259</a>)</li> <li><a href="https://github.com/psf/black/commit/6af7d1109693c4ad3af08ecbc34649c232b47a6d"><code>6af7d11</code></a> Fix AST safety check false negative (<a href="https://redirect.github.com/psf/black/issues/4270">#4270</a>)</li> <li><a href="https://github.com/psf/black/commit/f03ee113c9f3dfeb477f2d4247bfb7de2e5f465c"><code>f03ee11</code></a> Ensure <code>blib2to3.pygram</code> is initialized before use (<a href="https://redirect.github.com/psf/black/issues/4224">#4224</a>)</li> <li><a href="https://github.com/psf/black/commit/e4bfedbec2e8b10cc6b7b31442478f05db0ce06d"><code>e4bfedb</code></a> fix: Don't move comments while splitting delimiters (<a href="https://redirect.github.com/psf/black/issues/4248">#4248</a>)</li> <li><a href="https://github.com/psf/black/commit/d0287e1f7558d97e6c0ebd6dc5bcb5b970e2bf8c"><code>d0287e1</code></a> Make trailing comma logic more concise (<a href="https://redirect.github.com/psf/black/issues/4202">#4202</a>)</li> <li>Additional commits viewable in <a href="https://github.com/psf/black/compare/22.12.0...24.3.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/mobilityhouse/ocpp/network/alerts). </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chad <[email protected]>
* We should not be updating dependencies in CI. Hence we should remove the `poetry update` command * To install poetry, following the official documentation, we should use the following command: https://python-poetry.org/docs/#installing-with-pipx ```shell pipx install poetry ``` Signed-off-by: Jérôme Benoit <[email protected]>
I just removed my access the project's Github and Pypi. Thanks for moving this project for forward @mdwcrft , @jainmohit2001 and @proelke . Good luck! @mdwcrft I didn't include your last name, since your Github profile doesn't expose that information. Let me know if you want to include that. cc: @Jared-Newell-Mobility --------- Co-authored-by: Mohit Jain <[email protected]> Co-authored-by: Chad <[email protected]>
Also includes a pull request template. Contributes to mobilityhouse#671
…rate the same as before. the enums and datatypes had an overlapping dataclass, both called UnitOfMeasureType. changed the enum to UnitOfMeasureUnitType.
jainmohit2001
force-pushed
the
ocpp-2.0.1-payload-correct-types
branch
from
7bc890a to
b928143
Compare
…obilityhouse#681) Based on examples from other open-source repos in github: - code of conduct for those participating in the project - instructions for contributing to the project (including a pull request template to help facilitate) - how to report a security vulnerability - expectations of getting help with the project Contributes to mobilityhouse#671 --------- Co-authored-by: Mohit Jain <[email protected]> Co-authored-by: Chad <[email protected]>
dgoetsch
approved these changes
Dec 12, 2024
| @@ -49,36 +49,47 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] | |||
|
|
|||
| [[package]] | |||
| name = "black" | |||
| version = "22.12.0" | |||
ocpp/v201/datatypes.py
Outdated
| @@ -555,7 +555,7 @@ class UnitOfMeasureType: | |||
| UnitOfMeasureType is used by: SampledValueType | |||
| """ | |||
|
|
|||
| unit: Optional[str] = None | |||
| unit: Optional[enums.StandardizedUnitsOfMeasureType] = None | |||
There was a problem hiding this comment.
I'm a little concerned about this one, because UnitOfMeasure is extendable. Maybe its okay, but we'll probably have to expand it one day.
…es' into ocpp-2.0.1-payload-correct-types
…tom string, as per the specs in 2.49
…calEnergeStorageVariableName, ConnectedEVVariableName, StandardizedVariableName, InvalidMessageSeq, Bytes
…es' into ocpp-2.0.1-payload-correct-types
…nitoringBase and PublishFirmwareResponse
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.
same as mobilityhouse#680 PR
This brings @malsyned mobilityhouse#562 up-to-date with base branch and fixes linting errors.
Justification
Payload types now match the json schema for OCPP2.0.1 that are also included in this library. allows for static type checking of payloads.
Breaking changes
To verify that there are no breaking changes, the unit test included in mobilityhouse#684 is used to prevent regression with the nested model datatypes.
To hydrate with nested datatypes, use json-dataclasses