From 0fd326368fb7162b9918a9e422bbbe5677b88a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Badenes?= Date: Mon, 23 Dec 2024 11:00:25 -0300 Subject: [PATCH 1/3] Upload connector_version value --- mir_connector/inorbit_mir_connector/src/connector.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mir_connector/inorbit_mir_connector/src/connector.py b/mir_connector/inorbit_mir_connector/src/connector.py index 8e91a31..c9a31d4 100644 --- a/mir_connector/inorbit_mir_connector/src/connector.py +++ b/mir_connector/inorbit_mir_connector/src/connector.py @@ -15,6 +15,7 @@ from .mir_api import MirWebSocketV2 from .mission import MirInorbitMissionTracking from ..config.mir100_model import MiR100Config +from .. import __version__ # Available MiR states to select via actions @@ -113,8 +114,8 @@ def _inorbit_command_handler(self, command_name, args, options): - `metadata` is reserved for the future and will contains additional information about the received command request. """ + self._logger.info(f"Received '{command_name}'!. {args}") if command_name == COMMAND_CUSTOM_COMMAND: - self._logger.info(f"Received '{command_name}'!. {args}") if len(args) < 2: self._logger.error("Invalid number of arguments: ", args) options["result_function"]( @@ -194,7 +195,6 @@ def _inorbit_command_handler(self, command_name, args, options): # Return '0' for success options["result_function"]("0") elif command_name == COMMAND_NAV_GOAL: - self._logger.info(f"Received '{command_name}'!. {args}") pose = args[0] self.send_waypoint_over_missions(pose) elif command_name == COMMAND_MESSAGE: @@ -264,6 +264,7 @@ def _execution_loop(self): # publish key values # TODO(Elvio): Move key values to a "values.py" and represent them with constants key_values = { + "connector_version": __version__, "battery percent": self.status["battery_percentage"], "battery_time_remaining": self.status["battery_time_remaining"], "uptime": self.status["uptime"], From 0fd5af4fa876b4218cbc79b78ff61a73d7ffa9a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Badenes?= Date: Mon, 23 Dec 2024 11:19:43 -0300 Subject: [PATCH 2/3] Fix unit test --- mir_connector/inorbit_mir_connector/tests/test_connector.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mir_connector/inorbit_mir_connector/tests/test_connector.py b/mir_connector/inorbit_mir_connector/tests/test_connector.py index 74dca9d..2362307 100644 --- a/mir_connector/inorbit_mir_connector/tests/test_connector.py +++ b/mir_connector/inorbit_mir_connector/tests/test_connector.py @@ -12,6 +12,7 @@ from inorbit_mir_connector.src.mir_api import MirApiV2 from inorbit_mir_connector.src.connector import Mir100Connector from inorbit_mir_connector.config.mir100_model import MiR100Config +from .. import __version__ @pytest.fixture @@ -366,6 +367,7 @@ def run_loop_once(): ) assert connector._robot_session.publish_key_values.call_args == call( { + "connector_version": __version__, "battery percent": 93.5, "battery_time_remaining": 89725, "uptime": 3552693, From 38e8df7a4d4e7b9a303f1266c0951fbeb8a16b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Badenes?= Date: Mon, 23 Dec 2024 13:55:29 -0300 Subject: [PATCH 3/3] Use `get_module_version()` --- mir_connector/inorbit_mir_connector/src/connector.py | 4 ++-- mir_connector/inorbit_mir_connector/tests/test_connector.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mir_connector/inorbit_mir_connector/src/connector.py b/mir_connector/inorbit_mir_connector/src/connector.py index c9a31d4..b1e7868 100644 --- a/mir_connector/inorbit_mir_connector/src/connector.py +++ b/mir_connector/inorbit_mir_connector/src/connector.py @@ -11,11 +11,11 @@ from inorbit_edge.robot import COMMAND_CUSTOM_COMMAND from inorbit_edge.robot import COMMAND_MESSAGE from inorbit_edge.robot import COMMAND_NAV_GOAL +from inorbit_mir_connector import get_module_version from .mir_api import MirApiV2 from .mir_api import MirWebSocketV2 from .mission import MirInorbitMissionTracking from ..config.mir100_model import MiR100Config -from .. import __version__ # Available MiR states to select via actions @@ -264,7 +264,7 @@ def _execution_loop(self): # publish key values # TODO(Elvio): Move key values to a "values.py" and represent them with constants key_values = { - "connector_version": __version__, + "connector_version": get_module_version(), "battery percent": self.status["battery_percentage"], "battery_time_remaining": self.status["battery_time_remaining"], "uptime": self.status["uptime"], diff --git a/mir_connector/inorbit_mir_connector/tests/test_connector.py b/mir_connector/inorbit_mir_connector/tests/test_connector.py index 2362307..0dbcdfd 100644 --- a/mir_connector/inorbit_mir_connector/tests/test_connector.py +++ b/mir_connector/inorbit_mir_connector/tests/test_connector.py @@ -12,7 +12,7 @@ from inorbit_mir_connector.src.mir_api import MirApiV2 from inorbit_mir_connector.src.connector import Mir100Connector from inorbit_mir_connector.config.mir100_model import MiR100Config -from .. import __version__ +from .. import get_module_version @pytest.fixture @@ -367,7 +367,7 @@ def run_loop_once(): ) assert connector._robot_session.publish_key_values.call_args == call( { - "connector_version": __version__, + "connector_version": get_module_version(), "battery percent": 93.5, "battery_time_remaining": 89725, "uptime": 3552693,