jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 09:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix type narrowing in energy integration (#75462)

Browse Source
This commit is contained in:
Marc Mueller 2022-07-20 04:00:14 +02:00 committed by GitHub
parent 07b4d48e7c
commit 3193ea3359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/energy/data.py
View File

@ -54,7 +54,7 @@ class FlowToGridSourceType(TypedDict):
stat_compensation: str | None stat_compensation: str | None
# Used to generate costs if stat_compensation is set to None # Used to generate costs if stat_compensation is set to None
entity_energy_from: str | None # entity_id of an energy meter (kWh), entity_id of the energy meter for stat_energy_from entity_energy_to: str | None # entity_id of an energy meter (kWh), entity_id of the energy meter for stat_energy_to
entity_energy_price: str | None # entity_id of an entity providing price ($/kWh) entity_energy_price: str | None # entity_id of an entity providing price ($/kWh)
number_energy_price: float | None # Price for energy ($/kWh) number_energy_price: float | None # Price for energy ($/kWh)

23
homeassistant/components/energy/validate.py
View File

@ -263,10 +263,10 @@ def _async_validate_auto_generated_cost_entity(
async def async_validate(hass: HomeAssistant) -> EnergyPreferencesValidation: async def async_validate(hass: HomeAssistant) -> EnergyPreferencesValidation:
"""Validate the energy configuration.""" """Validate the energy configuration."""
manager = await data.async_get_manager(hass) manager: data.EnergyManager = await data.async_get_manager(hass)
statistics_metadata: dict[str, tuple[int, recorder.models.StatisticMetaData]] = {} statistics_metadata: dict[str, tuple[int, recorder.models.StatisticMetaData]] = {}
validate_calls = [] validate_calls = []
wanted_statistics_metadata = set() wanted_statistics_metadata: set[str] = set()
result = EnergyPreferencesValidation() result = EnergyPreferencesValidation()
@ -279,6 +279,7 @@ async def async_validate(hass: HomeAssistant) -> EnergyPreferencesValidation:
result.energy_sources.append(source_result) result.energy_sources.append(source_result)
if source["type"] == "grid": if source["type"] == "grid":
flow: data.FlowFromGridSourceType | data.FlowToGridSourceType
for flow in source["flow_from"]: for flow in source["flow_from"]:
wanted_statistics_metadata.add(flow["stat_energy_from"]) wanted_statistics_metadata.add(flow["stat_energy_from"])
validate_calls.append( validate_calls.append(
@ -294,14 +295,14 @@ async def async_validate(hass: HomeAssistant) -> EnergyPreferencesValidation:
) )
) )
if flow.get("stat_cost") is not None: if (stat_cost := flow.get("stat_cost")) is not None:
wanted_statistics_metadata.add(flow["stat_cost"]) wanted_statistics_metadata.add(stat_cost)
validate_calls.append( validate_calls.append(
functools.partial( functools.partial(
_async_validate_cost_stat, _async_validate_cost_stat,
hass, hass,
statistics_metadata, statistics_metadata,
flow["stat_cost"], stat_cost,
source_result, source_result,
) )
) )
@ -345,14 +346,14 @@ async def async_validate(hass: HomeAssistant) -> EnergyPreferencesValidation:
) )
) )
if flow.get("stat_compensation") is not None: if (stat_compensation := flow.get("stat_compensation")) is not None:
wanted_statistics_metadata.add(flow["stat_compensation"]) wanted_statistics_metadata.add(stat_compensation)
validate_calls.append( validate_calls.append(
functools.partial( functools.partial(
_async_validate_cost_stat, _async_validate_cost_stat,
hass, hass,
statistics_metadata, statistics_metadata,
flow["stat_compensation"], stat_compensation,
source_result, source_result,
) )
) )
@ -396,14 +397,14 @@ async def async_validate(hass: HomeAssistant) -> EnergyPreferencesValidation:
) )
) )
if source.get("stat_cost") is not None: if (stat_cost := source.get("stat_cost")) is not None:
wanted_statistics_metadata.add(source["stat_cost"]) wanted_statistics_metadata.add(stat_cost)
validate_calls.append( validate_calls.append(
functools.partial( functools.partial(
_async_validate_cost_stat, _async_validate_cost_stat,
hass, hass,
statistics_metadata, statistics_metadata,
source["stat_cost"], stat_cost,
source_result, source_result,
) )
) )