Skip to content

Added PEBC message types to the S2 Parser TYPE_TO_MESSAGE_CLASS dictionary #121

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wcoenraads merged 2 commits into from
Jun 2, 2025
Merged

Added PEBC message types to the S2 Parser TYPE_TO_MESSAGE_CLASS dictionary #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10772ef
Added PEBC Message classes to the S2 Parser TYPE_TO_MESSAGE_CLASS dict
AndrewRutherfoord May 12, 2025
b732ac6
Added PEBC.EnergyConstraint and PEBC.Instruction message types to S2 …
AndrewRutherfoord May 14, 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
8 changes: 7 additions & 1 deletion src/s2python/s2_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
FRBCTimerStatus,
FRBCUsageForecast,
)
from s2python.pebc import PEBCPowerConstraints, PEBCEnergyConstraint, PEBCInstruction
from s2python.ppbc import PPBCScheduleInstruction

from s2python.message import S2Message
Expand All @@ -48,6 +49,9 @@
"FRBC.TimerStatus": FRBCTimerStatus,
"FRBC.UsageForecast": FRBCUsageForecast,
"PPBC.ScheduleInstruction": PPBCScheduleInstruction,
"PEBC.PowerConstraints": PEBCPowerConstraints,
"PEBC.Instruction": PEBCInstruction,
"PEBC.EnergyConstraint": PEBCEnergyConstraint,
"Handshake": Handshake,
"HandshakeResponse": HandshakeResponse,
"InstructionStatusUpdate": InstructionStatusUpdate,
Expand Down Expand Up @@ -90,7 +94,9 @@ def parse_as_any_message(unparsed_message: Union[dict, str, bytes]) -> S2Message
return TYPE_TO_MESSAGE_CLASS[message_type].model_validate(message_json)

@staticmethod
def parse_as_message(unparsed_message: Union[dict, str, bytes], as_message: Type[M]) -> M:
def parse_as_message(
unparsed_message: Union[dict, str, bytes], as_message: Type[M]
) -> M:
"""Parse the message to a specific S2 python message.

:param unparsed_message: The message as a JSON-formatted string or as a JSON-parsed dictionary.
Expand Down