isar 1.14.4__tar.gz → 1.15.0__tar.gz

{isar-1.14.4 → isar-1.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.14.4
+Version: 1.15.0
 Summary: Integration and Supervisory control of Autonomous Robots
 Home-page: https://github.com/equinor/isar
 Author: Equinor ASA
@@ -41,7 +41,7 @@ Steps:
 For local development, please fork the repository. Then, clone and install in the repository root folder:
 
 ```
-git clone https://github.com/equinor/isar
+git clone https://github.com/<path_to_parent>/isar
 cd isar
 pip install -e .[dev]
 ```

{isar-1.14.4 → isar-1.15.0}/README.md

@@ -22,7 +22,7 @@ Steps:
 For local development, please fork the repository. Then, clone and install in the repository root folder:
 
 ```
-git clone https://github.com/equinor/isar
+git clone https://github.com/<path_to_parent>/isar
 cd isar
 pip install -e .[dev]
 ```

{isar-1.14.4 → isar-1.15.0}/src/isar/apis/models/start_mission_definition.py

@@ -1,3 +1,4 @@
+import time
 from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 
@@ -5,6 +6,7 @@ from alitra import Position
 from pydantic import BaseModel, Field
 
 from isar.apis.models.models import InputPose, InputPosition
+from isar.config.settings import settings
 from isar.mission_planner.mission_planner_interface import MissionPlannerError
 from robot_interface.models.mission.mission import Mission
 from robot_interface.models.mission.step import (
@@ -30,7 +32,7 @@ class InspectionTypes(str, Enum):
 class StartMissionInspectionDefinition(BaseModel):
     type: InspectionTypes = Field(default=InspectionTypes.image)
     inspection_target: InputPosition
-    analysis_types: Optional[List]
+    analysis_types: Optional[str]
     duration: Optional[float]
     metadata: Optional[dict]
     id: Optional[str]
@@ -46,6 +48,7 @@ class StartMissionTaskDefinition(BaseModel):
 class StartMissionDefinition(BaseModel):
     tasks: List[StartMissionTaskDefinition]
     id: Optional[str]
+    name: Optional[str]
 
 
 def to_isar_mission(mission_definition: StartMissionDefinition) -> Mission:
@@ -101,6 +104,14 @@ def to_isar_mission(mission_definition: StartMissionDefinition) -> Mission:
 
     isar_mission: Mission = Mission(tasks=isar_tasks)
 
+    if mission_definition.name:
+        isar_mission.name = mission_definition.name
+    else:
+        isar_mission.name = _build_mission_name()
+
+    if mission_definition.id:
+        isar_mission.id = mission_definition.id
+
     return isar_mission
 
 
@@ -108,7 +119,7 @@ def create_inspection_step(
     inspection_type: InspectionTypes,
     duration: float,
     target: Position,
-    analysis: Optional[List],
+    analysis: Optional[str],
     tag_id: Optional[str],
     metadata: Optional[dict],
     id: Optional[str],
@@ -151,3 +162,7 @@ def get_duplicate_ids(items: Union[List[Task], List[STEPS]]) -> List[str]:
             duplicate_ids.append(id)
 
     return duplicate_ids
+
+
+def _build_mission_name() -> str:
+    return f"{settings.PLANT_SHORT_NAME}{settings.ROBOT_NAME}{int(time.time())}"

{isar-1.14.4 → isar-1.15.0}/src/isar/apis/schedule/scheduling_controller.py

@@ -18,7 +18,6 @@ from isar.apis.models.start_mission_definition import (
 )
 from isar.config.settings import robot_settings, settings
 from isar.mission_planner.mission_planner_interface import MissionPlannerError
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
 from isar.services.utilities.scheduling_utilities import SchedulingUtilities
 from isar.state_machine.states_enum import States
 from robot_interface.models.mission.mission import Mission
@@ -76,10 +75,11 @@ class SchedulingController:
         )
 
         self.logger.info(f"Starting mission with ISAR Mission ID: '{mission.id}'")
-        metadata: MissionMetadata = MissionMetadata(mission.id)
+
         self.scheduling_utilities.start_mission(
-            mission=mission, initial_pose=initial_pose_alitra, mission_metadata=metadata
+            mission=mission, initial_pose=initial_pose_alitra
         )
+
         return self._api_response(mission)
 
     def start_mission(
@@ -139,10 +139,9 @@ class SchedulingController:
             initial_pose.to_alitra_pose() if initial_pose else None
         )
 
-        metadata: MissionMetadata = MissionMetadata(mission.id)
         self.logger.info(f"Starting mission: {mission.id}")
         self.scheduling_utilities.start_mission(
-            mission=mission, mission_metadata=metadata, initial_pose=initial_pose_alitra
+            mission=mission, initial_pose=initial_pose_alitra
         )
         return self._api_response(mission)
 
@@ -220,13 +219,11 @@ class SchedulingController:
         pose: Pose = target_pose.to_alitra_pose()
         step: DriveToPose = DriveToPose(pose=pose)
         mission: Mission = Mission(tasks=[Task(steps=[step])])
-        metadata: MissionMetadata = MissionMetadata(mission.id)
+
         self.logger.info(
             f"Starting drive to mission with ISAR Mission ID: '{mission.id}'"
         )
-        self.scheduling_utilities.start_mission(
-            mission=mission, initial_pose=None, mission_metadata=metadata
-        )
+        self.scheduling_utilities.start_mission(mission=mission, initial_pose=None)
         return self._api_response(mission)
 
     def start_localization_mission(
@@ -247,12 +244,13 @@ class SchedulingController:
         pose: Pose = localization_pose.to_alitra_pose()
         step: Localize = Localize(localization_pose=pose)
         mission: Mission = Mission(tasks=[Task(steps=[step])])
-        metadata: MissionMetadata = MissionMetadata(mission.id)
+
         self.logger.info(
             f"Starting localization mission with ISAR Mission ID: '{mission.id}'"
         )
         self.scheduling_utilities.start_mission(
-            mission=mission, initial_pose=None, mission_metadata=metadata
+            mission=mission,
+            initial_pose=None,
         )
         return self._api_response(mission)
 

{isar-1.14.4 → isar-1.15.0}/src/isar/config/predefined_mission_definition/default_mission.json

@@ -28,10 +28,7 @@
                             "z": 0,
                             "frame_name": "robot"
                         },
-                        "analysis_types": [
-                            "CarSeal",
-                            "Rust"
-                        ],
+                        "analysis_types": "CarSeal, Rust",
                         "metadata": {
                             "zoom": "2x"
                         }
@@ -44,9 +41,8 @@
                             "z": 0,
                             "frame_name": "robot"
                         },
-                        "analysis_types": [
-                            "GasDetection"
-                        ],
+                        "analysis_types": "GasDetection"
+                        ,
                         "duration": 10
                     }
                 ]
