evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add alias to DOMAIN import in group (#125569)

Browse source
This commit is contained in:
epenet 2024-09-09 11:07:19 +02:00 • committed by GitHub
parent 713689491b
commit 06e876aee0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 77 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/group/button.py
View file

@ -7,7 +7,7 @@ from typing import Any
import voluptuous as vol
from homeassistant.components.button import (
DOMAIN,
DOMAIN as BUTTON_DOMAIN,
PLATFORM_SCHEMA as BUTTON_PLATFORM_SCHEMA,
SERVICE_PRESS,
ButtonEntity,
@ -34,7 +34,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = BUTTON_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(BUTTON_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
}
@ -113,7 +113,7 @@ class ButtonGroup(GroupEntity, ButtonEntity):
async def async_press(self) -> None:
"""Forward the press to all buttons in the group."""
await self.hass.services.async_call(
DOMAIN,
BUTTON_DOMAIN,
SERVICE_PRESS,
{ATTR_ENTITY_ID: self._entity_ids},
blocking=True,

36
homeassistant/components/group/cover.py
View file

@ -11,7 +11,7 @@ from homeassistant.components.cover import (
ATTR_CURRENT_TILT_POSITION,
ATTR_POSITION,
ATTR_TILT_POSITION,
DOMAIN,
DOMAIN as COVER_DOMAIN,
PLATFORM_SCHEMA as COVER_PLATFORM_SCHEMA,
CoverEntity,
CoverEntityFeature,
@ -57,7 +57,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = COVER_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(COVER_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
}
@ -181,21 +181,25 @@ class CoverGroup(GroupEntity, CoverEntity):
"""Move the covers up."""
data = {ATTR_ENTITY_ID: self._covers[KEY_OPEN_CLOSE]}
await self.hass.services.async_call(
DOMAIN, SERVICE_OPEN_COVER, data, blocking=True, context=self._context
COVER_DOMAIN, SERVICE_OPEN_COVER, data, blocking=True, context=self._context
)
async def async_close_cover(self, **kwargs: Any) -> None:
"""Move the covers down."""
data = {ATTR_ENTITY_ID: self._covers[KEY_OPEN_CLOSE]}
await self.hass.services.async_call(
DOMAIN, SERVICE_CLOSE_COVER, data, blocking=True, context=self._context
COVER_DOMAIN,
SERVICE_CLOSE_COVER,
data,
blocking=True,
context=self._context,
)
async def async_stop_cover(self, **kwargs: Any) -> None:
"""Fire the stop action."""
data = {ATTR_ENTITY_ID: self._covers[KEY_STOP]}
await self.hass.services.async_call(
DOMAIN, SERVICE_STOP_COVER, data, blocking=True, context=self._context
COVER_DOMAIN, SERVICE_STOP_COVER, data, blocking=True, context=self._context
)
async def async_set_cover_position(self, **kwargs: Any) -> None:
@ -205,7 +209,7 @@ class CoverGroup(GroupEntity, CoverEntity):
ATTR_POSITION: kwargs[ATTR_POSITION],
}
await self.hass.services.async_call(
DOMAIN,
COVER_DOMAIN,
SERVICE_SET_COVER_POSITION,
data,
blocking=True,
@ -216,21 +220,33 @@ class CoverGroup(GroupEntity, CoverEntity):
"""Tilt covers open."""
data = {ATTR_ENTITY_ID: self._tilts[KEY_OPEN_CLOSE]}
await self.hass.services.async_call(
DOMAIN, SERVICE_OPEN_COVER_TILT, data, blocking=True, context=self._context
COVER_DOMAIN,
SERVICE_OPEN_COVER_TILT,
data,
blocking=True,
context=self._context,
)
async def async_close_cover_tilt(self, **kwargs: Any) -> None:
"""Tilt covers closed."""
data = {ATTR_ENTITY_ID: self._tilts[KEY_OPEN_CLOSE]}
await self.hass.services.async_call(
DOMAIN, SERVICE_CLOSE_COVER_TILT, data, blocking=True, context=self._context
COVER_DOMAIN,
SERVICE_CLOSE_COVER_TILT,
data,
blocking=True,
context=self._context,
)
async def async_stop_cover_tilt(self, **kwargs: Any) -> None:
"""Stop cover tilt."""
data = {ATTR_ENTITY_ID: self._tilts[KEY_STOP]}
await self.hass.services.async_call(
DOMAIN, SERVICE_STOP_COVER_TILT, data, blocking=True, context=self._context
COVER_DOMAIN,
SERVICE_STOP_COVER_TILT,
data,
blocking=True,
context=self._context,
)
async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
@ -240,7 +256,7 @@ class CoverGroup(GroupEntity, CoverEntity):
ATTR_TILT_POSITION: kwargs[ATTR_TILT_POSITION],
}
await self.hass.services.async_call(
DOMAIN,
COVER_DOMAIN,
SERVICE_SET_COVER_TILT_POSITION,
data,
blocking=True,

4
homeassistant/components/group/event.py
View file

@ -10,7 +10,7 @@ import voluptuous as vol
from homeassistant.components.event import (
ATTR_EVENT_TYPE,
ATTR_EVENT_TYPES,
DOMAIN,
DOMAIN as EVENT_DOMAIN,
PLATFORM_SCHEMA as EVENT_PLATFORM_SCHEMA,
EventEntity,
)
@ -40,7 +40,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = EVENT_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(EVENT_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
}

8
homeassistant/components/group/fan.py
View file

@ -14,7 +14,7 @@ from homeassistant.components.fan import (
ATTR_OSCILLATING,
ATTR_PERCENTAGE,
ATTR_PERCENTAGE_STEP,
DOMAIN,
DOMAIN as FAN_DOMAIN,
PLATFORM_SCHEMA as FAN_PLATFORM_SCHEMA,
SERVICE_OSCILLATE,
SERVICE_SET_DIRECTION,
@ -58,7 +58,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = FAN_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(FAN_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
}
@ -218,7 +218,7 @@ class FanGroup(GroupEntity, FanEntity):
) -> None:
"""Call a service with all entities."""
await self.hass.services.async_call(
DOMAIN,
FAN_DOMAIN,
service,
{**data, ATTR_ENTITY_ID: self._fans[support_flag]},
blocking=True,
@ -228,7 +228,7 @@ class FanGroup(GroupEntity, FanEntity):
async def _async_call_all_entities(self, service: str) -> None:
"""Call a service with all entities."""
await self.hass.services.async_call(
DOMAIN,
FAN_DOMAIN,
service,
{ATTR_ENTITY_ID: self._entity_ids},
blocking=True,

10
homeassistant/components/group/lock.py
View file

@ -8,7 +8,7 @@ from typing import Any
import voluptuous as vol
from homeassistant.components.lock import (
DOMAIN,
DOMAIN as LOCK_DOMAIN,
PLATFORM_SCHEMA as LOCK_PLATFORM_SCHEMA,
LockEntity,
LockEntityFeature,
@ -45,7 +45,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = LOCK_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(LOCK_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
}
@ -131,7 +131,7 @@ class LockGroup(GroupEntity, LockEntity):
_LOGGER.debug("Forwarded lock command: %s", data)
await self.hass.services.async_call(
DOMAIN,
LOCK_DOMAIN,
SERVICE_LOCK,
data,
blocking=True,
@ -142,7 +142,7 @@ class LockGroup(GroupEntity, LockEntity):
"""Forward the unlock command to all locks in the group."""
data = {ATTR_ENTITY_ID: self._entity_ids}
await self.hass.services.async_call(
DOMAIN,
LOCK_DOMAIN,
SERVICE_UNLOCK,
data,
blocking=True,
@ -153,7 +153,7 @@ class LockGroup(GroupEntity, LockEntity):
"""Forward the open command to all locks in the group."""
data = {ATTR_ENTITY_ID: self._entity_ids}
await self.hass.services.async_call(
DOMAIN,
LOCK_DOMAIN,
SERVICE_OPEN,
data,
blocking=True,

30
homeassistant/components/group/media_player.py
View file

@ -15,7 +15,7 @@ from homeassistant.components.media_player import (
ATTR_MEDIA_SHUFFLE,
ATTR_MEDIA_VOLUME_LEVEL,
ATTR_MEDIA_VOLUME_MUTED,
DOMAIN,
DOMAIN as MEDIA_PLAYER_DOMAIN,
PLATFORM_SCHEMA as MEDIA_PLAYER_PLATFORM_SCHEMA,
SERVICE_CLEAR_PLAYLIST,
SERVICE_PLAY_MEDIA,
@ -73,7 +73,7 @@ DEFAULT_NAME = "Media Group"
PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(MEDIA_PLAYER_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
}
@ -274,7 +274,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Clear players playlist."""
data = {ATTR_ENTITY_ID: self._features[KEY_CLEAR_PLAYLIST]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_CLEAR_PLAYLIST,
data,
context=self._context,
@ -284,7 +284,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Send next track command."""
data = {ATTR_ENTITY_ID: self._features[KEY_TRACKS]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_MEDIA_NEXT_TRACK,
data,
context=self._context,
@ -294,7 +294,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Send pause command."""
data = {ATTR_ENTITY_ID: self._features[KEY_PAUSE_PLAY_STOP]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_MEDIA_PAUSE,
data,
context=self._context,
@ -304,7 +304,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Send play command."""
data = {ATTR_ENTITY_ID: self._features[KEY_PAUSE_PLAY_STOP]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_MEDIA_PLAY,
data,
context=self._context,
@ -314,7 +314,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Send previous track command."""
data = {ATTR_ENTITY_ID: self._features[KEY_TRACKS]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_MEDIA_PREVIOUS_TRACK,
data,
context=self._context,
@ -327,7 +327,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
ATTR_MEDIA_SEEK_POSITION: position,
}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_MEDIA_SEEK,
data,
context=self._context,
@ -337,7 +337,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Send stop command."""
data = {ATTR_ENTITY_ID: self._features[KEY_PAUSE_PLAY_STOP]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_MEDIA_STOP,
data,
context=self._context,
@ -350,7 +350,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
ATTR_MEDIA_VOLUME_MUTED: mute,
}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_VOLUME_MUTE,
data,
context=self._context,
@ -368,7 +368,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
if kwargs:
data.update(kwargs)
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_PLAY_MEDIA,
data,
context=self._context,
@ -381,7 +381,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
ATTR_MEDIA_SHUFFLE: shuffle,
}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_SHUFFLE_SET,
data,
context=self._context,
@ -391,7 +391,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Forward the turn_on command to all media in the media group."""
data = {ATTR_ENTITY_ID: self._features[KEY_ON_OFF]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_TURN_ON,
data,
context=self._context,
@ -404,7 +404,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
ATTR_MEDIA_VOLUME_LEVEL: volume,
}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_VOLUME_SET,
data,
context=self._context,
@ -414,7 +414,7 @@ class MediaPlayerGroup(MediaPlayerEntity):
"""Forward the turn_off command to all media in the media group."""
data = {ATTR_ENTITY_ID: self._features[KEY_ON_OFF]}
await self.hass.services.async_call(
DOMAIN,
MEDIA_PLAYER_DOMAIN,
SERVICE_TURN_OFF,
data,
context=self._context,

9
homeassistant/components/group/notify.py
View file

@ -13,7 +13,7 @@ from homeassistant.components.notify import (
ATTR_DATA,
ATTR_MESSAGE,
ATTR_TITLE,
DOMAIN,
DOMAIN as NOTIFY_DOMAIN,
PLATFORM_SCHEMA as NOTIFY_PLATFORM_SCHEMA,
SERVICE_SEND_MESSAGE,
BaseNotificationService,
@ -115,7 +115,10 @@ class GroupNotifyPlatform(BaseNotificationService):
tasks.append(
asyncio.create_task(
self.hass.services.async_call(
DOMAIN, entity[CONF_ACTION], sending_payload, blocking=True
NOTIFY_DOMAIN,
entity[CONF_ACTION],
sending_payload,
blocking=True,
)
)
)
@ -172,7 +175,7 @@ class NotifyGroup(GroupEntity, NotifyEntity):
async def async_send_message(self, message: str, title: str | None = None) -> None:
"""Send a message to all members of the group."""
await self.hass.services.async_call(
DOMAIN,
NOTIFY_DOMAIN,
SERVICE_SEND_MESSAGE,
{
ATTR_MESSAGE: message,

18
homeassistant/components/group/sensor.py
View file

@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
CONF_STATE_CLASS,
DEVICE_CLASS_UNITS,
DEVICE_CLASSES_SCHEMA,
DOMAIN,
DOMAIN as SENSOR_DOMAIN,
PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
STATE_CLASSES_SCHEMA,
UNIT_CONVERTERS,
@ -96,7 +96,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(
[DOMAIN, NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
[SENSOR_DOMAIN, NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
),
vol.Required(CONF_TYPE): vol.All(cv.string, vol.In(SENSOR_TYPES.values())),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@ -503,7 +503,7 @@ class SensorGroup(GroupEntity, SensorEntity):
if all(x == state_classes[0] for x in state_classes):
async_delete_issue(
self.hass, DOMAIN, f"{self.entity_id}_state_classes_not_matching"
self.hass, SENSOR_DOMAIN, f"{self.entity_id}_state_classes_not_matching"
)
return state_classes[0]
async_create_issue(
@ -546,7 +546,9 @@ class SensorGroup(GroupEntity, SensorEntity):
if all(x == device_classes[0] for x in device_classes):
async_delete_issue(
self.hass, DOMAIN, f"{self.entity_id}_device_classes_not_matching"
self.hass,
SENSOR_DOMAIN,
f"{self.entity_id}_device_classes_not_matching",
)
return device_classes[0]
async_create_issue(
@ -614,10 +616,14 @@ class SensorGroup(GroupEntity, SensorEntity):
)
):
async_delete_issue(
self.hass, DOMAIN, f"{self.entity_id}_uoms_not_matching_device_class"
self.hass,
SENSOR_DOMAIN,
f"{self.entity_id}_uoms_not_matching_device_class",
)
async_delete_issue(
self.hass, DOMAIN, f"{self.entity_id}_uoms_not_matching_no_device_class"
self.hass,
SENSOR_DOMAIN,
f"{self.entity_id}_uoms_not_matching_no_device_class",
)
return unit_of_measurements[0]

8
homeassistant/components/group/switch.py
View file

@ -8,7 +8,7 @@ from typing import Any
import voluptuous as vol
from homeassistant.components.switch import (
DOMAIN,
DOMAIN as SWITCH_DOMAIN,
PLATFORM_SCHEMA as SWITCH_PLATFORM_SCHEMA,
SwitchEntity,
)
@ -39,7 +39,7 @@ PARALLEL_UPDATES = 0
PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
vol.Required(CONF_ENTITIES): cv.entities_domain(SWITCH_DOMAIN),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_UNIQUE_ID): cv.string,
vol.Optional(CONF_ALL, default=False): cv.boolean,
@ -132,7 +132,7 @@ class SwitchGroup(GroupEntity, SwitchEntity):
_LOGGER.debug("Forwarded turn_on command: %s", data)
await self.hass.services.async_call(
DOMAIN,
SWITCH_DOMAIN,
SERVICE_TURN_ON,
data,
blocking=True,
@ -143,7 +143,7 @@ class SwitchGroup(GroupEntity, SwitchEntity):
"""Forward the turn_off command to all switches in the group."""
data = {ATTR_ENTITY_ID: self._entity_ids}
await self.hass.services.async_call(
DOMAIN,
SWITCH_DOMAIN,
SERVICE_TURN_OFF,
data,
blocking=True,