Skip to content

add ack option to parse_send function #49

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

Closed
Aryan0826 wants to merge 1 commit into from
Closed

add ack option to parse_send function #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion soti/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class Message:
cmd_id: CmdID
body: bytes = field(default_factory=([0] * 7))
# additional parameters
is_ack: bool = field(default=False)
source: str = field(default="unspecified")
time: datetime = field(default_factory=
lambda: datetime.now().strftime("%T")
Expand Down Expand Up @@ -56,5 +57,6 @@ def as_dict(self) -> dict:
"sender-id": self.sender,
"recipient-id": self.recipient,
"cmd": self.cmd_id,
"body": parse_msg_body(self.cmd_id, self.body)
"body": parse_msg_body(self.cmd_id, self.body),
"ack": self.is_ack,
}
11 changes: 10 additions & 1 deletion soti/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ def parse_send(args: str, default_sender: NodeID) -> Message:
priority: int = COMM_INFO[cmd_id]["priority"]
sender_id: NodeID = default_sender
recipient_id: NodeID | None = COMM_INFO[cmd_id]["dest"]
is_ack: bool = False


# represents the bytes that will be sent in the data section of the message
data = bytearray()
Expand All @@ -112,6 +114,13 @@ def parse_send(args: str, default_sender: NodeID) -> Message:
recipient_id = NodeID(parse_int(value))
except ValueError as exc:
raise ArgumentException(f"Invalid node ID '{value}'") from exc
elif key == "ack":
if value.lower() == "true":
is_ack = True
elif value.lower() == "false":
is_ack = False
else:
raise ArgumentException(f"Invalid value for ack '{value}'. Expected true or false")
else:
raise ArgumentException(f"Unknown option '{key}'")

Expand Down Expand Up @@ -160,4 +169,4 @@ def parse_send(args: str, default_sender: NodeID) -> Message:
if recipient_id is None:
raise ArgumentException(f"You must specify a recipient with the 'to' option for {cmd_id.name}")

return Message(priority, sender_id, recipient_id, cmd_id, bytes(data), source="user")
return Message(priority, sender_id, recipient_id, cmd_id, bytes(data), is_ack=is_ack, source="user")