diff --git a/homeassistant/components/cover/condition.py b/homeassistant/components/cover/condition.py index b662f794e5c..7092c021c56 100644 --- a/homeassistant/components/cover/condition.py +++ b/homeassistant/components/cover/condition.py @@ -1,7 +1,7 @@ """Provides conditions for covers.""" from homeassistant.const import STATE_OFF, STATE_ON -from homeassistant.core import HomeAssistant, State, split_entity_id +from homeassistant.core import HomeAssistant, State from homeassistant.helpers.condition import Condition, EntityConditionBase from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass @@ -13,7 +13,7 @@ class CoverConditionBase(EntityConditionBase[CoverDomainSpec]): def is_valid_state(self, entity_state: State) -> bool: """Check if the state matches the expected cover state.""" - domain_spec = self._domain_specs[split_entity_id(entity_state.entity_id)[0]] + domain_spec = self._domain_specs[entity_state.domain] if domain_spec.value_source is not None: return ( entity_state.attributes.get(domain_spec.value_source) diff --git a/homeassistant/helpers/condition.py b/homeassistant/helpers/condition.py index 8e8b1a310a5..5e6767cb1b5 100644 --- a/homeassistant/helpers/condition.py +++ b/homeassistant/helpers/condition.py @@ -55,7 +55,7 @@ from homeassistant.const import ( STATE_UNKNOWN, WEEKDAYS, ) -from homeassistant.core import HomeAssistant, State, callback, split_entity_id +from homeassistant.core import HomeAssistant, State, callback from homeassistant.exceptions import ( ConditionError, ConditionErrorContainer, @@ -364,7 +364,7 @@ class EntityConditionBase[DomainSpecT: DomainSpec = DomainSpec](Condition): def _get_tracked_value(self, entity_state: State) -> Any: """Get the tracked value from a state based on the DomainSpec.""" - domain_spec = self._domain_specs[split_entity_id(entity_state.entity_id)[0]] + domain_spec = self._domain_specs[entity_state.domain] if domain_spec.value_source is None: return entity_state.state return entity_state.attributes.get(domain_spec.value_source)