@@ -77,10 +73,7 @@
                             "z": 0,
                             "frame_name": "robot"
                         },
-                        "analysis_types": [
-                            "ColdSpot",
-                            "HotSpot"
-                        ]
+                        "analysis_types": "ColdSpot,HotSpot"
                     },
                     {
                         "type": "Video",

{isar-1.14.4 → isar-1.15.0}/src/isar/config/predefined_mission_definition/default_turtlebot.json

@@ -28,10 +28,8 @@
                             "z": 0,
                             "frame": "robot"
                         },
-                        "analysis_types": [
-                            "CarSeal",
-                            "Rust"
-                        ],
+                        "analysis_types": "CarSeal, Rust"
+                        ,
                         "metadata": {
                             "zoom": "2x"
                         }
@@ -44,9 +42,7 @@
                             "z": 0,
                             "frame": "robot"
                         },
-                        "analysis_types": [
-                            "GasDetection"
-                        ]
+                        "analysis_types": "GasDetection"
                     }
                 ]
             },
@@ -77,10 +73,8 @@
                             "z": 0,
                             "frame": "robot"
                         },
-                        "analysis_types": [
-                            "ColdSpot",
-                            "HotSpot"
-                        ]
+                        "analysis_types": "ColdSpot, HotSpot"
+                        
                     }
                 ]
             },
