Skip to content

[commands] Clarified error messages for parallel composition commands #73

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

Open
Daniel1464 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[commands] Clarified error messages for parallel composition commands #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49bb198
[commands] Clarified error messages for parallel composition commands…
Daniel1464 Oct 4, 2024
fd26e14
Formatting, made requirements error more specific
Daniel1464 Oct 6, 2024
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
7 changes: 6 additions & 1 deletion commands2/parallelcommandgroup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,13 @@ def addCommands(self, *commands: Command):
for command in commands:
in_common = command.getRequirements().intersection(self.requirements)
if in_common:
requirements_str = ", ".join(
[s.getName() for s in in_common]
)
raise IllegalCommandUse(
"Multiple commands in a parallel composition cannot require the same subsystems.",
f"Command {command.getName()} could not be added to this ParallelCommandGroup"
f" because the subsystems [{requirements_str}] are already required in this command."
f" Multiple commands in a parallel composition cannot require the same subsystems.",
common=in_common,
)

Expand Down
7 changes: 6 additions & 1 deletion commands2/paralleldeadlinegroup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,13 @@ def addCommands(self, *commands: Command):
for command in commands:
in_common = command.getRequirements().intersection(self.requirements)
if in_common:
requirements_str = ", ".join(
[s.getName() for s in in_common]
)
raise IllegalCommandUse(
"Multiple commands in a parallel composition cannot require the same subsystems.",
f"Command {command.getName()} could not be added to this ParallelCommandGroup"
f" because the subsystems [{requirements_str}] are already required in this command."
f" Multiple commands in a parallel composition cannot require the same subsystems.",
common=in_common,
)

Expand Down
7 changes: 6 additions & 1 deletion commands2/parallelracegroup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,13 @@ def addCommands(self, *commands: Command):
for command in commands:
in_common = command.getRequirements().intersection(self.requirements)
if in_common:
requirements_str = ", ".join(
[s.getName() for s in in_common]
)
raise IllegalCommandUse(
"Multiple commands in a parallel composition cannot require the same subsystems.",
f"Command {command.getName()} could not be added to this ParallelCommandGroup"
f" because the subsystems [{requirements_str}] are already required in this command."
f" Multiple commands in a parallel composition cannot require the same subsystems.",
common=in_common,
)

Expand Down