Decouple MqttClient from MqttPublisher

Author: andchiind

src/isar/services/service_connections/mqtt/mqtt_client.py

@@ -9,18 +9,11 @@
 from paho.mqtt import client as mqtt
 from paho.mqtt.client import Client
 from paho.mqtt.enums import CallbackAPIVersion
-from paho.mqtt.packettypes import PacketTypes
 from paho.mqtt.properties import Properties
 from paho.mqtt.reasoncodes import ReasonCode
 
 from isar.config.settings import settings
-from robot_interface.telemetry.mqtt_client import MqttClientInterface, MQTTQueueMessage
-
-
-def props_expiry(seconds: int) -> Properties:
-    p = Properties(PacketTypes.PUBLISH)
-    p.MessageExpiryInterval = seconds
-    return p
+from robot_interface.telemetry.mqtt_client import MQTTQueueMessage
 
 
 def _on_success(data: Details) -> None:
@@ -43,7 +36,7 @@ def _on_giveup(data: Details) -> None:
     )
 
 
-class MqttClient(MqttClientInterface):
+class MqttClient:
     def __init__(self, mqtt_queue: Queue[MQTTQueueMessage]) -> None:
         self.logger = logging.getLogger("mqtt_client")
         self.logger.setLevel("INFO")
@@ -97,7 +90,8 @@ def run(self) -> None:
             except Empty:
                 continue
 
-            self.publish(
+            self.logger.debug("Publishing message to topic: %s", item.topic)
+            self.client.publish(
                 topic=item.topic,
                 payload=item.payload,
                 qos=item.qos,
@@ -137,16 +131,3 @@ def connect(self, host: str, port: int) -> None:
         self.logger.info("Attempting to connect to MQTT Broker")
         self.logger.info("Host: %s, Port: %s", host, port)
         self.client.connect(host=host, port=port)
-
-    def publish(
-        self,
-        topic: str,
-        payload: str,
-        qos: int = 0,
-        retain: bool = False,
-        properties: Properties | None = None,
-    ) -> None:
-        self.logger.debug("Publishing message to topic: %s", topic)
-        self.client.publish(
-            topic=topic, payload=payload, qos=qos, retain=retain, properties=properties
-        )

src/isar/services/service_connections/mqtt/robot_heartbeat_publisher.py

@@ -3,8 +3,11 @@
 from queue import Queue
 
 from isar.config.settings import settings
-from isar.services.service_connections.mqtt.mqtt_client import props_expiry
-from robot_interface.telemetry.mqtt_client import MqttPublisher, MQTTQueueMessage
+from robot_interface.telemetry.mqtt_client import (
+    MqttPublisher,
+    MQTTQueueMessage,
+    props_expiry,
+)
 from robot_interface.telemetry.payloads import RobotHeartbeatPayload
 
 

src/isar/services/utilities/mqtt_utilities.py

@@ -3,14 +3,14 @@
 
 from isar.config.settings import settings
 from isar.models.status import IsarStatus
-from isar.services.service_connections.mqtt.mqtt_client import props_expiry
 from robot_interface.models.exceptions.robot_exceptions import ErrorMessage
 from robot_interface.models.mission.status import MissionStatus
 from robot_interface.models.mission.task import TASKS
 from robot_interface.telemetry.mqtt_client import (
     MqttClientInterface,
     MqttPublisher,
     MQTTQueueMessage,
+    props_expiry,
 )
 from robot_interface.telemetry.payloads import (
     InterventionNeededPayload,

src/isar/storage/uploader.py

@@ -2,7 +2,6 @@
 import time
 
 from isar.config.settings import settings
-from isar.services.service_connections.mqtt.mqtt_client import props_expiry
 from isar.storage.storage_interface import (
     BlobStoragePath,
     LocalStoragePath,
@@ -16,7 +15,7 @@
     InspectionValue,
 )
 from robot_interface.models.mission.mission import Mission
-from robot_interface.telemetry.mqtt_client import MqttClientInterface
+from robot_interface.telemetry.mqtt_client import MqttClientInterface, props_expiry
 from robot_interface.telemetry.payloads import (
     InspectionResultPayload,
     InspectionValuePayload,