isar 1.27.0__py3-none-any.whl → 1.27.2__py3-none-any.whl

isar/robot/robot_task_status.py

@@ -50,15 +50,15 @@ class RobotTaskStatusThread(Thread):
 
             try:
                 task_status = self.robot.task_status(self.task_id)
-                self.request_status_failure_counter = 0
+                request_status_failure_counter = 0
             except (
                 RobotCommunicationTimeoutException,
                 RobotCommunicationException,
             ) as e:
-                self.request_status_failure_counter += 1
+                request_status_failure_counter += 1
                 self.logger.error(
                     f"Failed to get task status "
-                    f"{self.request_status_failure_counter} times because: "
+                    f"{request_status_failure_counter} times because: "
                     f"{e.error_description}"
                 )
 

isar/state_machine/states/stopping.py

@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Optional
 from transitions import State
 
 from isar.models.communication.queues.queue_utils import check_for_event
-from isar.services.utilities.threaded_request import ThreadedRequest
 from robot_interface.models.exceptions.robot_exceptions import ErrorMessage
 
 if TYPE_CHECKING:
@@ -19,7 +18,6 @@ class Stopping(State):
         self.state_machine: "StateMachine" = state_machine
         self.logger = logging.getLogger("state_machine")
         self.events = self.state_machine.events
-        self.stop_thread: Optional[ThreadedRequest] = None
         self._count_number_retries: int = 0
         self.signal_state_machine_to_stop = state_machine.signal_state_machine_to_stop
         self.stopping_return_home_mission: bool = False
@@ -33,9 +31,6 @@ class Stopping(State):
         self._run()
 
     def stop(self) -> None:
-        if self.stop_thread:
-            self.stop_thread.wait_for_thread()
-        self.stop_thread = None
         self._count_number_retries = 0
         self.stopping_return_home_mission = False
 

isar/state_machine/transitions/functions/stop.py

@@ -34,7 +34,16 @@ def stop_mission_cleanup(state_machine: "StateMachine") -> bool:
         state_machine._make_control_mission_response()
     )
     state_machine.events.api_requests.stop_mission.output.put(stopped_mission_response)
-
     state_machine.publish_task_status(task=state_machine.current_task)
     state_machine._finalize()
     return True
+
+
+def stop_return_home_mission_cleanup(state_machine: "StateMachine") -> bool:
+    if state_machine.current_mission is None:
+        state_machine._queue_empty_response()
+        state_machine.reset_state_machine()
+        return True
+
+    state_machine._finalize()
+    return True

isar/state_machine/transitions/mission.py

@@ -15,6 +15,7 @@ from isar.state_machine.transitions.functions.start_mission import (
 )
 from isar.state_machine.transitions.functions.stop import (
     stop_mission_cleanup,
+    stop_return_home_mission_cleanup,
     trigger_stop_mission_event,
 )
 from isar.state_machine.transitions.functions.utils import def_transition
@@ -59,7 +60,7 @@ def get_mission_transitions(state_machine: "StateMachine") -> List[dict]:
             "trigger": "return_home_mission_stopped",
             "source": state_machine.stopping_state,
             "dest": state_machine.robot_standing_still_state,
