isar 1.28.0__tar.gz → 1.28.1__tar.gz

{isar-1.28.0 → isar-1.28.1}/PKG-INFO

@@ -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 → isar-1.28.1}/requirements.txt

@@ -12,13 +12,13 @@ anyio==4.9.0
     # via
     #   httpx
     #   starlette
-azure-core==1.33.0
+azure-core==1.34.0
     # via
     #   azure-identity
     #   azure-keyvault-secrets
     #   azure-storage-blob
     #   opencensus-ext-azure
-azure-identity==1.21.0
+azure-identity==1.23.0
     # via
     #   isar (pyproject.toml)
     #   opencensus-ext-azure
@@ -30,20 +30,20 @@ backoff==2.2.1
     # via isar (pyproject.toml)
 cachetools==5.5.2
     # via google-auth
-certifi==2025.1.31
+certifi==2025.4.26
     # via
     #   httpcore
     #   httpx
     #   requests
 cffi==1.17.1
     # via cryptography
-charset-normalizer==3.4.1
+charset-normalizer==3.4.2
     # via requests
-click==8.1.8
+click==8.2.0
     # via
     #   isar (pyproject.toml)
     #   uvicorn
-cryptography==44.0.2
+cryptography==44.0.3
     # via
     #   azure-identity
     #   azure-storage-blob
@@ -64,7 +64,7 @@ fastapi-azure-auth==5.1.1
     # via isar (pyproject.toml)
 google-api-core==2.24.2
     # via opencensus
-google-auth==2.39.0
+google-auth==2.40.1
     # via google-api-core
 googleapis-common-protos==1.70.0
     # via google-api-core
@@ -85,7 +85,7 @@ isodate==0.7.2
     # via
     #   azure-keyvault-secrets
     #   azure-storage-blob
-msal==1.32.2
+msal==1.32.3
     # via
     #   azure-identity
     #   msal-extensions
@@ -113,7 +113,7 @@ paho-mqtt==2.1.0
     # via isar (pyproject.toml)
 proto-plus==1.26.1
     # via google-api-core
-protobuf==6.30.2
+protobuf==6.31.0
     # via
     #   google-api-core
     #   googleapis-common-protos
@@ -128,12 +128,12 @@ pyasn1-modules==0.4.2
     # via google-auth
 pycparser==2.22
     # via cffi
-pydantic==2.11.3
+pydantic==2.11.4
     # via
     #   fastapi
     #   isar (pyproject.toml)
     #   pydantic-settings
-pydantic-core==2.33.1
+pydantic-core==2.33.2
     # via pydantic
 pydantic-settings==2.9.1
     # via isar (pyproject.toml)
@@ -161,7 +161,7 @@ requests-toolbelt==1.0.0
     # via isar (pyproject.toml)
 rsa==4.9.1
     # via google-auth
-scipy==1.15.2
+scipy==1.15.3
     # via alitra
 six==1.17.0
     # via

{isar-1.28.0 → isar-1.28.1}/src/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-1.28.0 → isar-1.28.1}/src/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 → isar-1.28.1}/src/isar.egg-info/PKG-INFO

@@ -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