@@ -111,10 +105,7 @@
                             "z": 0,
                             "frame": "robot"
                         },
-                        "analysis_types": [
-                            "ColdSpot",
-                            "HotSpot"
-                        ]
+                        "analysis_types": "ColdSpot, HotSpot"
                     },
                     {
                         "type": "ThermalImage",
@@ -124,10 +115,7 @@
                             "z": 0,
                             "frame": "robot"
                         },
-                        "analysis_types": [
-                            "ColdSpot",
-                            "HotSpot"
-                        ]
+                        "analysis_types": "ColdSpot, HotSpot"
                     }
                 ]
             }

{isar-1.14.4 → isar-1.15.0}/src/isar/models/communication/message.py

@@ -3,12 +3,10 @@ from typing import Optional
 
 from alitra import Pose
 
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
 from robot_interface.models.mission.mission import Mission
 
 
 @dataclass
 class StartMissionMessage:
     mission: Mission
-    mission_metadata: MissionMetadata
     initial_pose: Optional[Pose]

{isar-1.14.4 → isar-1.15.0}/src/isar/services/service_connections/mqtt/robot_info_publisher.py

@@ -20,6 +20,7 @@ class RobotInfoPublisher:
                 robot_name=settings.ROBOT_NAME,
                 robot_model=robot_settings.ROBOT_MODEL,  # type: ignore
                 robot_serial_number=settings.SERIAL_NUMBER,
+                robot_asset=settings.PLANT_SHORT_NAME,
                 video_streams=settings.VIDEO_STREAMS,
                 host=settings.API_HOST_VIEWED_EXTERNALLY,
                 port=settings.API_PORT,

{isar-1.14.4 → isar-1.15.0}/src/isar/services/utilities/scheduling_utilities.py

@@ -18,7 +18,6 @@ from isar.mission_planner.mission_planner_interface import (
 )
 from isar.models.communication.message import StartMissionMessage
 from isar.models.communication.queues import QueueIO, Queues, QueueTimeoutError
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
 from isar.services.utilities.queue_utilities import QueueUtilities
 from isar.state_machine.states_enum import States
 from robot_interface.models.mission.mission import Mission
