isar 1.14.4__py3-none-any.whl → 1.15.0__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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/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/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/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.
 

isar/storage/uploader.py

@@ -9,7 +9,7 @@ from injector import inject
 
 from isar.config.settings import settings
 from isar.models.communication.queues import Queues
-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 robot_interface.models.inspection.inspection import Inspection
 from robot_interface.telemetry.mqtt_client import MqttClientInterface
@@ -19,7 +19,7 @@ from robot_interface.utilities.json_service import EnhancedJSONEncoder
 @dataclass
 class UploaderQueueItem:
     inspection: Inspection
-    mission_metadata: MissionMetadata
+    mission: Mission
     storage_handler: StorageInterface
     _retry_count: int
     _next_retry_time: datetime = datetime.utcnow()
@@ -78,17 +78,17 @@ class Uploader:
         self.logger.info("Started uploader")
         while True:
             inspection: Inspection
-            mission_metadata: MissionMetadata
+            mission: Mission
             try:
                 if self._internal_upload_queue:
                     self._process_upload_queue()
 
-                inspection, mission_metadata = self.upload_queue.get(timeout=1)
+                inspection, mission = self.upload_queue.get(timeout=1)
 
                 # If new item from thread queue, add one per handler to internal queue:
                 for storage_handler in self.storage_handlers:
                     new_item: UploaderQueueItem = UploaderQueueItem(
-                        inspection, mission_metadata, storage_handler, _retry_count=-1
+                        inspection, mission, storage_handler, _retry_count=-1
                     )
                     self._internal_upload_queue.append(new_item)
             except Empty:
