isar 1.20.2__py3-none-any.whl → 1.34.13__py3-none-any.whl

robot_interface/telemetry/mqtt_client.py

@@ -1,19 +1,38 @@
 import json
 import time
 from abc import ABCMeta, abstractmethod
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from queue import Queue
 from typing import Callable, Tuple
 
-from robot_interface.models.exceptions.robot_exceptions import RobotTelemetryException
+from paho.mqtt.packettypes import PacketTypes
+from paho.mqtt.properties import Properties
+
+from isar.config.settings import settings
+from robot_interface.models.exceptions.robot_exceptions import (
+    RobotTelemetryException,
+    RobotTelemetryNoUpdateException,
+    RobotTelemetryPoseException,
+)
 from robot_interface.telemetry.payloads import CloudHealthPayload
 from robot_interface.utilities.json_service import EnhancedJSONEncoder
 
 
+def props_expiry(seconds: int) -> Properties:
+    p = Properties(PacketTypes.PUBLISH)
+    p.MessageExpiryInterval = seconds
+    return p
+
+
 class MqttClientInterface(metaclass=ABCMeta):
     @abstractmethod
     def publish(
-        self, topic: str, payload: str, qos: int = 0, retain: bool = False
+        self,
+        topic: str,
+        payload: str,
+        qos: int = 0,
+        retain: bool = False,
+        properties: Properties = None,
     ) -> None:
         """
         Parameters
@@ -29,7 +48,6 @@ class MqttClientInterface(metaclass=ABCMeta):
 
         Returns
         -------
-
         """
         pass
 
@@ -39,9 +57,20 @@ class MqttPublisher(MqttClientInterface):
         self.mqtt_queue: Queue = mqtt_queue
 
     def publish(
-        self, topic: str, payload: str, qos: int = 0, retain: bool = False
+        self,
+        topic: str,
+        payload: str,
+        qos: int = 0,
+        retain: bool = False,
+        properties: Properties = None,
     ) -> None:
-        queue_message: Tuple[str, str, int, bool] = (topic, payload, qos, retain)
+        queue_message: Tuple[str, str, int, bool, Properties] = (
+            topic,
+            payload,
+            qos,
+            retain,
+            properties,
+        )
         self.mqtt_queue.put(queue_message)
 
 
@@ -54,6 +83,7 @@ class MqttTelemetryPublisher(MqttClientInterface):
         interval: float,
         qos: int = 0,
         retain: bool = False,
+        properties: Properties = None,
     ) -> None:
         self.mqtt_queue: Queue = mqtt_queue
         self.telemetry_method: Callable = telemetry_method
@@ -61,9 +91,13 @@ class MqttTelemetryPublisher(MqttClientInterface):
         self.interval: float = interval
         self.qos: int = qos
         self.retain: bool = retain
+        self.properties: Properties = properties
 
     def run(self, isar_id: str, robot_name: str) -> None:
-        self.cloud_healt_topic: str = f"isar/{isar_id}/cloud_health"
+        self.cloud_health_topic: str = f"isar/{isar_id}/cloud_health"
+        self.battery_topic: str = f"isar/{isar_id}/battery"
+        self.pose_topic: str = f"isar/{isar_id}/pose"
+        self.pressure_topic: str = f"isar/{isar_id}/pressure"
         topic: str
         payload: str
 
@@ -71,19 +105,47 @@ class MqttTelemetryPublisher(MqttClientInterface):
             try:
                 payload = self.telemetry_method(isar_id=isar_id, robot_name=robot_name)
                 topic = self.topic
+            except (RobotTelemetryPoseException, RobotTelemetryNoUpdateException):
+                time.sleep(self.interval)
+                continue
             except RobotTelemetryException:
                 payload = json.dumps(
-                    CloudHealthPayload(isar_id, robot_name, datetime.now(UTC)),
+                    CloudHealthPayload(isar_id, robot_name, datetime.now(timezone.utc)),
                     cls=EnhancedJSONEncoder,
                 )
-                topic = self.cloud_healt_topic
+                topic = self.cloud_health_topic
+
+            publish_properties = self.properties
 
-            self.publish(topic=topic, payload=payload, qos=self.qos, retain=self.retain)
+            if topic in (
+                self.battery_topic,
+                self.pose_topic,
+                self.pressure_topic,
+            ):
+                publish_properties = props_expiry(settings.MQTT_TELEMETRY_EXPIRY)
 
