isar 1.24.1__py3-none-any.whl → 1.24.2__py3-none-any.whl

isar/apis/schedule/scheduling_controller.py

@@ -21,13 +21,7 @@ from isar.mission_planner.mission_planner_interface import MissionPlannerError
 from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.state_machine.states_enum import States
 from robot_interface.models.mission.mission import Mission
-from robot_interface.models.mission.task import (
-    TASKS,
-    Localize,
-    MoveArm,
-    ReturnToHome,
-)
-from robot_interface.models.mission.task import Task
+from robot_interface.models.mission.task import TASKS, Localize, MoveArm, ReturnToHome
 
 
 class SchedulingController:
@@ -192,7 +186,7 @@ class SchedulingController:
 
         state: States = self.scheduling_utilities.get_state()
 
-        if state in [States.Off, States.Idle]:
+        if state == States.Off:
             error_message = (
                 f"Conflict - Stop command received in invalid state - State: {state}"
             )

isar/state_machine/state_machine.py

@@ -32,11 +32,7 @@ from isar.state_machine.states_enum import States
 from robot_interface.models.exceptions.robot_exceptions import ErrorMessage
 from robot_interface.models.initialize.initialize_params import InitializeParams
 from robot_interface.models.mission.mission import Mission
-from robot_interface.models.mission.status import (
-    MissionStatus,
-    RobotStatus,
-    TaskStatus,
-)
+from robot_interface.models.mission.status import MissionStatus, RobotStatus, TaskStatus
 from robot_interface.models.mission.task import TASKS, Task
 from robot_interface.robot_interface import RobotInterface
 from robot_interface.telemetry.mqtt_client import MqttClientInterface
@@ -134,7 +130,11 @@ class StateMachine(object):
                 },
                 {
                     "trigger": "stop",
-                    "source": [self.initiate_state, self.monitor_state],
+                    "source": [
+                        self.initiate_state,
+                        self.monitor_state,
+                        self.idle_state,
+                    ],
                     "dest": self.stop_state,
                     "before": self._stop,
                 },
@@ -371,6 +371,11 @@ class StateMachine(object):
             self.iterate_current_task()
 
     def _mission_stopped(self) -> None:
+        if self.current_mission is None:
+            self._queue_empty_response()
+            self.reset_state_machine()
+            return
+
         self.current_mission.status = MissionStatus.Cancelled
 
         for task in self.current_mission.tasks:
@@ -588,6 +593,16 @@ class StateMachine(object):
             task_status=self.current_task.status,
         )
 
+    def _queue_empty_response(self):
+        self.queues.stop_mission.output.put(
+            ControlMissionResponse(
+                mission_id="None",
+                mission_status="None",
+                task_id="None",
+                task_status="None",
+            )
+        )
+
 
 def main(state_machine: StateMachine):
     """Starts a state machine instance."""

isar/state_machine/states/idle.py

@@ -36,6 +36,9 @@ class Idle(State):
 
     def _run(self) -> None:
         while True:
+            if self.state_machine.should_stop_mission():
+                transition = self.state_machine.stop  # type: ignore
+                break
             start_mission: Optional[StartMissionMessage] = (
                 self.state_machine.should_start_mission()
             )

isar/state_machine/states/monitor.py

@@ -49,7 +49,6 @@ class Monitor(State):
         if self.task_status_thread:
             self.task_status_thread.wait_for_thread()
         self.task_status_thread = None
-        self.request_status_failure_counter = 0
 
     def _run(self) -> None:
         transition: Callable
@@ -76,15 +75,19 @@ class Monitor(State):
             except ThreadedRequestNotFinishedError:
                 time.sleep(self.state_machine.sleep_time)
                 continue
-
             except (
                 RobotCommunicationTimeoutException,
                 RobotCommunicationException,
             ) as e:
-                task_failed: bool = self._handle_communication_retry(e)
-                if task_failed:
+                retry_limit_exceeded: bool = self._check_if_exceeded_retry_limit(e)
+                if retry_limit_exceeded:
+                    self.logger.error(
+                        f"Monitoring task {self.state_machine.current_task.id[:8]} failed "
+                        f"because: {e.error_description}"
+                    )
                     status = TaskStatus.Failed
                 else:
+                    time.sleep(self.state_machine.sleep_time)
                     continue
 
             except RobotTaskStatusException as e:
@@ -111,7 +114,7 @@ class Monitor(State):
                 )
                 break
 
-            if self.state_machine.current_task == None:
+            if self.state_machine.current_task is None:
                 self.state_machine.iterate_current_task()
 
             self.state_machine.current_task.status = status
@@ -142,7 +145,7 @@ class Monitor(State):
                     )
 
                     self.state_machine.iterate_current_task()
-                    if self.state_machine.current_task == None:
+                    if self.state_machine.current_task is None:
                         transition = self.state_machine.full_mission_finished  # type: ignore
                         break
 
