isar 1.14.5__tar.gz → 1.15.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.14.5
+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.5 → 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.5 → 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,12 +75,11 @@ class SchedulingController:
         )
 
         self.logger.info(f"Starting mission with ISAR Mission ID: '{mission.id}'")
-        metadata: MissionMetadata = MissionMetadata(
-            mission_id=mission.id, mission_name=mission.name
-        )
+
         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(
@@ -141,12 +139,9 @@ class SchedulingController:
             initial_pose.to_alitra_pose() if initial_pose else None
         )
 
-        metadata: MissionMetadata = MissionMetadata(
-            mission_id=mission.id, mission_name=mission.name
-        )
         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)
 
@@ -224,15 +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=mission.id, mission_name=mission.name
-        )
+
         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(
@@ -253,14 +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=mission.id, mission_name=mission.name
-        )
+
         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.5 → 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.5 → 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.5 → 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.5 → 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.5 → 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.5 → 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.5 → isar-1.15.0}/src/isar/storage/blob_storage.py

@@ -7,7 +7,7 @@ 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_metadata_file, construct_paths
 from robot_interface.models.inspection.inspection import Inspection
@@ -31,13 +31,13 @@ class BlobStorage(StorageInterface):
 
         self.logger = logging.getLogger("uploader")
 
-    def store(self, inspection: Inspection, metadata: MissionMetadata) -> str:
+    def store(self, inspection: Inspection, mission: Mission) -> str:
         data_path, metadata_path = construct_paths(
-            inspection=inspection, metadata=metadata
+            inspection=inspection, mission=mission
         )
 
         metadata_bytes: bytes = construct_metadata_file(
-            inspection=inspection, metadata=metadata, filename=data_path.name
+            inspection=inspection, mission=mission, filename=data_path.name
         )
 
         self._upload_file(path=metadata_path, data=metadata_bytes)

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

@@ -2,7 +2,7 @@ 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_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:
+    def store(self, inspection: Inspection, mission: Mission) -> str:
         local_path, local_metadata_path = construct_paths(
-            inspection=inspection, metadata=metadata
+            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.5 → 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,22 +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(
             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(
@@ -57,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(
@@ -96,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),
@@ -139,23 +139,23 @@ 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
                 # Converting to int because SLIMM expects an int, while we use floats in operations.

{isar-1.14.5 → 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.
 

{isar-1.14.5 → isar-1.15.0}/src/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-1.14.5 → isar-1.15.0}/src/isar/storage/utilities.py

@@ -3,15 +3,16 @@ 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_paths(
-    inspection: Inspection, metadata: MissionMetadata
-) -> Tuple[Path, Path]:
-    folder: Path = Path(get_foldername(metadata=metadata))
+
+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(
@@ -24,26 +25,26 @@ def construct_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,
-            "mission_name": metadata.mission_name,
-            "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"/{get_foldername(metadata=metadata)}",
+                "folder": f"/{get_foldername(mission=mission)}",
                 "files": [
                     {
                         "file_name": filename,
@@ -73,5 +74,5 @@ def get_filename(
     return f"{tag}__{inspection_type}__{epoch_time}"
 
 
-def get_foldername(metadata: MissionMetadata) -> str:
-    return f"{metadata.mission_date}__{metadata.plant_short_name}__{metadata.mission_name}__{metadata.mission_id}"
+def get_foldername(mission: Mission) -> str:
+    return f"{datetime.utcnow().date()}__{settings.PLANT_SHORT_NAME}__{mission.name}__{mission.id}"

{isar-1.14.5 → isar-1.15.0}/src/isar.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: isar
-Version: 1.14.5
+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.5 → isar-1.15.0}/src/isar.egg-info/SOURCES.txt

@@ -83,7 +83,6 @@ src/isar/models/communication/queues/queue_timeout_error.py
 src/isar/models/communication/queues/queues.py
 src/isar/models/communication/queues/status_queue.py
 src/isar/models/mission_metadata/__init__.py
-src/isar/models/mission_metadata/mission_metadata.py
 src/isar/services/__init__.py
 src/isar/services/auth/__init__.py
 src/isar/services/auth/azure_credentials.py

{isar-1.14.5 → isar-1.15.0}/src/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(

{isar-1.14.5 → isar-1.15.0}/src/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-1.14.5 → isar-1.15.0}/tests/isar/services/readers/test_mission_reader.py

@@ -5,7 +5,6 @@ from alitra import Frame, Orientation, Pose, Position
 
 from isar.config.settings import settings
 from isar.mission_planner.mission_planner_interface import MissionNotFoundError
-from isar.models.mission_metadata.mission_metadata import MissionMetadata
 from robot_interface.models.mission.mission import Mission
 from robot_interface.models.mission.step import (
     DriveToPose,
@@ -68,15 +67,10 @@ def test_read_mission_from_file(mission_reader) -> None:
     task_4: Task = Task(steps=[expected_step_6])
 
     expected_tasks = [task_1, task_2, task_3, task_4]
-    expected_mission: Mission = Mission(tasks=expected_tasks)
-    expected_metadata: MissionMetadata = MissionMetadata(
-        expected_mission.id, expected_mission.name
-    )
     mission: Mission = mission_reader.read_mission_from_file(
         Path("./tests/test_data/test_mission_working.json")
     )
 
-    assert expected_metadata.data_classification == MissionMetadata.data_classification
     for expected_task, task in zip(expected_tasks, mission.tasks):
         for expected_step, step in zip(expected_task.steps, task.steps):
             if isinstance(expected_step, DriveToPose) and isinstance(step, DriveToPose):