@@ -98,7 +98,7 @@ class Uploader:
         inspection_path = ""
         try:
             inspection_path = upload_item.storage_handler.store(
-                inspection=upload_item.inspection, metadata=upload_item.mission_metadata
+                inspection=upload_item.inspection, mission=upload_item.mission
             )
             self.logger.info(
                 f"Storage handler: {type(upload_item.storage_handler).__name__} "

isar/storage/utilities.py

@@ -1,21 +1,19 @@
 import json
+import time
 from pathlib import Path
 from typing import Tuple
 
-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
 from robot_interface.utilities.json_service import EnhancedJSONEncoder
 
+from isar.config.settings import settings
+from datetime import date, datetime
 
-def construct_local_paths(
-    inspection: Inspection, metadata: MissionMetadata
-) -> Tuple[Path, Path]:
-    folder: Path = Path(str(metadata.mission_id))
-    filename: str = get_filename(
-        mission_id=metadata.mission_id,
-        inspection_type=type(inspection).__name__,
-        inspection_id=inspection.id,
-    )
+
+def construct_paths(inspection: Inspection, mission: Mission) -> Tuple[Path, Path]:
+    folder: Path = Path(get_foldername(mission=mission))
+    filename: str = get_filename(inspection=inspection)
 
     inspection_path: Path = folder.joinpath(
         f"{filename}.{inspection.metadata.file_type}"
@@ -27,25 +25,26 @@ def construct_local_paths(
 
 
 def construct_metadata_file(
-    inspection: Inspection, metadata: MissionMetadata, filename: str
+    inspection: Inspection, mission: Mission, filename: str
 ) -> bytes:
     data: dict = {
-        "coordinate_reference_system": metadata.coordinate_reference_system,
-        "vertical_reference_system": metadata.vertical_reference_system,
-        "data_classification": metadata.data_classification,
+        "coordinate_reference_system": settings.COORDINATE_REFERENCE_SYSTEM,
+        "vertical_reference_system": settings.VERTICAL_REFERENCE_SYSTEM,
+        "data_classification": settings.DATA_CLASSIFICATION,
         "source_url": None,
-        "plant_code": metadata.plant_code,
-        "media_orientation_reference_system": metadata.media_orientation_reference_system,  # noqa: E501
+        "plant_code": settings.PLANT_CODE,
+        "media_orientation_reference_system": settings.MEDIA_ORIENTATION_REFERENCE_SYSTEM,  # noqa: E501
         "additional_meta": {
-            "mission_id": metadata.mission_id,
-            "plant_name": metadata.plant_name,
-            "mission_date": metadata.mission_date,
-            "isar_id": metadata.isar_id,
-            "robot_name": metadata.robot_name,
+            "mission_id": mission.id,
+            "mission_name": mission.name,
+            "plant_name": settings.PLANT_NAME,
+            "mission_date": datetime.utcnow().date(),
+            "isar_id": settings.ISAR_ID,
+            "robot_name": settings.ROBOT_NAME,
         },
         "data": [
             {
-                "folder": f"/{metadata.mission_id}",
+                "folder": f"/{get_foldername(mission=mission)}",
                 "files": [
                     {
                         "file_name": filename,
@@ -67,8 +66,13 @@ def construct_metadata_file(
 
 
 def get_filename(
-    mission_id: str,
-    inspection_type: str,
-    inspection_id: str,
+    inspection: Inspection,
 ) -> str:
-    return f"{mission_id}_{inspection_type}_{inspection_id}"
+    inspection_type: str = type(inspection).__name__
+    tag: str = inspection.metadata.tag_id if inspection.metadata.tag_id else "no-tag"
+    epoch_time: int = int(time.time())
+    return f"{tag}__{inspection_type}__{epoch_time}"
+
+
+def get_foldername(mission: Mission) -> str:
+    return f"{datetime.utcnow().date()}__{settings.PLANT_SHORT_NAME}__{mission.name}__{mission.id}"

{isar-1.14.4.dist-info → isar-1.15.0.dist-info}/METADATA

@@ -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
@@ -75,7 +75,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.dist-info → isar-1.15.0.dist-info}/RECORD

@@ -4,9 +4,9 @@ isar/apis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/api.py,sha256=-Xw4zMFItlnlF4olu3UZrzzMhKc2hfXYwkoUdZcj5Mg,12081
 isar/apis/models/__init__.py,sha256=NI1BYyN__Ogr00Qqe0XJ-9gEVPva2brXo2RJsbrS4tM,52
 isar/apis/models/models.py,sha256=MYCTlPZHHBg2yyaSklhxkBwANC3GAdRCMK8TPev16II,1750
-isar/apis/models/start_mission_definition.py,sha256=3L5CmZrnLlU646zIiIweeXywQ49m9M3pzLMXe98Q2UU,4935
+isar/apis/models/start_mission_definition.py,sha256=b1-ZdMgdoC-1YGqCA8M-9958yeBAHiEuW7gcg1Ie4OU,5352
 isar/apis/schedule/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/apis/schedule/scheduling_controller.py,sha256=eI_Cz2MeYBIliLq8Ht4uENJaRDZtv25Gotjcb_A_tEk,10542
+isar/apis/schedule/scheduling_controller.py,sha256=lCA8Iwr0yq1Lcvq6eEUkqYvTU1HVMo1LZ0RmmFFBcHE,10099
 isar/apis/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/apis/security/authentication.py,sha256=TI8U9Y_L6ihHLMeM50ZONd5EPfuHdw_XMU_Q987W4AY,1975
 isar/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,8 +27,8 @@ isar/config/maps/klab_compressor.json,sha256=1Vrk5u_l4WXjrTtG4YfXlrCPbOoRs4TtYHO
 isar/config/maps/klab_turtlebot.json,sha256=HcB79XFEdY0Wm96EssIFO4TMyAWzc2KENoqN7TbTT0k,823
 isar/config/maps/turtleworld.json,sha256=EKLMpSK9Gu2lAN-E9l41XOaO3f9Su5n_I97mA6z7sWY,764
 isar/config/predefined_mission_definition/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/config/predefined_mission_definition/default_mission.json,sha256=i-sjgVRDcXKh2Lx-tauxBI3xLxLAuut_73wmLuYNgNc,3130
-isar/config/predefined_mission_definition/default_turtlebot.json,sha256=tiXgBbE1XOT6G6UR07WChEVvj-Y9oB1qn8VBc8q3ang,4410
+isar/config/predefined_mission_definition/default_mission.json,sha256=nEk1ql17RAs2I5Ws2wA-0GJ6oqJco-Q0Q0vhf4k6ajc,2926
+isar/config/predefined_mission_definition/default_turtlebot.json,sha256=Ka379MLu8qiGIa6Fu-8p8A4OgHVccLkKYSX0RthUOeI,4060
 isar/config/predefined_missions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/config/predefined_missions/default.json,sha256=3J1KtQIFKxJsVoKlg0nKsj8asev-2dSz6IOrd4A57jY,2759
 isar/config/predefined_missions/default_turtlebot.json,sha256=gStYz_hCgQDBEeUW7W4bq_0R3OO55jRnwZt0CNYvHSM,3352
@@ -41,14 +41,13 @@ isar/mission_planner/sequential_task_selector.py,sha256=4OJ1Rvg6MaDQQxNcgAUtp2gv
 isar/mission_planner/task_selector_interface.py,sha256=aXL2RXb_XmTNW-WXt6E7wFfJf_BjbownDa3zSqgQ4Ww,703
 isar/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/models/communication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/models/communication/message.py,sha256=OR-p1Dg-LHVjif85m2IasOsbmNuHT3Bnx1QHrDhA2_w,353
+isar/models/communication/message.py,sha256=yN4SXYM-W_6u3Cf9yuAE3jy4e6mMrL3yUr-iVV4r55E,241
 isar/models/communication/queues/__init__.py,sha256=JqwWbdBQnBeIEhSTjBOkl-O3bYBVBSmjPcWUdscsobw,146
 isar/models/communication/queues/queue_io.py,sha256=AnHWUCkZ0tunkxKKeBarq-OUkRM97IaMfA-a1pmf1cQ,394
 isar/models/communication/queues/queue_timeout_error.py,sha256=rF8TlNF7RHS_ueTZ5mp7aFkhLY1j0dcwMwH-Ba6lVpE,45
 isar/models/communication/queues/queues.py,sha256=FzoqlT4AQ4Q5Jufh6yRPV2uq5iUZd1odrpjBl77yU5o,803
 isar/models/communication/queues/status_queue.py,sha256=K_i01uzCu1eciDt9QlDXLBINJnuRLqm6fzrM-PY6qD0,467
 isar/models/mission_metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/models/mission_metadata/mission_metadata.py,sha256=pQ5-THG7Ut-C4IW5213ZZbU5VBnJfZZFTnD6VKNtYVA,885
 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
@@ -58,32 +57,32 @@ isar/services/service_connections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 isar/services/service_connections/request_handler.py,sha256=0LxC0lu_HXeEf_xmJWjfEsh14oAUI97cpG1IWtBlcs4,4278
 isar/services/service_connections/mqtt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/service_connections/mqtt/mqtt_client.py,sha256=g5RJ85_dsZlHgj6saG2w0sTSetvGFWI4PW4zsb0j9DE,3516
-isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=rw1HKVnzFHPl0Oqdjkfwko9GNNbXltIl_CHzhjLylNQ,1270
+isar/services/service_connections/mqtt/robot_info_publisher.py,sha256=_7lXSyOaTbde584M67bG7N9sQJH51yhaSuhsjuCM02U,1325
 isar/services/service_connections/mqtt/robot_status_publisher.py,sha256=5jNQnsrFVe9Jnh9Q6F88nsFK63lEuv_ESBA-tZLnBy8,3689
 isar/services/service_connections/stid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/service_connections/stid/stid_service.py,sha256=v1D-sHa2pvYl6A4KcY9NPd2w7vf9Y5AdntFE_p8Hk44,1616
 isar/services/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 isar/services/utilities/queue_utilities.py,sha256=Pw3hehSwkXJNeDv-bDVDfs58VOwtt3i5hpiJ2ZpphuQ,1225
-isar/services/utilities/scheduling_utilities.py,sha256=0fqxtCZ_dUaMsOQ0U_vANmjKzmOGZHRmTBbE3C26XKY,8616
+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=ObUZvXiUldEyGA8ajtWQsOkAcYkk3qxAHLJbbPizx1M,22061
+isar/state_machine/state_machine.py,sha256=_ktCrQFcH_s_6utBzERBZw7YvrG-xmXDKgrboL7VIWE,21809
 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=_Ilj6ZlrnSe95WJMaSKs2wAIMIiCHv8cDOPFCGeI5Hs,1298
+isar/state_machine/states/idle.py,sha256=_0MtK8Wb305agTg4J9t2x-eUq3cnXg3KSP6J6HOM3ps,1229
 isar/state_machine/states/initialize.py,sha256=KfLc-LeyhwaW-d4-xyarIafBh9PBkBtz7j1aPqS0x8A,2019
 isar/state_machine/states/initiate.py,sha256=bF7t40TuuJIJmCMsOwZq_UIErS7lAsi-MbPShucnT90,4863
-isar/state_machine/states/monitor.py,sha256=vwVNBct5HSZVRefTZVqHz-eOzMYuUIJprpQK2XFIBrY,7102
+isar/state_machine/states/monitor.py,sha256=XaJMM1Z9m04OqLbHftYDJNXjIYj4AAziH4L1nABow8s,6962
 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=N59g6MXsVCQXZNLcvvmHU5fuU5jRk1x9dFxMeXkJhbY,2721
 isar/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-isar/storage/blob_storage.py,sha256=qXzSEReqyQsoEDkXtpqO-5k5Ue8luzezwmp4M6-gr8w,2977
-isar/storage/local_storage.py,sha256=fLWSyzFsJ6JjTvKQEa7MQCvnz0NuBVn_jNq4hsi79EQ,1876
-isar/storage/slimm_storage.py,sha256=6VH2nSnyXRtYFHAGmZSp9n-hBb5jCv_5U4cpctp4aPE,8531
-isar/storage/storage_interface.py,sha256=21052cHW9PHTDz51vQJInC0R9U6xHOMjApAqQ6QZGQc,840
-isar/storage/uploader.py,sha256=1jcaNSEHSlqgLNxQWHqGRb9xPCJkoXTlp9IHixKOk4s,6011
-isar/storage/utilities.py,sha256=jI1nQmeLJ2LEkD0IIoe9zA1WonqeVxd1rS_V0JKTrvQ,2610
+isar/storage/blob_storage.py,sha256=8i23s_4d3_REKYxH1DzXF_Lc04pofOlrtDYML_t7BDc,2922
+isar/storage/local_storage.py,sha256=fLzVuwvdEk9l8z7od1qX2p5MeWzcsx-vN4yWvelZeFM,1836
+isar/storage/slimm_storage.py,sha256=oCDpdlvPJBuyzzwSSoP9v2Tdn6icecGxfDJdflkhgiI,8588
+isar/storage/storage_interface.py,sha256=v7QiYGz79dqw9jbgNoLYD1QOvXFoMrqfVT1TJX7rCsw,790
+isar/storage/uploader.py,sha256=ekvPmwZoYlpioaHPKnJnoV38UKTwzT5jy5QlHvBk2IA,5934
+isar/storage/utilities.py,sha256=5sTdQveRvx2OTKdzwh63IeJmBrAI3R9_oTY8At9VX5k,2873
 robot_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/robot_interface.py,sha256=Q8X8N2nXj5-Lmv3OQPXuJZgCQkCub94NXO6bBQrCASE,6054
 robot_interface/test_robot_interface.py,sha256=FV1urn7SbsMyWBIcTKjsBwAG4IsXeZ6pLHE0mA9EGGs,692
@@ -93,22 +92,22 @@ robot_interface/models/exceptions/robot_exceptions.py,sha256=URtCe1ighowz-0QvTBZ
 robot_interface/models/initialize/__init__.py,sha256=rz5neEDr59GDbzzI_FF0DId-C-I-50l113P-h-C_QBY,48
 robot_interface/models/initialize/initialize_params.py,sha256=UcsBm8aFgxIojgYMadaa6yOhvYXxTkCuCbjGuZexfuI,171
 robot_interface/models/inspection/__init__.py,sha256=14wfuj4XZazrigKD7fL98khFKz-eckIpEgPcYRj40Kg,227
-robot_interface/models/inspection/inspection.py,sha256=RK-FATj3s3w_fbfp7iDkMSe221SXetkZ8A9qKUULIsk,2186
+robot_interface/models/inspection/inspection.py,sha256=J87AyeYY36sCEY2tx0U-U6eHprkvZSNAqQRJsmK0vGY,2177
 robot_interface/models/mission/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robot_interface/models/mission/mission.py,sha256=sPuKvTOSt6oZMEpsAQw7yM92jXCDg823rFD7kLUZjjo,595
+robot_interface/models/mission/mission.py,sha256=GyNFTZ0S6JKe9YGIlxfKzxMeOqRokAbHQI5xFDzlzAk,614
 robot_interface/models/mission/status.py,sha256=3CDuXj9a3qNyQqPTFX6XB775O6K3kqc-lbyktJsiPhs,893
-robot_interface/models/mission/step.py,sha256=8OspjOtbhHXe3Qv1_vNEfSneSt6PXvqJK_u4K1T259c,5129
+robot_interface/models/mission/step.py,sha256=w6vZdQrr0xeAwJRuH8I0Re-As22BRy2WRlqaVTExcFw,5120
 robot_interface/models/mission/task.py,sha256=qrVg-f_90_JVaapzQH1j00bFaLToXfHtBoey_HtZHjk,3218
 robot_interface/models/robots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 robot_interface/models/robots/robot_model.py,sha256=pZQsqhn9hh6XE3EjMZhWMzYqg5oJ4CJ4CXeOASKvEf8,452
 robot_interface/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-robot_interface/telemetry/mqtt_client.py,sha256=oPl-5xHWIETYFkF1YQy9gXksa3n2XMGM09yx1vsaaqQ,2311
-robot_interface/telemetry/payloads.py,sha256=DNasajeZz-_pJus-Z_hOU5n3imFuyZ77IBfV1pVE1xg,1078
+robot_interface/telemetry/mqtt_client.py,sha256=8JmKdyHHZbB2t3HVv71DSIlDH3R0ZbpVH5jGlJS7N4U,2253
+robot_interface/telemetry/payloads.py,sha256=BiLS50TDgRXZ1DSTl8aaHG1mPa8R4KnWjai82jKdKmA,1099
 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.14.4.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
-isar-1.14.4.dist-info/METADATA,sha256=HOFb4vMacSU45elll4NWGVR4ojROCOKj4WSMi3lejes,14411
-isar-1.14.4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-isar-1.14.4.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
-isar-1.14.4.dist-info/RECORD,,
+isar-1.15.0.dist-info/LICENSE,sha256=3fc2-ebLwHWwzfQbulGNRdcNob3SBQeCfEVUDYxsuqw,14058
+isar-1.15.0.dist-info/METADATA,sha256=wCLjLbM8uH0RB5vnOBERzl8HUGncEhcyGWEH4RA9-5w,14420
+isar-1.15.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+isar-1.15.0.dist-info/top_level.txt,sha256=UwIML2RtuQKCyJJkatcSnyp6-ldDjboB9k9JgKipO-U,21
+isar-1.15.0.dist-info/RECORD,,

robot_interface/models/inspection/inspection.py

@@ -13,7 +13,7 @@ class InspectionMetadata(ABC):
     start_time: datetime
     pose: Pose
     file_type: str
-    analysis: Optional[List] = field(default_factory=list, init=False)
+    analysis: Optional[str] = field(default=None, init=False)
     tag_id: Optional[str] = field(default=None, init=False)
     additional: Optional[dict] = field(default_factory=dict, init=False)
 

robot_interface/models/mission/mission.py

@@ -10,6 +10,7 @@ from robot_interface.utilities.uuid_string_factory import uuid4_string
 class Mission:
     tasks: List[Task]
     id: str = field(default_factory=uuid4_string, init=True)
+    name: str = ""
     status: MissionStatus = MissionStatus.NotStarted
 
     def _set_unique_id(self) -> None:

robot_interface/models/mission/step.py

@@ -64,7 +64,7 @@ class InspectionStep(Step):
     inspections: List[Inspection] = field(default_factory=list, init=False)
     tag_id: Optional[str] = field(default=None, init=False)
     type = "inspection_type"
-    analysis: Optional[List] = field(default_factory=list, init=False)
+    analysis: Optional[str] = field(default=None, init=False)
     metadata: Optional[dict] = field(default_factory=dict, init=False)
 
     @staticmethod

robot_interface/telemetry/mqtt_client.py

@@ -3,9 +3,7 @@ from abc import ABCMeta, abstractmethod
 from queue import Queue
 from typing import Callable, Tuple
 
-from robot_interface.models.exceptions.robot_exceptions import (
-    RobotInvalidTelemetryException,
-)
+from robot_interface.models.exceptions import RobotException
 
 
 class MqttClientInterface(metaclass=ABCMeta):
@@ -66,7 +64,7 @@ class MqttTelemetryPublisher(MqttClientInterface):
                 payload: str = self.telemetry_method(
                     isar_id=isar_id, robot_name=robot_name
                 )
-            except RobotInvalidTelemetryException:
+            except RobotException:
                 continue
 
             self.publish(

robot_interface/telemetry/payloads.py

@@ -55,6 +55,7 @@ class RobotInfoPayload:
     robot_name: str
     robot_model: str
     robot_serial_number: str
+    robot_asset: str
     video_streams: List[VideoStream]
     host: str
     port: int

isar/models/mission_metadata/mission_metadata.py

@@ -1,26 +0,0 @@
-from dataclasses import dataclass
-from datetime import date, datetime
-from typing import Optional
-
-from isar.config.settings import settings
-
-additional_meta: dict = {}
-
-
-@dataclass
-class MissionMetadata:
-    mission_id: str
-    coordinate_reference_system: str = settings.COORDINATE_REFERENCE_SYSTEM
-    vertical_reference_system: str = settings.VERTICAL_REFERENCE_SYSTEM
-    data_classification: str = settings.DATA_CLASSIFICATION
-    source_url: Optional[str] = None
-    plant_code: str = settings.PLANT_CODE
-    plant_name: str = settings.PLANT_NAME
-    plant_short_name: str = settings.PLANT_SHORT_NAME
-    media_orientation_reference_system: str = (
-        settings.MEDIA_ORIENTATION_REFERENCE_SYSTEM
-    )
-    isar_id: str = settings.ISAR_ID
-    robot_name: str = settings.ROBOT_NAME
-    robot_model: str = settings.ROBOT_TYPE
-    mission_date: date = datetime.utcnow().date()