Rename update class

Author: jbouwh

homeassistant/components/mqtt/mixins.py

@@ -530,7 +530,7 @@ async def cleanup_device_registry(
         )
 
 
-class MqttDiscoveryDeviceUpdateService:
+class MqttDiscoveryDeviceUpdate:
     """Add support for auto discovery for platforms without an entity."""
 
     def __init__(
@@ -565,6 +565,12 @@ async def async_discovery_update(
         ) -> None:
             """Handle discovery update."""
             nonlocal rediscover, self
+            _LOGGER.info(
+                "Got update for %s with hash: %s '%s'",
+                self.log_name,
+                self.discovery_hash,
+                discovery_payload,
+            )
             if (
                 discovery_payload
                 and discovery_payload != discovery_data[ATTR_DISCOVERY_PAYLOAD]
@@ -573,20 +579,16 @@ async def async_discovery_update(
             if not discovery_payload or rediscover:
                 # unregister and clean up the current discovery instance
                 self.terminate_discovery()
-                async_dispatcher_send(
-                    hass, MQTT_DISCOVERY_DONE.format(self.discovery_hash), None
-                )
                 await _async_tear_down()
+                self.async_send_discovery_done()
                 _LOGGER.info(
                     "%s %s has been removed",
                     self.log_name,
                     self.discovery_hash,
                 )
             else:
                 # Normal update without change
-                async_dispatcher_send(
-                    hass, MQTT_DISCOVERY_DONE.format(self.discovery_hash), None
-                )
+                self.async_send_discovery_done()
                 _LOGGER.info(
                     "%s %s no changes",
                     self.log_name,
@@ -651,15 +653,20 @@ def _entry_unload(*_: Any) -> None:
             self._remove_device_updated = hass.bus.async_listen(
                 EVENT_DEVICE_REGISTRY_UPDATED, _async_device_removed
             )
-        async_dispatcher_send(
-            hass, MQTT_DISCOVERY_DONE.format(self.discovery_hash), None
-        )
+        self.async_send_discovery_done()
         _LOGGER.info(
             "%s %s has been initialized",
             self.log_name,
             self.discovery_hash,
         )
 
+    @callback
+    def async_send_discovery_done(self) -> None:
+        """Acknowledge a discovery message has been handled."""
+        async_dispatcher_send(
+            self.hass, MQTT_DISCOVERY_DONE.format(self.discovery_hash), None
+        )
+
     def terminate_discovery(self) -> None:
         """Terminate the discovery."""
         if self._remove_discovery:

homeassistant/components/mqtt/models.py

@@ -1,4 +1,4 @@
-"""Modesl used by multiple MQTT modules."""
+"""Models used by multiple MQTT modules."""
 from __future__ import annotations
 
 from collections.abc import Awaitable, Callable
@@ -40,26 +40,25 @@ class ReceiveMessage:
 MessageCallbackType = Callable[[ReceiveMessage], None]
 
 
-class MqttNotificationConfig(TypedDict, total=False):
-    """Supply service parameters for MqttNotificationService."""
+class MqttTagConfig(TypedDict, total=False):
+    """Supply service parameters for MQTTTagScanner."""
 
-    command_topic: str
-    command_template: Template
-    encoding: str
-    name: str
-    qos: int
-    retain: bool
-    targets: list
-    title: str
+    topic: str
+    value_template: Template
     device: ConfigType
 
 
-class MqttTagConfig(TypedDict, total=False):
-    """Supply service parameters for MQTTTagScanner."""
+class MqttDeviceTriggerConfig(TypedDict, total=False):
+    """Supply service parameters for MQTT device trigger."""
 
+    automation_type: str
+    payload: str
+    qos: int
     topic: str
+    type: str
+    subtype: str
     value_template: Template
     device: ConfigType
 
 
-MqttTypedDictConfigType = Union[MqttNotificationConfig, MqttTagConfig]
+MqttTypedDictConfigType = Union[MqttTagConfig, MqttDeviceTriggerConfig]

homeassistant/components/mqtt/tag.py

@@ -17,7 +17,7 @@
 from .discovery import MQTTConfig, cancel_discovery
 from .mixins import (
     MQTT_ENTITY_DEVICE_INFO_SCHEMA,
-    MqttDiscoveryDeviceUpdateService,
+    MqttDiscoveryDeviceUpdate,
     update_device,
 )
 from .models import MqttTagConfig
@@ -83,7 +83,7 @@ def async_has_tags(hass, device_id):
     return hass.data[TAGS][device_id] != {}
 
 
-class MQTTTagScanner(MqttDiscoveryDeviceUpdateService):
+class MQTTTagScanner(MqttDiscoveryDeviceUpdate):
     """MQTT Tag scanner."""
 
     def __init__(
@@ -105,7 +105,7 @@ def __init__(
 
         self._setup_from_config(config)
 
-        MqttDiscoveryDeviceUpdateService.__init__(
+        MqttDiscoveryDeviceUpdate.__init__(
             self, hass, discovery_info, device_id, config_entry, LOG_NAME
         )