isar 1.16.14__py3-none-any.whl → 1.16.16__py3-none-any.whl

isar/state_machine/state_machine.py

@@ -349,12 +349,26 @@ class StateMachine(object):
         self.stopped = True
 
     def _initiate_failed(self) -> None:
-        self.current_step.status = StepStatus.Failed
-        self.current_task.update_task_status()
-        self.current_mission.status = MissionStatus.Failed
-        self.publish_step_status(step=self.current_step)
-        self.publish_task_status(task=self.current_task)
-        self._finalize()
+        if self.stepwise_mission:
+            self.current_step.status = StepStatus.Failed
+            self.current_task.update_task_status()
+            self.current_mission.status = MissionStatus.Failed
+            self.publish_step_status(step=self.current_step)
+            self.publish_task_status(task=self.current_task)
+            self._finalize()
+
+        else:
+            self.current_task = None
+            step_status: StepStatus = StepStatus.Cancelled
+            task_status: TaskStatus = TaskStatus.Cancelled
+
+            for task in self.current_mission.tasks:
+                task.status = task_status
+                for step in task.steps:
+                    step.status = step_status
+                    self.publish_step_status(step=step)
+                self.publish_task_status(task=task)
+            self._finalize()
 
     def _initiate_infeasible(self) -> None:
         if self.stepwise_mission:

isar/state_machine/states/initiate.py

@@ -103,7 +103,7 @@ class Initiate(State):
                     f"{str(self.state_machine.current_mission.id)[:8]} because: "
                     f"{e.error_description}"
                 )
-                transition = self.state_machine.initiate_infeasible  # type: ignore
+                transition = self.state_machine.initiate_failed  # type: ignore
                 break
 
             except RobotException as e:

isar/storage/blob_storage.py

@@ -1,5 +1,6 @@
 import logging
 from pathlib import Path
+from typing import Union
 
 from azure.core.exceptions import ResourceExistsError
 from azure.storage.blob import BlobClient, BlobServiceClient, ContainerClient
@@ -7,10 +8,10 @@ from injector import inject
 
 from isar.config.keyvault.keyvault_service import Keyvault
 from isar.config.settings import settings
-from robot_interface.models.mission.mission import Mission
 from isar.storage.storage_interface import StorageException, StorageInterface
 from isar.storage.utilities import construct_metadata_file, construct_paths
 from robot_interface.models.inspection.inspection import Inspection
+from robot_interface.models.mission.mission import Mission
 
 
 class BlobStorage(StorageInterface):
@@ -31,7 +32,7 @@ class BlobStorage(StorageInterface):
 
         self.logger = logging.getLogger("uploader")
 
-    def store(self, inspection: Inspection, mission: Mission) -> str:
+    def store(self, inspection: Inspection, mission: Mission) -> Union[str, dict]:
         data_path, metadata_path = construct_paths(
             inspection=inspection, mission=mission
         )
@@ -43,7 +44,7 @@ class BlobStorage(StorageInterface):
         self._upload_file(path=metadata_path, data=metadata_bytes)
         return self._upload_file(path=data_path, data=inspection.data)
 
-    def _upload_file(self, path: Path, data: bytes) -> str:
+    def _upload_file(self, path: Path, data: bytes) -> Union[str, dict]:
         blob_client = self._get_blob_client(path)
         try:
             blob_properties = blob_client.upload_blob(data=data)
@@ -55,7 +56,14 @@ class BlobStorage(StorageInterface):
         except Exception as e:
             self.logger.error("An unexpected error occurred while uploading blob")
             raise StorageException from e
-        return blob_properties["etag"]
+
+        absolute_inspection_path = {
+            "source": "blob",
+            "blob_storage_account_url": settings.BLOB_STORAGE_ACCOUNT_URL,
+            "blob_container": settings.BLOB_CONTAINER,
+            "blob_name": blob_client.blob_name,
+        }
+        return absolute_inspection_path
 
     def _get_blob_service_client(self) -> BlobServiceClient:
         try:

isar/storage/storage_interface.py

@@ -1,12 +1,13 @@
 from abc import ABCMeta, abstractmethod
+from typing import Union
 
-from robot_interface.models.mission.mission import Mission
 from robot_interface.models.inspection.inspection import Inspection
+from robot_interface.models.mission.mission import Mission
 
 
 class StorageInterface(metaclass=ABCMeta):
     @abstractmethod
-    def store(self, inspection: Inspection, mission: Mission) -> str:
+    def store(self, inspection: Inspection, mission: Mission) -> Union[str, dict]:
         """
         Parameters
         ----------

isar/storage/uploader.py

@@ -3,7 +3,7 @@ import logging
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from queue import Empty, Queue
-from typing import List
+from typing import List, Union
 
 from injector import inject
 
@@ -100,8 +100,8 @@ class Uploader:
             except Empty:
                 continue
 
-    def _upload(self, upload_item: UploaderQueueItem) -> str:
-        inspection_path = ""
+    def _upload(self, upload_item: UploaderQueueItem) -> Union[str, dict]:
+        inspection_path: Union[str, dict] = ""
         try:
             inspection_path = upload_item.storage_handler.store(
                 inspection=upload_item.inspection, mission=upload_item.mission
@@ -140,7 +140,7 @@ class Uploader:
             )
 
     def _publish_inspection_result(
-        self, inspection: Inspection, inspection_path: str
+        self, inspection: Inspection, inspection_path: Union[str, dict]
     ) -> None:
         """Publishes the reference of the inspection result to the MQTT Broker
         along with the analysis type

isar/storage/utilities.py

