jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-09 10:59:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up core references in conversation (#153880)

Browse Source
This commit is contained in:
Artur Pragacz
2025-10-07 00:46:47 +02:00
committed by GitHub
parent 18997833c4
commit b9a1ab4a44
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
homeassistant/components/conversation/default_agent.py
View File

@@ -45,13 +45,18 @@ from home_assistant_intents import (
) )
import yaml import yaml
from homeassistant import core
from homeassistant.components.homeassistant.exposed_entities import ( from homeassistant.components.homeassistant.exposed_entities import (
async_listen_entity_updates, async_listen_entity_updates,
async_should_expose, async_should_expose,
) )
from homeassistant.const import EVENT_STATE_CHANGED, MATCH_ALL from homeassistant.const import EVENT_STATE_CHANGED, MATCH_ALL
from homeassistant.core import Event, callback from homeassistant.core import (
Event,
EventStateChangedData,
HomeAssistant,
State,
callback,
)
from homeassistant.helpers import ( from homeassistant.helpers import (
area_registry as ar, area_registry as ar,
device_registry as dr, device_registry as dr,
@@ -192,7 +197,7 @@ class IntentCache:
async def async_setup_default_agent( async def async_setup_default_agent(
hass: core.HomeAssistant, hass: HomeAssistant,
entity_component: EntityComponent[ConversationEntity], entity_component: EntityComponent[ConversationEntity],
config_intents: dict[str, Any], config_intents: dict[str, Any],
) -> None: ) -> None:
@@ -201,15 +206,13 @@ async def async_setup_default_agent(
await entity_component.async_add_entities([agent]) await entity_component.async_add_entities([agent])
await get_agent_manager(hass).async_setup_default_agent(agent) await get_agent_manager(hass).async_setup_default_agent(agent)
@core.callback @callback
def async_entity_state_listener( def async_entity_state_listener(event: Event[EventStateChangedData]) -> None:
event: core.Event[core.EventStateChangedData],
) -> None:
"""Set expose flag on new entities.""" """Set expose flag on new entities."""
async_should_expose(hass, DOMAIN, event.data["entity_id"]) async_should_expose(hass, DOMAIN, event.data["entity_id"])
@core.callback @callback
def async_hass_started(hass: core.HomeAssistant) -> None: def async_hass_started(hass: HomeAssistant) -> None:
"""Set expose flag on all entities.""" """Set expose flag on all entities."""
for state in hass.states.async_all(): for state in hass.states.async_all():
async_should_expose(hass, DOMAIN, state.entity_id) async_should_expose(hass, DOMAIN, state.entity_id)
@@ -224,9 +227,7 @@ class DefaultAgent(ConversationEntity):
_attr_name = "Home Assistant" _attr_name = "Home Assistant"
_attr_supported_features = ConversationEntityFeature.CONTROL _attr_supported_features = ConversationEntityFeature.CONTROL
def __init__( def __init__(self, hass: HomeAssistant, config_intents: dict[str, Any]) -> None:
self, hass: core.HomeAssistant, config_intents: dict[str, Any]
) -> None:
"""Initialize the default agent.""" """Initialize the default agent."""
self.hass = hass self.hass = hass
self._lang_intents: dict[str, LanguageIntents | object] = {} self._lang_intents: dict[str, LanguageIntents | object] = {}
@@ -259,7 +260,7 @@ class DefaultAgent(ConversationEntity):
"""Return a list of supported languages.""" """Return a list of supported languages."""
return get_languages() return get_languages()
@core.callback @callback
def _filter_entity_registry_changes( def _filter_entity_registry_changes(
self, event_data: er.EventEntityRegistryUpdatedData self, event_data: er.EventEntityRegistryUpdatedData
) -> bool: ) -> bool:
@@ -268,12 +269,12 @@ class DefaultAgent(ConversationEntity):
field in event_data["changes"] for field in _ENTITY_REGISTRY_UPDATE_FIELDS field in event_data["changes"] for field in _ENTITY_REGISTRY_UPDATE_FIELDS
) )
@core.callback @callback
def _filter_state_changes(self, event_data: core.EventStateChangedData) -> bool: def _filter_state_changes(self, event_data: EventStateChangedData) -> bool:
"""Filter state changed events.""" """Filter state changed events."""
return not event_data["old_state"] or not event_data["new_state"] return not event_data["old_state"] or not event_data["new_state"]
@core.callback @callback
def _listen_clear_slot_list(self) -> None: def _listen_clear_slot_list(self) -> None:
"""Listen for changes that can invalidate slot list.""" """Listen for changes that can invalidate slot list."""
assert self._unsub_clear_slot_list is None assert self._unsub_clear_slot_list is None
@@ -890,7 +891,7 @@ class DefaultAgent(ConversationEntity):
) -> str: ) -> str:
# Get first matched or unmatched state. # Get first matched or unmatched state.
# This is available in the response template as "state". # This is available in the response template as "state".
state1: core.State | None = None state1: State | None = None
if intent_response.matched_states: if intent_response.matched_states:
state1 = intent_response.matched_states[0] state1 = intent_response.matched_states[0]
elif intent_response.unmatched_states: elif intent_response.unmatched_states:
@@ -1589,7 +1590,7 @@ def _get_unmatched_response(result: RecognizeResult) -> tuple[ErrorKey, dict[str
def _get_match_error_response( def _get_match_error_response(
hass: core.HomeAssistant, hass: HomeAssistant,
match_error: intent.MatchFailedError, match_error: intent.MatchFailedError,
) -> tuple[ErrorKey, dict[str, Any]]: ) -> tuple[ErrorKey, dict[str, Any]]:
"""Return key and template arguments for error when target matching fails.""" """Return key and template arguments for error when target matching fails."""