-            "before": def_transition(state_machine, stop_mission_cleanup),
+            "before": def_transition(state_machine, stop_return_home_mission_cleanup),
         },
         {
             "trigger": "request_mission_start",

{isar-1.27.0.dist-info → isar-1.27.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isar
-Version: 1.27.0
+Version: 1.27.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.27.0.dist-info → isar-1.27.2.dist-info}/RECORD

@@ -54,7 +54,7 @@ isar/robot/robot.py,sha256=ubHX8AM54Iz5CdINfSRkhs7V8VGSIeuH1pZboUfeLMw,5244
 isar/robot/robot_start_mission.py,sha256=0S5mzOENLtRvW75THr_PTlSDycI3NVMOptJuL9TV0v8,2766
 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=Rfmw5DUMZWsdjuLyPOegTbfkyAkNN3TW9EcHSoZ7fpo,3305
+isar/robot/robot_task_status.py,sha256=71SYPnoqaFbTe1bELLTvAUigAJ-McpomC2sjYQNQs_A,3290
 isar/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/auth/azure_credentials.py,sha256=9PlwGe5FrPRbW2dp0go7LMp8_l_FRvL8xOXotXwzRDo,364
@@ -82,9 +82,9 @@ isar/state_machine/states/offline.py,sha256=aqHv8EH68pfq4yTIxOxxDW7VMkPWcQZX3fNg
 isar/state_machine/states/paused.py,sha256=NgEl48GjLvnqGfPipYZZ6Yj8vdTb-fFLAK2tUu8i9j8,1461
 isar/state_machine/states/returning_home.py,sha256=UErxB5xQMtjHtCmg-GLJutli2D6Lc29tbhdNcdxIC2M,6973
 isar/state_machine/states/robot_standing_still.py,sha256=h2a0CTxXIjE8YKT9_8hkU80q0caq4TYCxHaOYB54cKc,3378
-isar/state_machine/states/stopping.py,sha256=fxebBwB5rgRQQ1BPpmqrPBo0PxVvFdlXuQAidOGa4nY,3074
+isar/state_machine/states/stopping.py,sha256=Y44kEw-xB9_63eP6utAMY0RegrIz_1nL5cSI3cfaXEg,2838
 isar/state_machine/states/unknown_status.py,sha256=tOwfHW_4bKKkUTpKD7qc5gIwGT_fTXaCNxXcogGw-wo,2416
-isar/state_machine/transitions/mission.py,sha256=B2d409Q8rJfG4kIY7ZWQWnyxB81xinCUsvm_VWfxMr4,4817
+isar/state_machine/transitions/mission.py,sha256=JJt_v84xFS60cMDIz_MsE6GRLBwpxx2JM5BTIB2O05Q,4867
 isar/state_machine/transitions/return_home.py,sha256=LeOMnckUUQYzBYRidD2ge6M0KdxGDTgo-ioXR7_9r8A,2714
 isar/state_machine/transitions/robot_status.py,sha256=c1ceyWRGCtx-KTDtxHXRD7oPbt8TQ2ej24A0wyim8vc,2720
 isar/state_machine/transitions/functions/fail_mission.py,sha256=_6HqBMALDinFZ4yh5GMpeqqgV5tw5i8OVMj5UDdqesg,495
@@ -94,7 +94,7 @@ isar/state_machine/transitions/functions/resume.py,sha256=9KQjH_6YBGyxFhb7G5dgDe
 isar/state_machine/transitions/functions/return_home.py,sha256=UlniwYvpz74hxqgN0TyVv3LCmiMsqsosKEtEGLqkNj0,1139
 isar/state_machine/transitions/functions/robot_status.py,sha256=xhKZ5u_X8uDvnhvGnAIABuKaPXeVqFjkgj4H2Om-j_A,1013
 isar/state_machine/transitions/functions/start_mission.py,sha256=w8UDiq9pOHu-ei61ng6rWGjfrh6nk_qSokEVdzBHwzY,2516
-isar/state_machine/transitions/functions/stop.py,sha256=NzPvr6C1tmDqji5XJf5vw9up_Ow7ApuhjAzDVlJLZPw,1368
+isar/state_machine/transitions/functions/stop.py,sha256=aIj3EPnpgNLdsJwOK1ehhI1TpenQa9JjBxZH0Nm6dLg,1649
 isar/state_machine/transitions/functions/utils.py,sha256=Wa72Ocq4QT1E6qkpEJZQ3h5o33pGvx7Tlkt2JZ2Grbk,314
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/storage/blob_storage.py,sha256=Qci6bO508nlTHKPuPtVU5QcvGA4T7mv8cFrKWRcfw4g,3226
@@ -103,7 +103,7 @@ isar/storage/slimm_storage.py,sha256=DJVvTce4cb8m0_b_r6yog41UuxO_9VKb1hYCZUTEhR0
 isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
 isar/storage/uploader.py,sha256=M7FEr0iLsrSil8SqP7vmB3hswIOA2HTrnakj6aOQbvg,6749
 isar/storage/utilities.py,sha256=fitsdQ1ox5gr9fk9VuSk_iTBiEAIS8NZAnHabUZORh0,3173
-isar-1.27.0.dist-info/licenses/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.27.2.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=m55aFrIczI-PDwQXvsFA6M7YNCTy83w7Ff-
 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.27.0.dist-info/METADATA,sha256=OBbuMdSc9sbPALQ2Y4DYubr37T0Xn2jh-Bu9cL__KeU,30709
-isar-1.27.0.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-isar-1.27.0.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
-isar-1.27.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.27.0.dist-info/RECORD,,
+isar-1.27.2.dist-info/METADATA,sha256=TgKO_J8HQ-cWqYrry3YO78zJSOFZE6XY2I6HcdrIbZI,30709
+isar-1.27.2.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+isar-1.27.2.dist-info/entry_points.txt,sha256=TFam7uNNw7J0iiDYzsH2gfG0u1eV1wh3JTw_HkhgKLk,49
+isar-1.27.2.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.27.2.dist-info/RECORD,,

{isar-1.27.0.dist-info → isar-1.27.2.dist-info}/WHEEL

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