@@ -193,6 +196,7 @@ class Monitor(State):
         self.logger.info(f"Inspection: {str(inspection.id)[:8]} queued for upload")
 
     def _report_task_status(self, task: Task) -> None:
+        self.request_status_failure_counter = 0
         if task.status == TaskStatus.Failed:
             self.logger.warning(
                 f"Task: {str(task.id)[:8]} was reported as failed by the robot"
@@ -215,7 +219,7 @@ class Monitor(State):
         )
         self.state_machine.current_task.error_message = error_message
 
-    def _handle_communication_retry(
+    def _check_if_exceeded_retry_limit(
         self, e: Union[RobotCommunicationTimeoutException, RobotCommunicationException]
     ) -> bool:
         self.state_machine.current_mission.error_message = ErrorMessage(

{isar-1.24.1.dist-info → isar-1.24.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.24.1
+Version: 1.24.2
 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.24.1.dist-info → isar-1.24.2.dist-info}/RECORD

@@ -7,7 +7,7 @@ isar/apis/models/__init__.py,sha256=NI1BYyN__Ogr00Qqe0XJ-9gEVPva2brXo2RJsbrS4tM,
 isar/apis/models/models.py,sha256=6E8VhGBti6EKJefYTDNVERxRu_g_omg4J2MriPUPkaw,1709
 isar/apis/models/start_mission_definition.py,sha256=oY2CRKNkf4DQys0lbz-WTib1Ppw_OUwHqhBTrBhUJQk,8044
 isar/apis/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/apis/schedule/scheduling_controller.py,sha256=GXjvkF4OPRJTWzQEvvxbKc79x2X2uzqbl1ZOv_-9Fpw,11508
+isar/apis/schedule/scheduling_controller.py,sha256=JbVF0kvGACqc0Pgbt5DLsiXkRx4WWPiAZnYlHUrAHz0,11419
 isar/apis/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/security/authentication.py,sha256=TI8U9Y_L6ihHLMeM50ZONd5EPfuHdw_XMU_Q987W4AY,1975
 isar/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,13 +67,13 @@ isar/services/utilities/queue_utilities.py,sha256=Pw3hehSwkXJNeDv-bDVDfs58VOwtt3
 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
+isar/state_machine/state_machine.py,sha256=ceH0WiQNVMYIe7mVuH62L7OPPGrj1Qx2FuToIYBRQlk,21820
 isar/state_machine/states_enum.py,sha256=BlrUcBWkM5K6D_UZXRwTaUgGpAagWmVZH6HhDBGzVU4,278
 isar/state_machine/states/__init__.py,sha256=kErbKPDTwNfCLijvdyN6_AuOqDwR23nu9F0Qovsnir4,218
-isar/state_machine/states/idle.py,sha256=TVUVtoFwe3-InO4tEupa1_MNG3bviLuMxmHV7FX7Js0,3076
+isar/state_machine/states/idle.py,sha256=wKEG3QzmEO3MfFCwbh9vBRZin3sby_cwXhm85Fke9-s,3224
 isar/state_machine/states/initialize.py,sha256=TVXV5Ps3N4_flM88j9pQiX88kZgLzLwzlJy_6hPbgcA,2359
 isar/state_machine/states/initiate.py,sha256=j1wvSC3zVODgRkKOVsQROiuWkjihSBtwCs5GsoivLvc,5655
-isar/state_machine/states/monitor.py,sha256=4gCSf_FpHcxPiaaAuOJ5Tqhw79kqcaY5e_fg0nmA83I,9578
+isar/state_machine/states/monitor.py,sha256=bcrLKftME7tWUGCwx_wj6myZToD4BBJT3jq9WMbpd0w,9874
 isar/state_machine/states/off.py,sha256=jjqN_oJMpBtWuY7hP-c9f0w3p2CYCfe-NpmYHHPnmyI,544
 isar/state_machine/states/offline.py,sha256=IfEZ6-kl6OfJSRT1eKHOey7AU23tKiSHqpwGqclmH_c,2166
 isar/state_machine/states/paused.py,sha256=TIg1iJvAxGUIfzE_qWp0wrq4Ka0a3zEf3GNwIWLIK0M,1177
@@ -108,9 +108,9 @@ robot_interface/telemetry/payloads.py,sha256=FafpIwsOvcTNtaBZqyOX7r5EjG7nZ2uLNhy
 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.24.1.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.24.1.dist-info/METADATA,sha256=pwUuwsVvZLQpkRAeB0Fp4pN57jatvgLN58n4JgLLWDA,30661
-isar-1.24.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-isar-1.24.1.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.24.1.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.24.1.dist-info/RECORD,,
+isar-1.24.2.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.24.2.dist-info/METADATA,sha256=Rh1FBaPlouwNa4sbVMC_qL66uHwrTzkGBrUsbx61WuI,30661
+isar-1.24.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+isar-1.24.2.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.24.2.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.24.2.dist-info/RECORD,,