+            self.publish(
+                topic=topic,
+                payload=payload,
+                qos=self.qos,
+                retain=self.retain,
+                properties=publish_properties,
+            )
             time.sleep(self.interval)
 
     def publish(
-        self, topic: str, payload: str, qos: int = 0, retain: bool = False
+        self,
+        topic: str,
+        payload: str,
+        qos: int = 0,
+        retain: bool = False,
+        properties: Properties = None,
     ) -> None:
-        queue_message: Tuple[str, str, int, bool] = (topic, payload, qos, retain)
+        queue_message: Tuple[str, str, int, bool, Properties] = (
+            topic,
+            payload,
+            qos,
+            retain,
+            properties,
+        )
         self.mqtt_queue.put(queue_message)

robot_interface/telemetry/payloads.py

@@ -1,11 +1,15 @@
 from dataclasses import dataclass
 from datetime import datetime
-from typing import List
+from typing import List, Optional
 
 from alitra import Pose
-from transitions import State
 
-from robot_interface.models.mission.status import RobotStatus
+from isar.models.status import IsarStatus
+from isar.storage.storage_interface import BlobStoragePath
+from robot_interface.models.exceptions.robot_exceptions import ErrorReason
+from robot_interface.models.mission.status import MissionStatus, TaskStatus
+from robot_interface.models.mission.task import TaskTypes
+from robot_interface.models.robots.battery_state import BatteryState
 
 
 @dataclass
@@ -30,6 +34,7 @@ class TelemetryPosePayload(TelemetryPayload):
 @dataclass
 class TelemetryBatteryPayload(TelemetryPayload):
     battery_level: float
+    battery_state: Optional[BatteryState] = None
 
 
 @dataclass
@@ -43,22 +48,16 @@ class TelemetryPressurePayload(TelemetryPayload):
 
 
 @dataclass
-class VideoStream:
+class DocumentInfo:
     name: str
     url: str
-    type: str
 
 
 @dataclass
-class RobotStatusPayload:
+class IsarStatusPayload:
     isar_id: str
     robot_name: str
-    robot_status: RobotStatus
-    previous_robot_status: RobotStatus
-    current_isar_state: State
-    current_mission_id: str
-    current_task_id: str
-    current_step_id: str
+    status: IsarStatus
     timestamp: datetime
 
 
@@ -69,7 +68,7 @@ class RobotInfoPayload:
     robot_model: str
     robot_serial_number: str
     robot_asset: str
-    video_streams: List[VideoStream]
+    documentation: List[DocumentInfo]
     host: str
     port: int
     capabilities: List[str]
@@ -81,3 +80,82 @@ class RobotHeartbeatPayload:
     isar_id: str
     robot_name: str
     timestamp: datetime
+
+
+@dataclass
+class MissionPayload:
+    isar_id: str
+    robot_name: str
+    mission_id: Optional[str]
+    status: Optional[MissionStatus]
+    error_reason: Optional[ErrorReason]
+    error_description: Optional[str]
+    timestamp: datetime
+
+
+@dataclass
+class MissionAbortedPayload:
+    isar_id: str
+    robot_name: str
+    mission_id: Optional[str]
+    can_be_continued: bool
+    timestamp: datetime
+    reason: Optional[str]
+
+
+@dataclass
+class TaskPayload:
+    isar_id: str
+    robot_name: str
+    mission_id: Optional[str]
+    task_id: Optional[str]
+    status: Optional[TaskStatus]
+    task_type: Optional[TaskTypes]
+    error_reason: Optional[ErrorReason]
+    error_description: Optional[str]
+    timestamp: datetime
+
+
+@dataclass
+class InspectionResultPayload:
+    isar_id: str
+    robot_name: str
+    inspection_id: str
+    blob_storage_data_path: BlobStoragePath
+    blob_storage_metadata_path: BlobStoragePath
+    installation_code: str
+    tag_id: Optional[str]
+    inspection_type: Optional[str]
+    inspection_description: Optional[str]
+    timestamp: datetime
+
+
+@dataclass
+class InspectionValuePayload:
+    isar_id: str
+    robot_name: str
+    inspection_id: str
+    installation_code: str
+    tag_id: Optional[str]
+    inspection_type: Optional[str]
+    inspection_description: Optional[str]
+    value: float
+    unit: str
+    x: float
+    y: float
+    z: float
+    timestamp: datetime
+
+
+@dataclass
+class StartUpMessagePayload:
+    isar_id: str
+    timestamp: datetime
+
+
+@dataclass
+class InterventionNeededPayload:
+    isar_id: str
+    robot_name: str
+    reason: str
+    timestamp: datetime

