From 982cde9bb5cd046968104f0424d805893a390d34 Mon Sep 17 00:00:00 2001 From: Trishna Saeharaseelan <trishna.saeharaseelan@noc.ac.uk> Date: Mon, 10 Feb 2025 14:39:19 +0000 Subject: [PATCH] refactor(autonomy): add pause enum and rename message type --- examples/mas-dt/autonomy.json | 2 +- formats/{autonomy.py => autonomy_engine_control.py} | 4 ++-- generate_schema_config.py | 4 ++-- project/soar/swagger.json | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) rename formats/{autonomy.py => autonomy_engine_control.py} (94%) diff --git a/examples/mas-dt/autonomy.json b/examples/mas-dt/autonomy.json index 6a8d81c..62c474c 100644 --- a/examples/mas-dt/autonomy.json +++ b/examples/mas-dt/autonomy.json @@ -10,7 +10,7 @@ }, "payload":{ "message_type": "autonomy", - "planning_config_ID": 1, + "planning_config_ID": "b127003c-0000-11aa-a1eb-b1cdf2342fdd", "state": "start" } } \ No newline at end of file diff --git a/formats/autonomy.py b/formats/autonomy_engine_control.py similarity index 94% rename from formats/autonomy.py rename to formats/autonomy_engine_control.py index 4214db7..6ccbd47 100644 --- a/formats/autonomy.py +++ b/formats/autonomy_engine_control.py @@ -3,7 +3,7 @@ configurations and default instructions """ -autonomy_schema = { +autonomy_engine_control_schema = { "type": "object", "properties": { "message_type": { @@ -35,7 +35,7 @@ autonomy_schema = { ], "state": { "type": "string", - "enum": ["start", "stop"], + "enum": ["start", "pause", "stop"], "description": "Autonomy engine instruction to start or stop model", "example": "stop", }, diff --git a/generate_schema_config.py b/generate_schema_config.py index 825776f..c76b293 100644 --- a/generate_schema_config.py +++ b/generate_schema_config.py @@ -1,6 +1,6 @@ from formats.header import message_header from formats.message import message_schema -from formats.autonomy import autonomy_schema +from formats.autonomy_engine_control import autonomy_engine_control_schema from formats.mission_plan import mission_plan_schema from formats.mission_plan_encoded import mission_plan_encoded_schema from formats.observation import observation_schema @@ -67,7 +67,7 @@ def get_swagger_config(reload=False): "MESSAGE": message_schema, "header": message_header, "payload": payload_schema, - "autonomy": autonomy_schema, + "autonomy": autonomy_engine_control_schema, "mission_plan": mission_plan_schema, "mission_plan_encoded": mission_plan_encoded_schema, "observation": observation_schema, diff --git a/project/soar/swagger.json b/project/soar/swagger.json index eebeacc..3e6db6b 100644 --- a/project/soar/swagger.json +++ b/project/soar/swagger.json @@ -146,6 +146,7 @@ "description": "Autonomy engine instruction to start or stop model", "enum": [ "start", + "pause", "stop" ], "example": "stop", -- GitLab