@@ -79,4 +79,5 @@ def get_filename(
 
 
 def get_foldername(mission: Mission) -> str:
-    return f"{datetime.utcnow().date()}__{settings.PLANT_SHORT_NAME}__{mission.name}__{mission.id}"
+    mission_name: str = mission.name.replace(" ", "-")
+    return f"{datetime.utcnow().date()}__{settings.PLANT_SHORT_NAME}__{mission_name}__{mission.id}"

{isar-1.16.14.dist-info → isar-1.16.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.16.14
+Version: 1.16.16
 Summary: Integration and Supervisory control of Autonomous Robots
 Home-page: https://github.com/equinor/isar
 Author: Equinor ASA

{isar-1.16.14.dist-info → isar-1.16.16.dist-info}/RECORD

@@ -67,23 +67,23 @@ isar/services/utilities/queue_utilities.py,sha256=Pw3hehSwkXJNeDv-bDVDfs58VOwtt3
 isar/services/utilities/scheduling_utilities.py,sha256=LFimEmacML3J9q-FNLfKPhcAr-R3f2rkYkbsoro0Gyo,8434
 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=ZqFg7CE291_X8Ix5NDQ3RGBLJx-fU3E007C82xyHMuk,23161
+isar/state_machine/state_machine.py,sha256=HXH9XuXRUfhKZQdp5IfwV-Do-QRRConpyiUBFl_p-mU,23707
 isar/state_machine/states_enum.py,sha256=ks1A8gO7DOpLbSe6Vzq4-BfTCU78IsQZyoEJwQ9Wg4M,254
 isar/state_machine/states/__init__.py,sha256=gUikQDu-O-lmunwzwcN9gN6VaEmlCFlqqgdNfFAfXBc,189
 isar/state_machine/states/idle.py,sha256=tfciqI7NPDVF8WMe5qbSO3c-xDzUTQYLmJinb9e0JS8,1231
 isar/state_machine/states/initialize.py,sha256=Vx7OxWZI_xEkRwHWFh9ymxK_7mDH0Wayt09dGGqBJWk,2359
-isar/state_machine/states/initiate.py,sha256=N2v1zsGJ3Zavs750LwBHMvLOtPW0RF57vCG8zUyRU5k,5656
+isar/state_machine/states/initiate.py,sha256=b0Fq3tN6TZMg5j4192OsYdGbphTXWCkftBsFX57mhrw,5652
 isar/state_machine/states/monitor.py,sha256=2eYv2wUH0MLwxZCizBHIpigELPeou6KzCzW_JuEVlls,8612
 isar/state_machine/states/off.py,sha256=jjqN_oJMpBtWuY7hP-c9f0w3p2CYCfe-NpmYHHPnmyI,544
 isar/state_machine/states/paused.py,sha256=xVZM9WMt90FTiP5forSlA3eJ5Vt9LzZYCFDQDPIocKA,1004
 isar/state_machine/states/stop.py,sha256=Sxdo4FGhxc2Pj91jidYtVIjpSNklbEf1sJYJ6x51HgE,3348
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/storage/blob_storage.py,sha256=8i23s_4d3_REKYxH1DzXF_Lc04pofOlrtDYML_t7BDc,2922
+isar/storage/blob_storage.py,sha256=oKdml1VVN8iTr-d_5H4Lz5E7zrhJRknCzOxHD-tO7m8,3230
 isar/storage/local_storage.py,sha256=fLzVuwvdEk9l8z7od1qX2p5MeWzcsx-vN4yWvelZeFM,1836
 isar/storage/slimm_storage.py,sha256=Hp7ZIgZgIR4KAFjzxDKfgMZjPZwP2kmdc1gG8zVcsMk,8966
-isar/storage/storage_interface.py,sha256=v7QiYGz79dqw9jbgNoLYD1QOvXFoMrqfVT1TJX7rCsw,790
-isar/storage/uploader.py,sha256=QyviG27Km6a2hBXE8Ka_qX2GInCjs3u84RiUloG3DJ0,6294
-isar/storage/utilities.py,sha256=dqh60eJ00rKNNmNLBkV-oNcNToxXLS7oAJpisJZZ90c,3053
+isar/storage/storage_interface.py,sha256=DYDry4I7aZpDHJhsBF6s8zrgokFAc7fdKJKfA8AvL7o,828
+isar/storage/uploader.py,sha256=Jpjml4fwPOeApHWfYWEO4gCfIxJKotujUTz2-5TTCt0,6345
+isar/storage/utilities.py,sha256=xnJHT_lu985k0Jlq7_Seu_nWVlocOCVAR8yz2zLkv5Q,3108
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/robot_interface.py,sha256=i2qw1V9mLO-ljtS7LiRliQ7XNmmBJIwD4NG8mDfwMEI,8317
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
@@ -107,8 +107,8 @@ robot_interface/telemetry/payloads.py,sha256=9EshERifjD1u8CwjSiV3NGuj0KuXnwblQNB
 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.16.14.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.16.14.dist-info/METADATA,sha256=RXNRtJQxYWt3uDRBAkhqGyAINUL7jVB1bsYwkNIrezA,14752
-isar-1.16.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-isar-1.16.14.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.16.14.dist-info/RECORD,,
+isar-1.16.16.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.16.16.dist-info/METADATA,sha256=fLeCxrQbsKkMJql1a7UVagNLjQvbU0HpphQI0v7FiFI,14752
+isar-1.16.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+isar-1.16.16.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.16.16.dist-info/RECORD,,

{isar-1.16.14.dist-info → isar-1.16.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any