Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Amend validation error raised #506

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Amend validation error raised #506

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a8cb110
Amend validation error
drc38 Nov 3, 2023
e3a9f4c
Fix linting
drc38 Nov 3, 2023
aeb5553
Fix linting
drc38 Nov 3, 2023
daaa31d
Fix linting
drc38 Nov 3, 2023
4f616d8
Fix linting
drc38 Nov 3, 2023
77ebac6
Fix error args
drc38 Nov 3, 2023
6e485b6
Fix linting
drc38 Nov 3, 2023
1f21201
Merge branch 'master' into validation
OrangeTux Nov 7, 2023
be242ec
Include error chain
drc38 Nov 7, 2023
a8901f9
Merge branch 'master' into validation
drc38 Nov 7, 2023
eeccb50
Update changelog
drc38 Nov 15, 2023
4e96a23
Merge branch 'master' into validation
drc38 Oct 16, 2024
20f9079
Update CHANGELOG.md
drc38 Oct 17, 2024
a829ad8
Update CHANGELOG.md
drc38 Oct 17, 2024
503e615
Merge branch 'master' into validation
drc38 Dec 8, 2024
7e24722
Merge branch 'master' into validation
drc38 Dec 19, 2024
ac0348f
Update CHANGELOG.md
drc38 Dec 19, 2024
1ced34c
Merge branch 'master' into validation
drc38 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ocpp/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

from ocpp.exceptions import (
FormatViolationError,
NotImplementedError,
OCPPError,
PropertyConstraintViolationError,
ProtocolError,
Expand Down Expand Up @@ -217,9 +216,13 @@ def validate_payload(message: Union[Call, CallResult], ocpp_version: str) -> Non
validator = get_validator(
message.message_type_id, message.action, ocpp_version
)
except (OSError, json.JSONDecodeError):
raise NotImplementedError(
details={"cause": f"Failed to validate action: {message.action}"}
except OSError:
raise ValidationError(
f"JSON validation schema not found for action: {message.action}"
)
except json.JSONDecodeError:
raise ValidationError(
f"Error in decoding JSON validation schema for action: {message.action}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a json.JSONDecodeError should be mapped to a ValidationError. An OSError means that no schema with a given name was found. That means user is using a action that doesn't exists. Therefore, a NotSupportedError is applicable. See my comment here: #494 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With #494 a FileNotFoundError should not be raised by the OSError exception, as before it gets to this part of the code a NotSupportedError will be raised by_raise_key_error. So an OSError should only be raised for one of these other reasons https://docs.python.org/3/library/exceptions.html#os-exceptions

)

try:
Expand Down
3 changes: 1 addition & 2 deletions tests/test_messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

from ocpp.exceptions import (
FormatViolationError,
NotImplementedError,
PropertyConstraintViolationError,
ProtocolError,
TypeConstraintViolationError,
Expand Down Expand Up @@ -240,7 +239,7 @@ def test_validate_payload_with_non_existing_schema():
payload={"invalid_key": True},
)

with pytest.raises(NotImplementedError):
with pytest.raises(ValidationError):
validate_payload(message, ocpp_version="1.6")


Expand Down
Loading