mirror of
https://github.com/home-assistant/core.git
synced 2025-07-23 21:27:38 +00:00
Rename mqtt mixins module to entity.py
(#126279)
This commit is contained in:
parent
b18b532b40
commit
21affac571
@ -39,7 +39,7 @@ from .const import (
|
|||||||
CONF_SUPPORTED_FEATURES,
|
CONF_SUPPORTED_FEATURES,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic, valid_subscribe_topic
|
from .util import valid_publish_topic, valid_subscribe_topic
|
||||||
|
@ -37,7 +37,7 @@ from homeassistant.util import dt as dt_util
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_RO_SCHEMA
|
from .config import MQTT_RO_SCHEMA
|
||||||
from .const import CONF_STATE_TOPIC, PAYLOAD_NONE
|
from .const import CONF_STATE_TOPIC, PAYLOAD_NONE
|
||||||
from .mixins import MqttAvailabilityMixin, MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttAvailabilityMixin, MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttValueTemplate, ReceiveMessage
|
from .models import MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ from homeassistant.helpers.typing import ConfigType
|
|||||||
|
|
||||||
from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
|
from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_COMMAND_TEMPLATE, CONF_COMMAND_TOPIC, CONF_RETAIN
|
from .const import CONF_COMMAND_TEMPLATE, CONF_COMMAND_TOPIC, CONF_RETAIN
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttCommandTemplate
|
from .models import MqttCommandTemplate
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic
|
from .util import valid_publish_topic
|
||||||
|
@ -20,7 +20,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_TOPIC
|
from .const import CONF_TOPIC
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import ReceiveMessage
|
from .models import ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_subscribe_topic
|
from .util import valid_subscribe_topic
|
||||||
|
@ -79,7 +79,7 @@ from .const import (
|
|||||||
DEFAULT_OPTIMISTIC,
|
DEFAULT_OPTIMISTIC,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -61,7 +61,7 @@ from .const import (
|
|||||||
DEFAULT_RETAIN,
|
DEFAULT_RETAIN,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic, valid_subscribe_topic
|
from .util import valid_publish_topic, valid_subscribe_topic
|
||||||
|
@ -12,7 +12,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
|||||||
|
|
||||||
from . import device_trigger
|
from . import device_trigger
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .mixins import async_setup_non_entity_entry_helper
|
from .entity import async_setup_non_entity_entry_helper
|
||||||
|
|
||||||
AUTOMATION_TYPE_TRIGGER = "trigger"
|
AUTOMATION_TYPE_TRIGGER = "trigger"
|
||||||
AUTOMATION_TYPES = [AUTOMATION_TYPE_TRIGGER]
|
AUTOMATION_TYPES = [AUTOMATION_TYPE_TRIGGER]
|
||||||
|
@ -33,7 +33,7 @@ from homeassistant.helpers.typing import ConfigType, VolSchemaType
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_PAYLOAD_RESET, CONF_STATE_TOPIC
|
from .const import CONF_PAYLOAD_RESET, CONF_STATE_TOPIC
|
||||||
from .mixins import CONF_JSON_ATTRS_TOPIC, MqttEntity, async_setup_entity_entry_helper
|
from .entity import CONF_JSON_ATTRS_TOPIC, MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttValueTemplate, ReceiveMessage
|
from .models import MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_subscribe_topic
|
from .util import valid_subscribe_topic
|
||||||
|
@ -36,7 +36,7 @@ from .const import (
|
|||||||
DOMAIN,
|
DOMAIN,
|
||||||
)
|
)
|
||||||
from .discovery import MQTTDiscoveryPayload, clear_discovery_hash
|
from .discovery import MQTTDiscoveryPayload, clear_discovery_hash
|
||||||
from .mixins import MqttDiscoveryDeviceUpdateMixin, send_discovery_done, update_device
|
from .entity import MqttDiscoveryDeviceUpdateMixin, send_discovery_done, update_device
|
||||||
from .models import DATA_MQTT
|
from .models import DATA_MQTT
|
||||||
from .schemas import MQTT_ENTITY_DEVICE_INFO_SCHEMA
|
from .schemas import MQTT_ENTITY_DEVICE_INFO_SCHEMA
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
"""MQTT component mixins and helpers."""
|
"""MQTT (entity) component mixins and helpers."""
|
||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
@ -369,7 +369,7 @@ def init_entity_id_from_config(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class MqttAttributesMixin(Entity): # pylint: disable=hass-enforce-class-module
|
class MqttAttributesMixin(Entity):
|
||||||
"""Mixin used for platforms that support JSON attributes."""
|
"""Mixin used for platforms that support JSON attributes."""
|
||||||
|
|
||||||
_attributes_extra_blocked: frozenset[str] = frozenset()
|
_attributes_extra_blocked: frozenset[str] = frozenset()
|
||||||
@ -454,7 +454,7 @@ class MqttAttributesMixin(Entity): # pylint: disable=hass-enforce-class-module
|
|||||||
_LOGGER.warning("JSON result was not a dictionary")
|
_LOGGER.warning("JSON result was not a dictionary")
|
||||||
|
|
||||||
|
|
||||||
class MqttAvailabilityMixin(Entity): # pylint: disable=hass-enforce-class-module
|
class MqttAvailabilityMixin(Entity):
|
||||||
"""Mixin used for platforms that report availability."""
|
"""Mixin used for platforms that report availability."""
|
||||||
|
|
||||||
def __init__(self, config: ConfigType) -> None:
|
def __init__(self, config: ConfigType) -> None:
|
||||||
@ -799,7 +799,7 @@ class MqttDiscoveryDeviceUpdateMixin(ABC):
|
|||||||
"""Handle the cleanup of platform specific parts, extend to the platform."""
|
"""Handle the cleanup of platform specific parts, extend to the platform."""
|
||||||
|
|
||||||
|
|
||||||
class MqttDiscoveryUpdateMixin(Entity): # pylint: disable=hass-enforce-class-module
|
class MqttDiscoveryUpdateMixin(Entity):
|
||||||
"""Mixin used to handle updated discovery message for entity based platforms."""
|
"""Mixin used to handle updated discovery message for entity based platforms."""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
@ -1021,7 +1021,7 @@ def device_info_from_specifications(
|
|||||||
return info
|
return info
|
||||||
|
|
||||||
|
|
||||||
class MqttEntityDeviceInfo(Entity): # pylint: disable=hass-enforce-class-module
|
class MqttEntityDeviceInfo(Entity):
|
||||||
"""Mixin used for mqtt platforms that support the device registry."""
|
"""Mixin used for mqtt platforms that support the device registry."""
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
@ -26,7 +26,7 @@ from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads_object
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_RO_SCHEMA
|
from .config import MQTT_RO_SCHEMA
|
||||||
from .const import CONF_STATE_TOPIC, PAYLOAD_EMPTY_JSON, PAYLOAD_NONE
|
from .const import CONF_STATE_TOPIC, PAYLOAD_EMPTY_JSON, PAYLOAD_NONE
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
DATA_MQTT,
|
DATA_MQTT,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -47,7 +47,7 @@ from .const import (
|
|||||||
CONF_STATE_VALUE_TEMPLATE,
|
CONF_STATE_VALUE_TEMPLATE,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -49,7 +49,7 @@ from .const import (
|
|||||||
CONF_STATE_VALUE_TEMPLATE,
|
CONF_STATE_VALUE_TEMPLATE,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -25,7 +25,7 @@ from homeassistant.util import dt as dt_util
|
|||||||
|
|
||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
DATA_MQTT,
|
DATA_MQTT,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -26,7 +26,7 @@ from homeassistant.helpers.typing import ConfigType, VolSchemaType
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_RETAIN, DEFAULT_OPTIMISTIC, DEFAULT_RETAIN
|
from .const import CONF_RETAIN, DEFAULT_OPTIMISTIC, DEFAULT_RETAIN
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant
|
|||||||
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
||||||
from homeassistant.helpers.typing import ConfigType, VolSchemaType
|
from homeassistant.helpers.typing import ConfigType, VolSchemaType
|
||||||
|
|
||||||
from ..mixins import async_setup_entity_entry_helper
|
from ..entity import async_setup_entity_entry_helper
|
||||||
from .schema import CONF_SCHEMA, MQTT_LIGHT_SCHEMA_SCHEMA
|
from .schema import CONF_SCHEMA, MQTT_LIGHT_SCHEMA_SCHEMA
|
||||||
from .schema_basic import (
|
from .schema_basic import (
|
||||||
DISCOVERY_SCHEMA_BASIC,
|
DISCOVERY_SCHEMA_BASIC,
|
||||||
|
@ -51,7 +51,7 @@ from ..const import (
|
|||||||
CONF_STATE_VALUE_TEMPLATE,
|
CONF_STATE_VALUE_TEMPLATE,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from ..mixins import MqttEntity
|
from ..entity import MqttEntity
|
||||||
from ..models import (
|
from ..models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -65,7 +65,7 @@ from ..const import (
|
|||||||
CONF_STATE_TOPIC,
|
CONF_STATE_TOPIC,
|
||||||
DOMAIN as MQTT_DOMAIN,
|
DOMAIN as MQTT_DOMAIN,
|
||||||
)
|
)
|
||||||
from ..mixins import MqttEntity
|
from ..entity import MqttEntity
|
||||||
from ..models import ReceiveMessage
|
from ..models import ReceiveMessage
|
||||||
from ..schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from ..schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from ..util import valid_subscribe_topic
|
from ..util import valid_subscribe_topic
|
||||||
|
@ -38,7 +38,7 @@ import homeassistant.util.color as color_util
|
|||||||
from .. import subscription
|
from .. import subscription
|
||||||
from ..config import MQTT_RW_SCHEMA
|
from ..config import MQTT_RW_SCHEMA
|
||||||
from ..const import CONF_COMMAND_TOPIC, CONF_STATE_TOPIC, PAYLOAD_NONE
|
from ..const import CONF_COMMAND_TOPIC, CONF_STATE_TOPIC, PAYLOAD_NONE
|
||||||
from ..mixins import MqttEntity
|
from ..entity import MqttEntity
|
||||||
from ..models import (
|
from ..models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -34,7 +34,7 @@ from .const import (
|
|||||||
CONF_STATE_OPENING,
|
CONF_STATE_OPENING,
|
||||||
CONF_STATE_TOPIC,
|
CONF_STATE_TOPIC,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -15,7 +15,7 @@ from homeassistant.helpers.typing import ConfigType
|
|||||||
|
|
||||||
from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
|
from .config import DEFAULT_RETAIN, MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_COMMAND_TEMPLATE, CONF_COMMAND_TOPIC, CONF_RETAIN
|
from .const import CONF_COMMAND_TEMPLATE, CONF_COMMAND_TOPIC, CONF_RETAIN
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttCommandTemplate
|
from .models import MqttCommandTemplate
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic
|
from .util import valid_publish_topic
|
||||||
|
@ -39,7 +39,7 @@ from .const import (
|
|||||||
CONF_PAYLOAD_RESET,
|
CONF_PAYLOAD_RESET,
|
||||||
CONF_STATE_TOPIC,
|
CONF_STATE_TOPIC,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -17,7 +17,7 @@ from homeassistant.helpers.typing import ConfigType
|
|||||||
|
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_COMMAND_TOPIC, CONF_RETAIN
|
from .const import CONF_COMMAND_TOPIC, CONF_RETAIN
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic
|
from .util import valid_publish_topic
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ from .const import (
|
|||||||
CONF_OPTIONS,
|
CONF_OPTIONS,
|
||||||
CONF_STATE_TOPIC,
|
CONF_STATE_TOPIC,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -40,7 +40,7 @@ from homeassistant.util import dt as dt_util
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_RO_SCHEMA
|
from .config import MQTT_RO_SCHEMA
|
||||||
from .const import CONF_OPTIONS, CONF_STATE_TOPIC, PAYLOAD_NONE
|
from .const import CONF_OPTIONS, CONF_STATE_TOPIC, PAYLOAD_NONE
|
||||||
from .mixins import MqttAvailabilityMixin, MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttAvailabilityMixin, MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttValueTemplate, PayloadSentinel, ReceiveMessage
|
from .models import MqttValueTemplate, PayloadSentinel, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import check_state_too_long
|
from .util import check_state_too_long
|
||||||
|
@ -46,7 +46,7 @@ from .const import (
|
|||||||
PAYLOAD_EMPTY_JSON,
|
PAYLOAD_EMPTY_JSON,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -34,7 +34,7 @@ from .const import (
|
|||||||
CONF_STATE_TOPIC,
|
CONF_STATE_TOPIC,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -20,7 +20,7 @@ from . import subscription
|
|||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .const import ATTR_DISCOVERY_HASH, CONF_QOS, CONF_TOPIC
|
from .const import ATTR_DISCOVERY_HASH, CONF_QOS, CONF_TOPIC
|
||||||
from .discovery import MQTTDiscoveryPayload
|
from .discovery import MQTTDiscoveryPayload
|
||||||
from .mixins import (
|
from .entity import (
|
||||||
MqttDiscoveryDeviceUpdateMixin,
|
MqttDiscoveryDeviceUpdateMixin,
|
||||||
async_handle_schema_error,
|
async_handle_schema_error,
|
||||||
async_setup_non_entity_entry_helper,
|
async_setup_non_entity_entry_helper,
|
||||||
|
@ -28,7 +28,7 @@ from homeassistant.helpers.typing import ConfigType, VolSchemaType
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_RW_SCHEMA
|
from .config import MQTT_RW_SCHEMA
|
||||||
from .const import CONF_COMMAND_TEMPLATE, CONF_COMMAND_TOPIC, CONF_STATE_TOPIC
|
from .const import CONF_COMMAND_TEMPLATE, CONF_COMMAND_TOPIC, CONF_STATE_TOPIC
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import (
|
from .models import (
|
||||||
MqttCommandTemplate,
|
MqttCommandTemplate,
|
||||||
MqttValueTemplate,
|
MqttValueTemplate,
|
||||||
|
@ -25,7 +25,7 @@ from homeassistant.util.json import JSON_DECODE_EXCEPTIONS, json_loads
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import DEFAULT_RETAIN, MQTT_RO_SCHEMA
|
from .config import DEFAULT_RETAIN, MQTT_RO_SCHEMA
|
||||||
from .const import CONF_COMMAND_TOPIC, CONF_RETAIN, CONF_STATE_TOPIC, PAYLOAD_EMPTY_JSON
|
from .const import CONF_COMMAND_TOPIC, CONF_RETAIN, CONF_STATE_TOPIC, PAYLOAD_EMPTY_JSON
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttValueTemplate, ReceiveMessage
|
from .models import MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic, valid_subscribe_topic
|
from .util import valid_publish_topic, valid_subscribe_topic
|
||||||
|
@ -34,7 +34,7 @@ from homeassistant.util.json import json_loads_object
|
|||||||
from . import subscription
|
from . import subscription
|
||||||
from .config import MQTT_BASE_SCHEMA
|
from .config import MQTT_BASE_SCHEMA
|
||||||
from .const import CONF_COMMAND_TOPIC, CONF_RETAIN, CONF_STATE_TOPIC
|
from .const import CONF_COMMAND_TOPIC, CONF_RETAIN, CONF_STATE_TOPIC
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import ReceiveMessage
|
from .models import ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic
|
from .util import valid_publish_topic
|
||||||
|
@ -59,7 +59,7 @@ from .const import (
|
|||||||
DEFAULT_RETAIN,
|
DEFAULT_RETAIN,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import MqttEntity, async_setup_entity_entry_helper
|
from .entity import MqttEntity, async_setup_entity_entry_helper
|
||||||
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic, valid_subscribe_topic
|
from .util import valid_publish_topic, valid_subscribe_topic
|
||||||
|
@ -65,7 +65,7 @@ from .const import (
|
|||||||
DEFAULT_OPTIMISTIC,
|
DEFAULT_OPTIMISTIC,
|
||||||
PAYLOAD_NONE,
|
PAYLOAD_NONE,
|
||||||
)
|
)
|
||||||
from .mixins import async_setup_entity_entry_helper
|
from .entity import async_setup_entity_entry_helper
|
||||||
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
from .models import MqttCommandTemplate, MqttValueTemplate, ReceiveMessage
|
||||||
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
from .schemas import MQTT_ENTITY_COMMON_SCHEMA
|
||||||
from .util import valid_publish_topic, valid_subscribe_topic
|
from .util import valid_publish_topic, valid_subscribe_topic
|
||||||
|
@ -20,7 +20,7 @@ from homeassistant.components.mqtt.const import (
|
|||||||
MQTT_CONNECTION_STATE,
|
MQTT_CONNECTION_STATE,
|
||||||
SUPPORTED_COMPONENTS,
|
SUPPORTED_COMPONENTS,
|
||||||
)
|
)
|
||||||
from homeassistant.components.mqtt.mixins import MQTT_ATTRIBUTES_BLOCKED
|
from homeassistant.components.mqtt.entity import MQTT_ATTRIBUTES_BLOCKED
|
||||||
from homeassistant.components.mqtt.models import PublishPayloadType
|
from homeassistant.components.mqtt.models import PublishPayloadType
|
||||||
from homeassistant.config_entries import ConfigEntryState
|
from homeassistant.config_entries import ConfigEntryState
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
@ -1938,7 +1938,7 @@ async def help_test_skipped_async_ha_write_state(
|
|||||||
) -> None:
|
) -> None:
|
||||||
"""Test entity.async_ha_write_state is only called on changes."""
|
"""Test entity.async_ha_write_state is only called on changes."""
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.mqtt.mixins.MqttEntity.async_write_ha_state"
|
"homeassistant.components.mqtt.entity.MqttEntity.async_write_ha_state"
|
||||||
) as mock_async_ha_write_state:
|
) as mock_async_ha_write_state:
|
||||||
assert len(mock_async_ha_write_state.mock_calls) == 0
|
assert len(mock_async_ha_write_state.mock_calls) == 0
|
||||||
async_fire_mqtt_message(hass, topic, payload1)
|
async_fire_mqtt_message(hass, topic, payload1)
|
||||||
|
@ -90,7 +90,7 @@ async def test_multiple_events_are_all_updating_the_state(
|
|||||||
"""Test all events are respected and trigger a state write."""
|
"""Test all events are respected and trigger a state write."""
|
||||||
await mqtt_mock_entry()
|
await mqtt_mock_entry()
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.mqtt.mixins.MqttEntity.async_write_ha_state"
|
"homeassistant.components.mqtt.entity.MqttEntity.async_write_ha_state"
|
||||||
) as mock_async_ha_write_state:
|
) as mock_async_ha_write_state:
|
||||||
async_fire_mqtt_message(
|
async_fire_mqtt_message(
|
||||||
hass, "test-topic", '{"event_type": "press", "duration": "short" }'
|
hass, "test-topic", '{"event_type": "press", "duration": "short" }'
|
||||||
@ -109,7 +109,7 @@ async def test_handling_retained_event_payloads(
|
|||||||
"""Test if event messages with a retained flag are ignored."""
|
"""Test if event messages with a retained flag are ignored."""
|
||||||
await mqtt_mock_entry()
|
await mqtt_mock_entry()
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.mqtt.mixins.MqttEntity.async_write_ha_state"
|
"homeassistant.components.mqtt.entity.MqttEntity.async_write_ha_state"
|
||||||
) as mock_async_ha_write_state:
|
) as mock_async_ha_write_state:
|
||||||
async_fire_mqtt_message(
|
async_fire_mqtt_message(
|
||||||
hass,
|
hass,
|
||||||
@ -752,7 +752,7 @@ async def test_skipped_async_ha_write_state2(
|
|||||||
payload1 = '{"event_type": "press"}'
|
payload1 = '{"event_type": "press"}'
|
||||||
payload2 = '{"event_type": "unknown"}'
|
payload2 = '{"event_type": "unknown"}'
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.mqtt.mixins.MqttEntity.async_write_ha_state"
|
"homeassistant.components.mqtt.entity.MqttEntity.async_write_ha_state"
|
||||||
) as mock_async_ha_write_state:
|
) as mock_async_ha_write_state:
|
||||||
assert len(mock_async_ha_write_state.mock_calls) == 0
|
assert len(mock_async_ha_write_state.mock_calls) == 0
|
||||||
async_fire_mqtt_message(hass, topic, payload1)
|
async_fire_mqtt_message(hass, topic, payload1)
|
||||||
|
@ -1894,7 +1894,7 @@ async def test_disabling_and_enabling_entry(
|
|||||||
config_light = '{"name": "test_new", "command_topic": "test-topic_new"}'
|
config_light = '{"name": "test_new", "command_topic": "test-topic_new"}'
|
||||||
|
|
||||||
with patch(
|
with patch(
|
||||||
"homeassistant.components.mqtt.mixins.mqtt_config_entry_enabled",
|
"homeassistant.components.mqtt.entity.mqtt_config_entry_enabled",
|
||||||
return_value=False,
|
return_value=False,
|
||||||
):
|
):
|
||||||
# Discovery of mqtt tag
|
# Discovery of mqtt tag
|
||||||
|
Loading…
x
Reference in New Issue
Block a user