robot_interface/utilities/json_service.py

@@ -7,6 +7,7 @@ from uuid import UUID
 
 import numpy as np
 from alitra import Orientation
+from pydantic import BaseModel
 
 
 class EnhancedJSONEncoder(json.JSONEncoder):
@@ -15,8 +16,13 @@ class EnhancedJSONEncoder(json.JSONEncoder):
     """
 
     def default(self, o):
+        if isinstance(o, BaseModel):
+            dump = getattr(o, "model_dump", None)
+            if callable(dump):
+                return dump()
+            return o.__dict__
         if is_dataclass(o):
-            return asdict(o)
+            return asdict(o)  # type: ignore
         if isinstance(o, UUID):
             return str(o)
         if isinstance(o, Orientation):

isar/config/configuration_error.py

@@ -1,2 +0,0 @@
-class ConfigurationError(Exception):
-    pass

isar/config/keyvault/keyvault_error.py

@@ -1,2 +0,0 @@
-class KeyvaultError(Exception):
-    pass

isar/config/predefined_mission_definition/default_exr.json

@@ -1,51 +0,0 @@
-{
-    "mission_definition": {
-        "tasks": [
-            {
-                "pose": {
-                    "position": {
-                        "x": -3.2629,
-                        "y": 3.0795,
-                        "z": 0.0055,
-                        "frame_name": "robot"
-                    },
-                    "orientation": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0,
-                        "w": 1,
-                        "frame_name": "robot"
-                    },
-                    "frame_name": "robot"
-                },
-                "tag": "equinor_exR_tag_simulator",
-                "inspections": [
-                    {
-                        "type": "Image",
-                        "inspection_target": {
-                            "x": 6.6550,
-                            "y": 3.7987,
-                            "z": 0.6145,
-                            "frame_name": "robot"
-                        },
-                        "analysis_types": "CarSeal, Rust",
-                        "metadata": {
-                            "zoom": "2x"
-                        }
-                    },
-                    {
-                        "type": "ThermalVideo",
-                        "inspection_target": {
-                            "x": 6.6550,
-                            "y": 3.7987,
-                            "z": 0.6145,
-                            "frame_name": "robot"
-                        },
-                        "analysis_types": "GasDetection",
-                        "duration": 10
-                    }
-                ]
-            }
-        ]
-    }
-}

isar/config/predefined_mission_definition/default_mission.json

@@ -1,91 +0,0 @@
-{
-    "mission_definition": {
-        "tasks": [
-            {
-                "pose": {
-                    "position": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0,
-                        "frame_name": "robot"
-                    },
-                    "orientation": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0,
-                        "w": 1,
-                        "frame_name": "robot"
-                    },
-                    "frame_name": "robot"
-                },
-                "tag": "1-A",
-                "inspections": [
-                    {
-                        "type": "Image",
-                        "inspection_target": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0,
-                            "frame_name": "robot"
-                        },
-                        "analysis_types": "CarSeal, Rust",
-                        "metadata": {
-                            "zoom": "2x"
-                        }
-                    },
-                    {
-                        "type": "ThermalVideo",
-                        "inspection_target": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0,
-                            "frame_name": "robot"
-                        },
-                        "analysis_types": "GasDetection"
-                        ,
-                        "duration": 10
-                    }
-                ]
-            },
-            {
-                "pose": {
-                    "position": {
-                        "x": 1,
-                        "y": 1,
-                        "z": 1,
-                        "frame_name": "robot"
-                    },
-                    "orientation": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0,
-                        "w": 1,
-                        "frame_name": "robot"
-                    },
-                    "frame_name": "robot"
-                },
-                "inspections": [
-                    {
-                        "type": "ThermalImage",
-                        "inspection_target": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0,
-                            "frame_name": "robot"
-                        },
-                        "analysis_types": "ColdSpot,HotSpot"
-                    },
-                    {
-                        "type": "Video",
-                        "inspection_target": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0,
-                            "frame_name": "robot"
-                        }
-                    }
-                ]
-            }
-        ]
-    }
-}

isar/config/predefined_mission_definition/default_turtlebot.json

@@ -1,124 +0,0 @@
-{
-    "mission_definition": {
-        "tasks": [
-            {
-                "pose": {
-                    "position": {
-                        "x": -3.6,
-                        "y": 4,
-                        "z": 0,
-                        "frame": "asset"
-                    },
-                    "orientation": {
-                        "x": 0,
-                        "y": 0,
-                        "z": -0.7286672256879113,
-                        "w": -0.6848660759820616,
-                        "frame": "asset"
-                    },
-                    "frame_name": "asset"
-                },
-                "tag": "1-A",
-                "inspections": [
-                    {
-                        "type": "Image",
-                        "inspection_target": {
-                            "x": -4.7,
-                            "y": 4.9,
-                            "z": 0,
-                            "frame": "robot"
-                        },
-                        "analysis_types": "CarSeal, Rust"
-                        ,
-                        "metadata": {
-                            "zoom": "2x"
-                        }
-                    },
-                    {
-                        "type": "ThermalImage",
-                        "inspection_target": {
-                            "x": -4.7,
-                            "y": 4.9,
-                            "z": 0,
-                            "frame": "robot"
-                        },
-                        "analysis_types": "GasDetection"
-                    }
-                ]
-            },
-            {
-                "pose": {
-                    "position": {
-                        "x": 4.7,
-                        "y": 3,
-                        "z": 0,
-                        "frame": "asset"
-                    },
-                    "orientation": {
-                        "x": 0,
-                        "y": 0,
-                        "z": 0.5769585,
-                        "w": 0.8167734,
-                        "frame": "asset"
-                    },
-                    "frame_name": "asset"
-                },
-                "tag": "2-B",
-                "inspections": [
-                    {
-                        "type": "Image",
-                        "inspection_target": {
-                            "x": 5.6,
-                            "y": 5.2,
-                            "z": 0,
-                            "frame": "robot"
-                        },
-                        "analysis_types": "ColdSpot, HotSpot"
-                        
-                    }
-                ]
-            },
-            {
-                "pose": {
-                    "position": {
-                        "x": 0.95,
-                        "y": 2.6,
-                        "z": 0,
-                        "frame": "asset"
-                    },
-                    "orientation": {
-                        "x": 0,
-                        "y": 0,
-                        "z": -0.6992469,
-                        "w": 0.7148802,
-                        "frame": "asset"
-                    },
-                    "frame_name": "asset"
-                },
-                "tag": "3-C",
-                "inspections": [
-                    {
-                        "type": "Image",
-                        "inspection_target": {
-                            "x": 5.6,
-                            "y": 5.2,
-                            "z": 0,
-                            "frame": "robot"
-                        },
-                        "analysis_types": "ColdSpot, HotSpot"
-                    },
-                    {
-                        "type": "ThermalImage",
-                        "inspection_target": {
-                            "x": 1.9,
-                            "y": 1.9,
-                            "z": 0,
-                            "frame": "robot"
-                        },
-                        "analysis_types": "ColdSpot, HotSpot"
-                    }
-                ]
-            }
-        ]
-    }
-}

isar/config/predefined_missions/default.json

@@ -1,92 +0,0 @@
-{
-    "id": "1",
-    "tasks": [
-        {
-            "steps": [
-                {
-                    "type": "drive_to_pose",
-                    "pose": {
-                        "position": {
-                            "x": -2,
-                            "y": -2,
-                            "z": 0,
-                            "frame": "asset"
-                        },
-                        "orientation": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0.4794255,
-                            "w": 0.8775826,
-                            "frame": "asset"
-                        },
-                        "frame": "asset"
-                    }
-                },
-                {
-                    "type": "take_image",
-                    "target": {
-                        "x": 2,
-                        "y": 2,
-                        "z": 0,
-                        "frame": "robot"
-                    }
-                }
-            ]
-        },
-        {
-            "steps": [
-                {
-                    "type": "drive_to_pose",
-                    "pose": {
-                        "position": {
-                            "x": -2,
-                            "y": 2,
-                            "z": 0,
-                            "frame": "asset"
-                        },
-                        "orientation": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0.4794255,
-                            "w": 0.8775826,
-                            "frame": "asset"
-                        },
-                        "frame": "asset"
-                    }
-                },
-                {
-                    "type": "take_thermal_image",
-                    "target": {
-                        "x": 2,
-                        "y": 2,
-                        "z": 0,
-                        "frame": "robot"
-                    }
-                }
-            ]
-        },
-        {
-            "steps": [
-                {
-                    "type": "drive_to_pose",
-                    "pose": {
-                        "position": {
-                            "x": 2,
-                            "y": 2,
-                            "z": 0,
-                            "frame": "asset"
-                        },
-                        "orientation": {
-                            "x": 0,
-                            "y": 0,
-                            "z": 0.4794255,
-                            "w": 0.8775826,
-                            "frame": "asset"
-                        },
-                        "frame": "asset"
-                    }
-                }
-            ]
-        }
-    ]
-}