isar 1.28.0__py3-none-any.whl → 1.28.1__py3-none-any.whl

isar/robot/robot.py

@@ -33,7 +33,7 @@ class Robot(object):
         self.start_mission_thread: Optional[RobotStartMissionThread] = None
         self.robot_status_thread: Optional[RobotStatusThread] = None
         self.robot_task_status_thread: Optional[RobotTaskStatusThread] = None
-        self.stop_mission_thread_thread: Optional[RobotStopMissionThread] = None
+        self.stop_mission_thread: Optional[RobotStopMissionThread] = None
         self.signal_thread_quitting: Event = Event()
 
     def stop(self) -> None:
@@ -42,19 +42,16 @@ class Robot(object):
             self.robot_status_thread.join()
         if (
             self.robot_task_status_thread is not None
-            and self.robot_status_thread.is_alive()
+            and self.robot_task_status_thread.is_alive()
         ):
             self.robot_task_status_thread.join()
         if (
             self.start_mission_thread is not None
-            and self.robot_status_thread.is_alive()
+            and self.start_mission_thread.is_alive()
         ):
             self.start_mission_thread.join()
-        if (
-            self.stop_mission_thread_thread is not None
-            and self.stop_mission_thread_thread.is_alive()
-        ):
-            self.stop_mission_thread_thread.join()
+        if self.stop_mission_thread is not None and self.stop_mission_thread.is_alive():
+            self.stop_mission_thread.join()
         self.robot_status_thread = None
         self.robot_task_status_thread = None
         self.start_mission_thread = None
@@ -92,7 +89,15 @@ class Robot(object):
     def _check_and_handle_stop_mission(self, event: Queue) -> None:
         if check_for_event(event):
             if (
-                self.stop_mission_thread_thread is not None
+                self.stop_mission_thread is not None
+                and self.stop_mission_thread.is_alive()
+            ):
+                self.logger.warning(
+                    "Received stop mission event while trying to stop a mission. Aborting stop attempt."
+                )
+                return
+            if (
+                self.start_mission_thread is not None
                 and self.start_mission_thread.is_alive()
             ):
                 error_description = "Received stop mission event while trying to start a mission. Aborting stop attempt."
@@ -104,10 +109,10 @@ class Robot(object):
                     self.robot_service_events.mission_failed_to_stop, error_message
                 )
                 return
-            self.stop_mission_thread_thread = RobotStopMissionThread(
+            self.stop_mission_thread = RobotStopMissionThread(
                 self.robot_service_events, self.robot, self.signal_thread_quitting
             )
-            self.stop_mission_thread_thread.start()
+            self.stop_mission_thread.start()
 
     def run(self) -> None:
         self.robot_status_thread = RobotStatusThread(

isar/robot/robot_start_mission.py

@@ -61,6 +61,10 @@ class RobotStartMissionThread(Thread):
                                 error_description=error_description,
                             ),
                         )
+                        break
+
+                    continue
+
                 started_mission = True
         except RobotInfeasibleMissionException as e:
             trigger_event(
@@ -69,4 +73,6 @@ class RobotStartMissionThread(Thread):
                     error_reason=e.error_reason, error_description=e.error_description
                 ),
             )
-        trigger_event_without_data(self.robot_service_events.mission_started)
+
+        if started_mission:
+            trigger_event_without_data(self.robot_service_events.mission_started)

{isar-1.28.0.dist-info → isar-1.28.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.28.0
+Version: 1.28.1
 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.28.0.dist-info → isar-1.28.1.dist-info}/RECORD

@@ -50,8 +50,8 @@ isar/models/communication/queues/queue_timeout_error.py,sha256=rF8TlNF7RHS_ueTZ5
 isar/models/communication/queues/queue_utils.py,sha256=wg6bIR3NS35Ek9hnGR5eN8z6i0jd5tOwM-8l30h3uiA,868
 isar/models/communication/queues/status_queue.py,sha256=on8kvlNsG6MJjEVsyqtBswIpmOdOggQiKr7F5x0T3jw,514
 isar/models/mission_metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/robot/robot.py,sha256=ubHX8AM54Iz5CdINfSRkhs7V8VGSIeuH1pZboUfeLMw,5244
-isar/robot/robot_start_mission.py,sha256=0S5mzOENLtRvW75THr_PTlSDycI3NVMOptJuL9TV0v8,2766
+isar/robot/robot.py,sha256=h-Z_1xCACekHvaj-vPJAhdzixSlcW4zMpe9__ui0zv8,5490
+isar/robot/robot_start_mission.py,sha256=QcNtGwM8ukf6iL3830AwAnBszmVDSgYe2J_xaFYLP0g,2860
 isar/robot/robot_status.py,sha256=j5fGq5FzpEscmqUL6i8jRWCZEJ56b2g_DUpAgWpE1YI,1935
 isar/robot/robot_stop_mission.py,sha256=jUyfemvbyigxrlIp9aKPn-PvarhagJEgajQPS_LgJ7g,2442
 isar/robot/robot_task_status.py,sha256=71SYPnoqaFbTe1bELLTvAUigAJ-McpomC2sjYQNQs_A,3290
@@ -103,7 +103,7 @@ isar/storage/slimm_storage.py,sha256=4YsQ1RBztfx6n3pEblwb5G3ndoQN_IZm7bujRktpTx4
 isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
 isar/storage/uploader.py,sha256=XoNnDS7_ILRZMGnQCBpRERmgSbFYPfgKRYk1tNHSFxQ,6868
 isar/storage/utilities.py,sha256=LL9XOUUYPHUQndM7pGrV-_utUQuraK-_8DDseOpVnWQ,3266
-isar-1.28.0.dist-info/licenses/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.28.1.dist-info/licenses/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/robot_interface.py,sha256=Bkk-joyIzRHxv8iZt7FLPFnlE8chlJad9vgjwc-fDkw,8786
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
@@ -127,8 +127,8 @@ robot_interface/telemetry/payloads.py,sha256=75hR-FYwmcbQVqorLzaStOrx_6DI3_CTxFp
 robot_interface/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/utilities/json_service.py,sha256=qkzVkb60Gi_pto-b5n1vNzCrQze2yqgIJqSLNLYj1Fg,1034
 robot_interface/utilities/uuid_string_factory.py,sha256=_NQIbBQ56w0qqO0MUDP6aPpHbxW7ATRhK8HnQiBSLkc,76
-isar-1.28.0.dist-info/METADATA,sha256=09XJIgb9-ljtOphZvTKF8KEWCELC672HU9_9K1ad6uw,30709
-isar-1.28.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-isar-1.28.0.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.28.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.28.0.dist-info/RECORD,,
+isar-1.28.1.dist-info/METADATA,sha256=58wexBpmUFqvZoAuimv4sOx97-V_PWO4UCCpO3kWkPQ,30709
+isar-1.28.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+isar-1.28.1.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.28.1.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.28.1.dist-info/RECORD,,