jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-24 01:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moves V2C from hass.data to config_entry.runtime_data (#119165)

Browse Source 
Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
This commit is contained in:
Diogo Gomes 2024-06-10 07:47:08 +01:00 committed by GitHub
parent 731df892c6
commit 0873322af7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/v2c/__init__.py
View File

@ -9,7 +9,6 @@ from homeassistant.const import CONF_HOST, Platform
from homeassistant.core import HomeAssistant
from homeassistant.helpers.httpx_client import get_async_client
from .const import DOMAIN
from .coordinator import V2CUpdateCoordinator
PLATFORMS: list[Platform] = [
@ -20,7 +19,10 @@ PLATFORMS: list[Platform] = [
]
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
type V2CConfigEntry = ConfigEntry[V2CUpdateCoordinator]
async def async_setup_entry(hass: HomeAssistant, entry: V2CConfigEntry) -> bool:
"""Set up V2C from a config entry."""
host = entry.data[CONF_HOST]
@ -29,7 +31,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
await coordinator.async_config_entry_first_refresh()
hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
entry.runtime_data = coordinator
if coordinator.data.ID and entry.unique_id != coordinator.data.ID:
hass.config_entries.async_update_entry(entry, unique_id=coordinator.data.ID)
@ -41,7 +43,4 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Unload a config entry."""
if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
hass.data[DOMAIN].pop(entry.entry_id)
return unload_ok
return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

7
homeassistant/components/v2c/binary_sensor.py
View File

@ -12,11 +12,10 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntity,
BinarySensorEntityDescription,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN
from . import V2CConfigEntry
from .coordinator import V2CUpdateCoordinator
from .entity import V2CBaseEntity
@ -51,11 +50,11 @@ TRYDAN_SENSORS = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
config_entry: V2CConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up V2C binary sensor platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
coordinator = config_entry.runtime_data
async_add_entities(
V2CBinarySensorBaseEntity(coordinator, description, config_entry.entry_id)

8
homeassistant/components/v2c/diagnostics.py
View File

@ -5,21 +5,19 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Any
from homeassistant.components.diagnostics import async_redact_data
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_HOST
from homeassistant.core import HomeAssistant
from .const import DOMAIN
from .coordinator import V2CUpdateCoordinator
from . import V2CConfigEntry
TO_REDACT = {CONF_HOST, "title"}
async def async_get_config_entry_diagnostics(
hass: HomeAssistant, entry: ConfigEntry
hass: HomeAssistant, entry: V2CConfigEntry
) -> dict[str, Any]:
"""Return diagnostics for a config entry."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
coordinator = entry.runtime_data
if TYPE_CHECKING:
assert coordinator.evse

7
homeassistant/components/v2c/number.py
View File

@ -13,11 +13,10 @@ from homeassistant.components.number import (
NumberEntity,
NumberEntityDescription,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN
from . import V2CConfigEntry
from .coordinator import V2CUpdateCoordinator
from .entity import V2CBaseEntity
@ -48,11 +47,11 @@ TRYDAN_NUMBER_SETTINGS = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
config_entry: V2CConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up V2C Trydan number platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
coordinator = config_entry.runtime_data
async_add_entities(
V2CSettingsNumberEntity(coordinator, description, config_entry.entry_id)

7
homeassistant/components/v2c/sensor.py
View File

@ -15,13 +15,12 @@ from homeassistant.components.sensor import (
SensorEntityDescription,
SensorStateClass,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import UnitOfEnergy, UnitOfPower, UnitOfTime
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.typing import StateType
from .const import DOMAIN
from . import V2CConfigEntry
from .coordinator import V2CUpdateCoordinator
from .entity import V2CBaseEntity
@ -106,11 +105,11 @@ TRYDAN_SENSORS = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
config_entry: V2CConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up V2C sensor platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
coordinator = config_entry.runtime_data
async_add_entities(
V2CSensorBaseEntity(coordinator, description, config_entry.entry_id)

7
homeassistant/components/v2c/switch.py
View File

@ -17,11 +17,10 @@ from pytrydan.models.trydan import (
)
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN
from . import V2CConfigEntry
from .coordinator import V2CUpdateCoordinator
from .entity import V2CBaseEntity
@ -80,11 +79,11 @@ TRYDAN_SWITCHES = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
config_entry: V2CConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up V2C switch platform."""
coordinator: V2CUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
coordinator = config_entry.runtime_data
async_add_entities(
V2CSwitchEntity(coordinator, description, config_entry.entry_id)

2
tests/components/v2c/conftest.py
View File

@ -6,7 +6,7 @@ import pytest
from pytrydan.models.trydan import TrydanData
from typing_extensions import Generator
from homeassistant.components.v2c import DOMAIN
from homeassistant.components.v2c.const import DOMAIN
from homeassistant.const import CONF_HOST
from homeassistant.helpers.json import json_dumps