@@ -139,7 +138,6 @@ class SchedulingUtilities:
     def start_mission(
         self,
         mission: Mission,
-        mission_metadata: MissionMetadata,
         initial_pose: Optional[Pose],
     ) -> None:
         """Start mission
@@ -153,7 +151,6 @@ class SchedulingUtilities:
             self._send_command(
                 StartMissionMessage(
                     mission=deepcopy(mission),
-                    mission_metadata=deepcopy(mission_metadata),
                     initial_pose=initial_pose,
                 ),
                 self.queues.start_mission,

{isar-1.14.4 → isar-1.15.0}/src/isar/state_machine/state_machine.py

@@ -19,7 +19,6 @@ from isar.mission_planner.task_selector_interface import (
 )
 from isar.models.communication.message import StartMissionMessage
 from isar.models.communication.queues.queues import Queues
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
 from isar.state_machine.states import (
     Idle,
     Initialize,
@@ -203,7 +202,6 @@ class StateMachine(object):
 
         self.stopped: bool = False
         self.current_mission: Optional[Mission] = None
-        self.current_mission_metadata: Optional[MissionMetadata] = None
         self.current_task: Optional[Task] = None
         self.current_step: Optional[Step] = None
         self.initial_pose: Optional[Pose] = None
@@ -436,12 +434,9 @@ class StateMachine(object):
         self.current_mission = None
         self.initial_pose = None
 
-    def start_mission(
-        self, mission: Mission, mission_metadata: MissionMetadata, initial_pose: Pose
-    ):
+    def start_mission(self, mission: Mission, initial_pose: Pose):
         """Starts a scheduled mission."""
         self.current_mission = mission
-        self.current_mission_metadata = mission_metadata
         self.initial_pose = initial_pose
 
         self.task_selector.initialize(tasks=self.current_mission.tasks)

{isar-1.14.4 → isar-1.15.0}/src/isar/state_machine/states/idle.py

@@ -31,7 +31,6 @@ class Idle(State):
             if start_mission:
                 self.state_machine.start_mission(
                     mission=start_mission.mission,
-                    mission_metadata=start_mission.mission_metadata,
                     initial_pose=start_mission.initial_pose,
                 )
                 transition = self.state_machine.mission_started  # type: ignore

{isar-1.14.4 → isar-1.15.0}/src/isar/state_machine/states/monitor.py

@@ -6,7 +6,6 @@ from typing import Callable, Optional, Sequence, TYPE_CHECKING, Tuple, Union
 from injector import inject
 from transitions import State
 
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
 from isar.services.utilities.threaded_request import (
     ThreadedRequest,
     ThreadedRequestNotFinishedError,
@@ -129,18 +128,16 @@ class Monitor(State):
                 f"No inspection data retrieved for step {str(current_step.id)[:8]}"
             )
 
-        # A deepcopy is made to freeze the metadata before passing it to another thread
+        # A deepcopy is made to freeze the mission before passing it to another thread
         # through the queue
-        mission_metadata: MissionMetadata = deepcopy(
-            self.state_machine.current_mission_metadata
-        )
+        mission: Mission = deepcopy(self.state_machine.current_mission)
 
         for inspection in inspections:
             inspection.metadata.tag_id = current_step.tag_id
 
-            message: Tuple[Inspection, MissionMetadata] = (
+            message: Tuple[Inspection, Mission] = (
                 inspection,
-                mission_metadata,
+                mission,
             )
             self.state_machine.queues.upload_queue.put(message)
             self.logger.info(f"Inspection: {str(inspection.id)[:8]} queued for upload")

{isar-1.14.4 → isar-1.15.0}/src/isar/storage/blob_storage.py

@@ -7,9 +7,9 @@ from injector import inject
 
 from isar.config.keyvault.keyvault_service import Keyvault
 from isar.config.settings import settings
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
+from robot_interface.models.mission.mission import Mission
 from isar.storage.storage_interface import StorageException, StorageInterface
-from isar.storage.utilities import construct_local_paths, construct_metadata_file
+from isar.storage.utilities import construct_metadata_file, construct_paths
 from robot_interface.models.inspection.inspection import Inspection
 
 
@@ -31,17 +31,17 @@ class BlobStorage(StorageInterface):
 
         self.logger = logging.getLogger("uploader")
 
-    def store(self, inspection: Inspection, metadata: MissionMetadata) -> str:
-        local_path, local_metadata_path = construct_local_paths(
-            inspection=inspection, metadata=metadata
+    def store(self, inspection: Inspection, mission: Mission) -> str:
+        data_path, metadata_path = construct_paths(
+            inspection=inspection, mission=mission
         )
 
         metadata_bytes: bytes = construct_metadata_file(
-            inspection=inspection, metadata=metadata, filename=local_path.name
+            inspection=inspection, mission=mission, filename=data_path.name
         )
 
-        self._upload_file(path=local_metadata_path, data=metadata_bytes)
-        return self._upload_file(path=local_path, data=inspection.data)
+        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:
         blob_client = self._get_blob_client(path)

{isar-1.14.4 → isar-1.15.0}/src/isar/storage/local_storage.py

@@ -2,9 +2,9 @@ import logging
 from pathlib import Path
 
 from isar.config.settings import settings
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
+from robot_interface.models.mission.mission import Mission
 from isar.storage.storage_interface import StorageException, StorageInterface
-from isar.storage.utilities import construct_local_paths, construct_metadata_file
+from isar.storage.utilities import construct_metadata_file, construct_paths
 from robot_interface.models.inspection.inspection import Inspection
 
 
@@ -13,9 +13,9 @@ class LocalStorage(StorageInterface):
         self.root_folder: Path = Path(settings.LOCAL_STORAGE_PATH)
         self.logger = logging.getLogger("uploader")
 
-    def store(self, inspection: Inspection, metadata: MissionMetadata) -> str:
-        local_path, local_metadata_path = construct_local_paths(
-            inspection=inspection, metadata=metadata
+    def store(self, inspection: Inspection, mission: Mission) -> str:
+        local_path, local_metadata_path = construct_paths(
+            inspection=inspection, mission=mission
         )
 
         absolute_path: Path = self.root_folder.joinpath(local_path)
@@ -24,7 +24,7 @@ class LocalStorage(StorageInterface):
         absolute_path.parent.mkdir(parents=True, exist_ok=True)
 
         metadata_bytes: bytes = construct_metadata_file(
-            inspection=inspection, metadata=metadata, filename=local_path.name
+            inspection=inspection, mission=mission, filename=local_path.name
         )
         try:
             with open(absolute_path, "wb") as file, open(

{isar-1.14.4 → isar-1.15.0}/src/isar/storage/slimm_storage.py

@@ -7,7 +7,7 @@ from requests import HTTPError, RequestException
 from requests_toolbelt import MultipartEncoder
 
 from isar.config.settings import settings
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
+from robot_interface.models.mission.mission import Mission
 from isar.services.auth.azure_credentials import AzureCredentials
 from isar.services.service_connections.request_handler import RequestHandler
 from isar.storage.storage_interface import StorageException, StorageInterface
@@ -31,24 +31,22 @@ class SlimmStorage(StorageInterface):
 
         self.url: str = settings.SLIMM_API_URL
 
-    def store(self, inspection: Inspection, metadata: MissionMetadata) -> str:
+    def store(self, inspection: Inspection, mission: Mission) -> str:
         filename: str = get_filename(
-            mission_id=metadata.mission_id,
-            inspection_type=type(inspection).__name__,
-            inspection_id=inspection.id,
+            inspection=inspection,
         )
         filename = f"{filename}.{inspection.metadata.file_type}"
         if type(inspection) in [Video, ThermalVideo]:
-            inspection_path = self._store_video(filename, inspection, metadata)
+            inspection_path = self._store_video(filename, inspection, mission)
         else:
-            inspection_path = self._store_image(filename, inspection, metadata)
+            inspection_path = self._store_image(filename, inspection, mission)
         return inspection_path
 
     def _store_image(
-        self, filename: str, inspection: Inspection, metadata: MissionMetadata
+        self, filename: str, inspection: Inspection, mission: Mission
     ) -> str:
         multiform_body: MultipartEncoder = self._construct_multiform_request_image(
-            filename=filename, inspection=inspection, metadata=metadata
+            filename=filename, inspection=inspection, mission=mission
         )
         request_url: str = f"{self.url}/UploadSingleImage"
         inspection_path = self._ingest(
@@ -59,10 +57,10 @@ class SlimmStorage(StorageInterface):
         return inspection_path
 
     def _store_video(
-        self, filename: str, inspection: Inspection, metadata: MissionMetadata
+        self, filename: str, inspection: Inspection, mission: Mission
     ) -> str:
         multiform_body: MultipartEncoder = self._construct_multiform_request_video(
-            filename=filename, inspection=inspection, metadata=metadata
+            filename=filename, inspection=inspection, mission=mission
         )
         request_url = f"{self.url}/UploadSingleVideo"
         inspection_path = self._ingest(
@@ -98,23 +96,23 @@ class SlimmStorage(StorageInterface):
 
     @staticmethod
     def _construct_multiform_request_image(
-        filename: str, inspection: Inspection, metadata: MissionMetadata
+        filename: str, inspection: Inspection, mission: Mission
     ):
         array_of_orientation = (
             inspection.metadata.pose.orientation.to_quat_array().tolist()
         )
         multiform_body: MultipartEncoder = MultipartEncoder(
             fields={
-                "PlantFacilitySAPCode": metadata.plant_code,
-                "InstCode": metadata.plant_short_name,
-                "InternalClassification": metadata.data_classification,
+                "PlantFacilitySAPCode": settings.PLANT_CODE,
+                "InstCode": settings.PLANT_SHORT_NAME,
+                "InternalClassification": settings.DATA_CLASSIFICATION,
                 "IsoCountryCode": "NO",
-                "Geodetic.CoordinateReferenceSystemCode": metadata.coordinate_reference_system,  # noqa: E501
-                "Geodetic.VerticalCoordinateReferenceSystemCode": metadata.vertical_reference_system,  # noqa: E501
-                "Geodetic.OrientationReferenceSystem": metadata.media_orientation_reference_system,  # noqa: E501
-                "SensorCarrier.SensorCarrierId": metadata.isar_id,
-                "SensorCarrier.ModelName": metadata.robot_model,
-                "Mission.MissionId": metadata.mission_id,
+                "Geodetic.CoordinateReferenceSystemCode": settings.COORDINATE_REFERENCE_SYSTEM,  # noqa: E501
+                "Geodetic.VerticalCoordinateReferenceSystemCode": settings.VERTICAL_REFERENCE_SYSTEM,  # noqa: E501
+                "Geodetic.OrientationReferenceSystem": settings.MEDIA_ORIENTATION_REFERENCE_SYSTEM,  # noqa: E501
+                "SensorCarrier.SensorCarrierId": settings.ISAR_ID,
+                "SensorCarrier.ModelName": settings.ROBOT_TYPE,
+                "Mission.MissionId": mission.id,
                 "Mission.Client": "Equinor",
                 "ImageMetadata.Timestamp": inspection.metadata.start_time.isoformat(),  # noqa: E501
                 "ImageMetadata.X": str(inspection.metadata.pose.position.x),
@@ -124,11 +122,13 @@ class SlimmStorage(StorageInterface):
                 "ImageMetadata.CameraOrientation2": str(array_of_orientation[1]),
                 "ImageMetadata.CameraOrientation3": str(array_of_orientation[2]),
                 "ImageMetadata.CameraOrientation4": str(array_of_orientation[3]),
-                "ImageMetadata.AnalysisMethods": str(inspection.metadata.analysis),
+                "ImageMetadata.AnalysisMethods": inspection.metadata.analysis
+                if inspection.metadata.analysis
+                else "N/A",
                 "ImageMetadata.Description": str(inspection.metadata.additional),
                 "ImageMetadata.FunctionalLocation": inspection.metadata.tag_id  # noqa: E501
                 if inspection.metadata.tag_id
-                else "NA",
+                else "N/A",
                 "Filename": filename,
                 "AttachedFile": (filename, inspection.data),
             }
@@ -139,26 +139,27 @@ class SlimmStorage(StorageInterface):
     def _construct_multiform_request_video(
         filename: str,
         inspection: Inspection,
-        metadata: MissionMetadata,
+        mission: Mission,
     ):
         array_of_orientation = (
             inspection.metadata.pose.orientation.to_quat_array().tolist()
         )
         multiform_body: MultipartEncoder = MultipartEncoder(
             fields={
-                "PlantFacilitySAPCode": metadata.plant_code,
-                "InstCode": metadata.plant_short_name,
-                "InternalClassification": metadata.data_classification,
+                "PlantFacilitySAPCode": settings.PLANT_CODE,
+                "InstCode": settings.PLANT_SHORT_NAME,
+                "InternalClassification": settings.DATA_CLASSIFICATION,
                 "IsoCountryCode": "NO",
-                "Geodetic.CoordinateReferenceSystemCode": metadata.coordinate_reference_system,  # noqa: E501
-                "Geodetic.VerticalCoordinateReferenceSystemCode": metadata.vertical_reference_system,  # noqa: E501
-                "Geodetic.OrientationReferenceSystem": metadata.media_orientation_reference_system,  # noqa: E501
-                "SensorCarrier.SensorCarrierId": metadata.isar_id,
-                "SensorCarrier.ModelName": metadata.robot_model,
-                "Mission.MissionId": metadata.mission_id,
+                "Geodetic.CoordinateReferenceSystemCode": settings.COORDINATE_REFERENCE_SYSTEM,  # noqa: E501
+                "Geodetic.VerticalCoordinateReferenceSystemCode": settings.VERTICAL_REFERENCE_SYSTEM,  # noqa: E501
+                "Geodetic.OrientationReferenceSystem": settings.MEDIA_ORIENTATION_REFERENCE_SYSTEM,  # noqa: E501
+                "SensorCarrier.SensorCarrierId": settings.ISAR_ID,
+                "SensorCarrier.ModelName": settings.ROBOT_TYPE,
+                "Mission.MissionId": mission.id,
                 "Mission.Client": "Equinor",
                 "VideoMetadata.Timestamp": inspection.metadata.start_time.isoformat(),  # noqa: E501
-                "VideoMetadata.Duration": str(inspection.metadata.duration),  # type: ignore
+                # Converting to int because SLIMM expects an int, while we use floats in operations.
+                "VideoMetadata.Duration": str(int(inspection.metadata.duration)),  # type: ignore
                 "VideoMetadata.X": str(inspection.metadata.pose.position.x),
                 "VideoMetadata.Y": str(inspection.metadata.pose.position.y),
                 "VideoMetadata.Z": str(inspection.metadata.pose.position.z),
@@ -166,11 +167,13 @@ class SlimmStorage(StorageInterface):
                 "VideoMetadata.CameraOrientation2": str(array_of_orientation[1]),
                 "VideoMetadata.CameraOrientation3": str(array_of_orientation[2]),
                 "VideoMetadata.CameraOrientation4": str(array_of_orientation[3]),
-                "VideoMetadata.AnalysisMethods": str(inspection.metadata.analysis),
+                "VideoMetadata.AnalysisMethods": inspection.metadata.analysis
+                if inspection.metadata.analysis
+                else "N/A",
                 "VideoMetadata.Description": str(inspection.metadata.additional),
                 "VideoMetadata.FunctionalLocation": inspection.metadata.tag_id  # noqa: E501
                 if inspection.metadata.tag_id
-                else "NA",
+                else "N/A",
                 "Filename": filename,
                 "AttachedFile": (filename, inspection.data),
             }

{isar-1.14.4 → isar-1.15.0}/src/isar/storage/storage_interface.py

@@ -1,17 +1,17 @@
 from abc import ABCMeta, abstractmethod
 
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
+from robot_interface.models.mission.mission import Mission
 from robot_interface.models.inspection.inspection import Inspection
 
 
 class StorageInterface(metaclass=ABCMeta):
     @abstractmethod
-    def store(self, inspection: Inspection, metadata: MissionMetadata) -> str:
+    def store(self, inspection: Inspection, mission: Mission) -> str:
         """
         Parameters
         ----------
-        metadata : MissionMetadata
-            Metadata for the mission the inspection is a part of.
+        mission : Mission
+            Mission the inspection is a part of.
         inspection : Inspection
             The inspection object to be stored.