isar 1.23.2__py3-none-any.whl → 1.23.3__py3-none-any.whl

isar/services/utilities/scheduling_utilities.py

@@ -128,7 +128,7 @@ class SchedulingUtilities:
         """
         is_state_machine_ready_to_receive_mission = state == States.Idle
         if not is_state_machine_ready_to_receive_mission:
-            error_message = f"Conflict - Mission already in progress - State: {state}"
+            error_message = f"Conflict - Robot is not idle - State: {state}"
             self.logger.warning(error_message)
             raise HTTPException(status_code=HTTPStatus.CONFLICT, detail=error_message)
 

{isar-1.23.2.dist-info → isar-1.23.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.23.2
+Version: 1.23.3
 Summary: Integration and Supervisory control of Autonomous Robots
 Author-email: Equinor ASA <fg_robots_dev@equinor.com>
 License: Eclipse Public License version 2.0

{isar-1.23.2.dist-info → isar-1.23.3.dist-info}/RECORD

@@ -64,7 +64,7 @@ isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=5G6ahslydh
 isar/services/service_connections/stid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/utilities/queue_utilities.py,sha256=Pw3hehSwkXJNeDv-bDVDfs58VOwtt3i5hpiJ2ZpphuQ,1225
-isar/services/utilities/scheduling_utilities.py,sha256=cLnB97EkoZM0GN6kG5ezpzxLzACSoHU_Mv86ncyHdfM,8386
+isar/services/utilities/scheduling_utilities.py,sha256=UUMxhudY2mQRG6Edjq6BG7oxwlqmcu5h6fMyw4Vhl_o,8376
 isar/services/utilities/threaded_request.py,sha256=py4G-_RjnIdHljmKFAcQ6ddqMmp-ZYV39Ece-dqRqjs,1874
 isar/state_machine/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/state_machine/state_machine.py,sha256=A7qAaXEnErmPQ7--sM7w9VabceS0qJOProlmwMb9iaU,21299
@@ -90,7 +90,7 @@ robot_interface/robot_interface.py,sha256=Jbfh1L7lPCjfHS6l3oQ_r0ACZw-KCazVc09Phx
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
 robot_interface/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robot_interface/models/exceptions/robot_exceptions.py,sha256=iRtN_JzwOSeuO0xBrGiWFtbIhWuajsw-Zg6Cz4y1hzk,9549
+robot_interface/models/exceptions/robot_exceptions.py,sha256=dTNhFguaPumtreYH3rlL-xVDAZk7djZe2CcE1rP3CgE,10064
 robot_interface/models/initialize/__init__.py,sha256=rz5neEDr59GDbzzI_FF0DId-C-I-50l113P-h-C_QBY,48
 robot_interface/models/initialize/initialize_params.py,sha256=2eG5Aq5bDKU6tVkaUMAoc46GERBgyaKkqv6yLupdRLc,164
 robot_interface/models/inspection/__init__.py,sha256=14wfuj4XZazrigKD7fL98khFKz-eckIpEgPcYRj40Kg,227
@@ -103,14 +103,14 @@ robot_interface/models/robots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 robot_interface/models/robots/robot_model.py,sha256=pZQsqhn9hh6XE3EjMZhWMzYqg5oJ4CJ4CXeOASKvEf8,452
 robot_interface/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/telemetry/media_connection_type.py,sha256=Z8Jayi5SjBJh_xEd5KdS__A6bM-nofbSAedc6u41iAY,91
-robot_interface/telemetry/mqtt_client.py,sha256=um7j7XDSAlY6-wWLpBl6ZYjmQ-G0lY7f2_NaZ3ciZ7U,2757
+robot_interface/telemetry/mqtt_client.py,sha256=RoXJFQ4YiaSQpHTlZ2LD-ICRPtfUhylEwgyt_3NE4xM,2916
 robot_interface/telemetry/payloads.py,sha256=FafpIwsOvcTNtaBZqyOX7r5EjG7nZ2uLNhyJo2l5GiI,1767
 robot_interface/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/utilities/json_service.py,sha256=nU2Q_3P9Fq9hs6F_wtUjWtHfl_g1Siy-yDhXXSKwHwg,1018
 robot_interface/utilities/uuid_string_factory.py,sha256=_NQIbBQ56w0qqO0MUDP6aPpHbxW7ATRhK8HnQiBSLkc,76
-isar-1.23.2.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.23.2.dist-info/METADATA,sha256=5AyHbYGvN3bT16Mw_aoA2arjS0fFk1QPRpWgc5MahFM,30674
-isar-1.23.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-isar-1.23.2.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.23.2.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.23.2.dist-info/RECORD,,
+isar-1.23.3.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.23.3.dist-info/METADATA,sha256=4HTu_oT3RXkcLHUhACMaPw4AhMkC8eJb8Ffr9nwnYZ8,30674
+isar-1.23.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+isar-1.23.3.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.23.3.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.23.3.dist-info/RECORD,,

{isar-1.23.2.dist-info → isar-1.23.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

robot_interface/models/exceptions/robot_exceptions.py

@@ -16,6 +16,7 @@ class ErrorReason(str, Enum):
     RobotRetrieveDataException: str = "robot_retrieve_data_exception"
     RobotRetrieveInspectionException: str = "robot_retrieve_inspection_exception"
     RobotTelemetryException: str = "robot_telemetry_exception"
+    RobotTelemetryPoseException: str = "robot_telemetry_pose_exception"
     RobotMapException: str = "robot_map_exception"
     RobotTransformException: str = "robot_transform_exception"
     RobotUnknownErrorException: str = "robot_unknown_error_exception"
@@ -189,6 +190,18 @@ class RobotTelemetryException(RobotException):
     pass
 
 
+# An exception which should be thrown by the robot package if it is unable to retrieve
+# telemetry pose data. It should be used exclusively by the telemetry pose publisher.
+class RobotTelemetryPoseException(RobotException):
+    def __init__(self, error_description: str) -> None:
+        super().__init__(
+            error_reason=ErrorReason.RobotTelemetryPoseException,
+            error_description=error_description,
+        )
+
+    pass
+
+
 # An exception which should be thrown by the robot package if it is unable to load the
 # configuration for maps and transformations. This could be caused by faulty
 # configuration and this exception will cause ISAR to crash as further execution is not

robot_interface/telemetry/mqtt_client.py

@@ -5,7 +5,10 @@ from datetime import datetime, timezone
 from queue import Queue
 from typing import Callable, Tuple
 
-from robot_interface.models.exceptions.robot_exceptions import RobotTelemetryException
+from robot_interface.models.exceptions.robot_exceptions import (
+    RobotTelemetryException,
+    RobotTelemetryPoseException,
+)
 from robot_interface.telemetry.payloads import CloudHealthPayload
 from robot_interface.utilities.json_service import EnhancedJSONEncoder
 
@@ -63,7 +66,7 @@ class MqttTelemetryPublisher(MqttClientInterface):
         self.retain: bool = retain
 
     def run(self, isar_id: str, robot_name: str) -> None:
-        self.cloud_healt_topic: str = f"isar/{isar_id}/cloud_health"
+        self.cloud_health_topic: str = f"isar/{isar_id}/cloud_health"
         topic: str
         payload: str
 
@@ -71,12 +74,15 @@ class MqttTelemetryPublisher(MqttClientInterface):
             try:
                 payload = self.telemetry_method(isar_id=isar_id, robot_name=robot_name)
                 topic = self.topic
+            except RobotTelemetryPoseException:
+                time.sleep(self.interval)
+                continue
             except RobotTelemetryException:
                 payload = json.dumps(
                     CloudHealthPayload(isar_id, robot_name, datetime.now(timezone.utc)),
                     cls=EnhancedJSONEncoder,
                 )
-                topic = self.cloud_healt_topic
+                topic = self.cloud_health_topic
 
             self.publish(topic=topic, payload=payload, qos=self.qos, retain=self.retain)