Skip to content

Commit 6d9d022

Browse files
andchiindandchiind
committed
Remove unnecessary eventhandler names
1 parent 6d211e7 commit 6d9d022

51 files changed

Lines changed: 157 additions & 242 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/isar/state_machine/state.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
@dataclass
1818
class EventHandlerMapping[T]:
19-
name: str
2019
event: Event[T]
2120
handler: Callable[[T], Transition | None]
2221

@@ -42,10 +41,10 @@ def __init__(
4241
self.event_handler_mappings = event_handler_mappings
4342
self.timers = timers if timers is not None else []
4443

45-
def get_event_handler_by_name(self, event_handler_name: str) -> EventHandlerMapping:
44+
def get_event_handler_by_event(self, event: Event) -> EventHandlerMapping:
4645
filtered_handlers = list(
4746
filter(
48-
lambda mapping: mapping.name == event_handler_name,
47+
lambda mapping: mapping.event == event,
4948
self.event_handler_mappings,
5049
)
5150
)
@@ -86,7 +85,7 @@ def run(self) -> Transition | None:
8685
if event_value is not None:
8786
transition = handler_mapping.handler(event_value)
8887
self.logger.debug(
89-
f"Event '{handler_mapping.name}' triggered with input: {event_value}. "
88+
f"Event '{handler_mapping.event.name}' triggered with input: {event_value}. "
9089
)
9190
if transition is not None:
9291
self.logger.debug(

‎src/isar/state_machine/states/await_next_mission.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,30 @@ def __init__(self, events: Events):
2222

2323
event_handlers: list[EventHandlerMapping] = [
2424
EventHandlerMapping[Mission](
25-
name="start_mission_event",
2625
event=events.api_requests.start_mission.request,
2726
handler=lambda mission: Monitor.transition_and_start_mission(
2827
mission, True
2928
),
3029
),
3130
EventHandlerMapping[EmptyMessage](
32-
name="return_home_event",
3331
event=events.api_requests.return_home.request,
3432
handler=lambda event: ReturningHome.transition_and_start_mission(True),
3533
),
3634
EventHandlerMapping[str](
37-
name="stop_mission_event",
3835
event=events.api_requests.stop_mission.request,
3936
handler=lambda mission_id: Stopping.transition_and_trigger_stop_and_respond_to_API(
4037
mission_id
4138
),
4239
),
4340
EventHandlerMapping[EmptyMessage](
44-
name="send_to_lockdown_event",
4541
event=events.api_requests.send_to_lockdown.request,
4642
handler=lambda _: GoingToLockdown.transition_and_start_mission_and_report_to_api(),
4743
),
4844
EventHandlerMapping[EmptyMessage](
49-
name="robot_battery_below_threshold_event",
5045
event=events.robot_service_events.battery_below_mission_threshold,
5146
handler=lambda _: GoingToRecharging.transition_and_start_return_home(),
5247
),
5348
EventHandlerMapping[EmptyMessage](
54-
name="set_maintenance_mode",
5549
event=events.api_requests.set_maintenance_mode.request,
5650
handler=lambda _: Maintenance.transition_and_reply_to_API(),
5751
),

‎src/isar/state_machine/states/going_to_lockdown.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,18 @@ def __init__(self, events: Events):
1414

1515
event_handlers: list[EventHandlerMapping] = [
1616
EventHandlerMapping[ErrorMessage](
17-
name="mission_failed_event",
1817
event=events.robot_service_events.mission_failed,
1918
handler=lambda _: InterventionNeeded.transition(
2019
"Lockdown mission failed"
2120
),
2221
),
2322
EventHandlerMapping[EmptyMessage](
24-
name="mission_failed_to_resume",
2523
event=events.robot_service_events.mission_failed_to_resume,
2624
handler=lambda _: InterventionNeeded.transition(
2725
"Failed to resume return to home mission"
2826
),
2927
),
3028
EventHandlerMapping[EmptyMessage](
31-
name="mission_succeeded_event",
3229
event=events.robot_service_events.mission_succeeded,
3330
handler=lambda _: Lockdown.transition_without_responding_to_api(),
3431
),

‎src/isar/state_machine/states/going_to_recharging.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,16 @@ def __init__(self, events: Events):
1414

1515
event_handlers: list[EventHandlerMapping] = [
1616
EventHandlerMapping[ErrorMessage](
17-
name="mission_failed_event",
1817
event=events.robot_service_events.mission_failed,
1918
handler=lambda _: InterventionNeeded.transition(
2019
"Return home to recharge failed"
2120
),
2221
),
2322
EventHandlerMapping[EmptyMessage](
24-
name="mission_succeeded_event",
2523
event=events.robot_service_events.mission_succeeded,
2624
handler=lambda _: Recharging.transition(),
2725
),
2826
EventHandlerMapping[EmptyMessage](
29-
name="send_to_lockdown_event",
3027
event=events.api_requests.send_to_lockdown.request,
3128
handler=lambda _: GoingToLockdown.transition_to_existing_mission_and_report_to_api(),
3229
),

‎src/isar/state_machine/states/going_to_recharging_with_mission.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,18 @@ def _stop_mission_event_handler(
4545

4646
event_handlers: list[EventHandlerMapping] = [
4747
EventHandlerMapping[ErrorMessage](
48-
name="mission_failed_event",
4948
event=events.robot_service_events.mission_failed,
5049
handler=_mission_failed_event_handler,
5150
),
5251
EventHandlerMapping[EmptyMessage](
53-
name="mission_succeeded_event",
5452
event=events.robot_service_events.mission_succeeded,
5553
handler=lambda _: RechargingWithMission.transition(mission),
5654
),
5755
EventHandlerMapping[EmptyMessage](
58-
name="send_to_lockdown_event",
5956
event=events.api_requests.send_to_lockdown.request,
6057
handler=lambda _: GoingToLockdown.transition_to_existing_mission_and_report_to_api(),
6158
),
6259
EventHandlerMapping[str](
63-
name="stop_mission_event",
6460
event=events.api_requests.stop_mission.request,
6561
handler=_stop_mission_event_handler,
6662
),

‎src/isar/state_machine/states/home.py‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,34 @@ def _robot_status_event_handler(
5151

5252
event_handlers: list[EventHandlerMapping] = [
5353
EventHandlerMapping[Mission](
54-
name="start_mission_event",
5554
event=events.api_requests.start_mission.request,
5655
handler=lambda mission: Monitor.transition_and_start_mission(
5756
mission, True
5857
),
5958
),
6059
EventHandlerMapping[EmptyMessage](
61-
name="return_home_event",
6260
event=events.api_requests.return_home.request,
6361
handler=lambda event: ReturningHome.transition_and_start_mission(True),
6462
),
6563
EventHandlerMapping[str](
66-
name="stop_mission_event",
6764
event=events.api_requests.stop_mission.request,
6865
handler=lambda mission_id: Stopping.transition_and_trigger_stop_and_respond_to_API(
6966
mission_id
7067
),
7168
),
7269
EventHandlerMapping[RobotStatus](
73-
name="robot_status_event",
7470
event=events.robot_service_events.robot_status_update,
7571
handler=_robot_status_event_handler,
7672
),
7773
EventHandlerMapping[EmptyMessage](
78-
name="send_to_lockdown_event",
7974
event=events.api_requests.send_to_lockdown.request,
8075
handler=lambda _: Lockdown.transition_and_respond_to_api(),
8176
),
8277
EventHandlerMapping[EmptyMessage](
83-
name="robot_battery_below_threshold_event",
8478
event=events.robot_service_events.battery_below_mission_threshold,
8579
handler=lambda _: Recharging.transition(),
8680
),
8781
EventHandlerMapping[EmptyMessage](
88-
name="set_maintenance_mode",
8982
event=events.api_requests.set_maintenance_mode.request,
9083
handler=lambda _: Maintenance.transition_and_reply_to_API(),
9184
),

‎src/isar/state_machine/states/intervention_needed.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,18 @@ def _robot_status_event_handler(
3333

3434
event_handlers: list[EventHandlerMapping] = [
3535
EventHandlerMapping[EmptyMessage](
36-
name="return_home_event",
3736
event=events.api_requests.return_home.request,
3837
handler=lambda event: ReturningHome.transition_and_start_mission(True),
3938
),
4039
EventHandlerMapping[EmptyMessage](
41-
name="release_intervention_needed_event",
4240
event=events.api_requests.release_intervention_needed.request,
4341
handler=release_intervention_needed_handler,
4442
),
4543
EventHandlerMapping[EmptyMessage](
46-
name="set_maintenance_mode",
4744
event=events.api_requests.set_maintenance_mode.request,
4845
handler=lambda _: Maintenance.transition_and_reply_to_API(),
4946
),
5047
EventHandlerMapping[RobotStatus](
51-
name="robot_status_event",
5248
event=events.robot_service_events.robot_status_update,
5349
handler=_robot_status_event_handler,
5450
),

‎src/isar/state_machine/states/lockdown.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ def _release_from_lockdown_handler(
1919

2020
event_handlers: list[EventHandlerMapping] = [
2121
EventHandlerMapping[EmptyMessage](
22-
name="release_from_lockdown",
2322
event=events.api_requests.release_from_lockdown.request,
2423
handler=_release_from_lockdown_handler,
2524
),

‎src/isar/state_machine/states/maintenance.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ def _release_from_maintenance_handler(
2020

2121
event_handlers: list[EventHandlerMapping] = [
2222
EventHandlerMapping[EmptyMessage](
23-
name="release_from_maintenance",
2423
event=events.api_requests.release_from_maintenance_mode.request,
2524
handler=_release_from_maintenance_handler,
2625
),

‎src/isar/state_machine/states/monitor.py‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,46 +59,38 @@ def _mission_started_event_handler(mission_started: EmptyMessage) -> None:
5959

6060
event_handlers: list[EventHandlerMapping] = [
6161
EventHandlerMapping[EmptyMessage](
62-
name="mission_started_event",
6362
event=events.robot_service_events.mission_started_successfully,
6463
handler=_mission_started_event_handler,
6564
),
6665
EventHandlerMapping[str](
67-
name="stop_mission_event",
6866
event=events.api_requests.stop_mission.request,
6967
handler=_stop_mission_event_handler,
7068
),
7169
EventHandlerMapping[EmptyMessage](
72-
name="pause_mission_event",
7370
event=events.api_requests.pause_mission.request,
7471
handler=lambda _: Pausing.transition_and_pause_mission_and_reply_to_API(
7572
mission_id
7673
),
7774
),
7875
EventHandlerMapping[ErrorMessage](
79-
name="mission_failed_event",
8076
event=events.robot_service_events.mission_failed,
8177
handler=_mission_failed_event_handler,
8278
),
8379
EventHandlerMapping[EmptyMessage](
84-
name="mission_succeeded_event",
8580
event=events.robot_service_events.mission_succeeded,
8681
handler=_mission_success_event_handler,
8782
),
8883
EventHandlerMapping[EmptyMessage](
89-
name="robot_battery_below_threshold_event",
9084
event=events.robot_service_events.battery_below_mission_threshold,
9185
handler=lambda _: StoppingGoToRecharge.transition_and_stop_mission(),
9286
),
9387
EventHandlerMapping[EmptyMessage](
94-
name="send_to_lockdown_event",
9588
event=events.api_requests.send_to_lockdown.request,
9689
handler=lambda _: StoppingGoToLockdown.transition_and_stop_mission(
9790
mission_id
9891
),
9992
),
10093
EventHandlerMapping[EmptyMessage](
101-
name="set_maintenance_mode",
10294
event=events.api_requests.set_maintenance_mode.request,
10395
handler=lambda _: StoppingDueToMaintenance.transition_and_stop_mission(
10496
mission_id

0 commit comments

Comments
 (0)