Mirrors/EOS
1
0
Fork 0
mirror of https://github.com/Akkudoktor-EOS/EOS.git synced 2026-01-26 12:36:17 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

chore: improve Home Assistant adapter
Some checks failed
Bump Version / Bump Version Workflow (push) Has been cancelled
Details
docker-build / platform-excludes (push) Has been cancelled
Details
pre-commit / pre-commit (push) Has been cancelled
Details
Run Pytest on Pull Request / test (push) Has been cancelled
Details
docker-build / build (push) Has been cancelled
Details
docker-build / merge (push) Has been cancelled
Details
Close stale pull requests/issues / Find Stale issues and PRs (push) Has been cancelled
Details

Browse Source 
Add documentation for home assistant adapter.
Make adapter correctly set the measurement keys for PV production.
Add adapter configuration for grid import and export measurements.

Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
This commit is contained in:
Bobby Noelte
2025-12-31 12:34:33 +01:00
parent 0cfed675ce
commit 7c98383e1f
11 changed files with 383 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/akkudoktoreos/adapter/homeassistant.py
View File

@@ -54,7 +54,7 @@ class HomeAssistantAdapterCommonSettings(SettingsBaseModel):
load_emr_entity_ids: Optional[list[str]] = Field(
default=None,
json_schema_extra={
"description": "Entity ID(s) of load energy meter reading [kWh]",
"description": "Entity ID(s) of load energy meter readings [kWh]",
"examples": [
["sensor.load_energy_total_kwh"],
["sensor.load_emr1_kwh", "sensor.load_emr2_kwh"],
@@ -62,10 +62,30 @@ class HomeAssistantAdapterCommonSettings(SettingsBaseModel):
},
)
grid_export_emr_entity_ids: Optional[list[str]] = Field(
default=None,
json_schema_extra={
"description": "Entity ID(s) of export to grid energy meter readings [kWh]",
"examples": [
["sensor.grid_export_energy_total_kwh"],
],
},
)
grid_import_emr_entity_ids: Optional[list[str]] = Field(
default=None,
json_schema_extra={
"description": "Entity ID(s) of import from grid energy meter readings [kWh]",
"examples": [
["sensor.grid_import_energy_total_kwh"],
],
},
)
pv_production_emr_entity_ids: Optional[list[str]] = Field(
default=None,
json_schema_extra={
"description": "Entity ID(s) of PV production energy meter reading [kWh]",
"description": "Entity ID(s) of PV production energy meter readings [kWh]",
"examples": [
["sensor.pv_energy_total_kwh"],
["sensor.pv_emr1_kwh", "sensor.pv_emr2_kwh"],
@@ -467,6 +487,50 @@ class HomeAssistantAdapter(AdapterProvider):
except Exception as e:
logger.error(f"{e}")
# Retrieve export to grid measurements
entity_ids = self.config.adapter.homeassistant.grid_export_emr_entity_ids
if entity_ids:
measurement_keys = self.config.measurement.grid_export_emr_keys
if measurement_keys is None:
measurement_keys = []
for entity_id in entity_ids:
measurement_key = entity_id
if measurement_key not in measurement_keys:
measurement_keys.append(measurement_key)
self.config.measurement.grid_export_emr_keys = measurement_keys
try:
state = self.get_entity_state(entity_id)
logger.debug(f"Entity {entity_id}: {state}")
if state:
measurement_value = float(state)
self.measurement.update_value(
self.ems_start_datetime, measurement_key, measurement_value
)
except Exception as e:
logger.error(f"{e}")
# Retrieve import from grid measurements
entity_ids = self.config.adapter.homeassistant.grid_import_emr_entity_ids
if entity_ids:
measurement_keys = self.config.measurement.grid_import_emr_keys
if measurement_keys is None:
measurement_keys = []
for entity_id in entity_ids:
measurement_key = entity_id
if measurement_key not in measurement_keys:
measurement_keys.append(measurement_key)
self.config.measurement.grid_import_emr_keys = measurement_keys
try:
state = self.get_entity_state(entity_id)
logger.debug(f"Entity {entity_id}: {state}")
if state:
measurement_value = float(state)
self.measurement.update_value(
self.ems_start_datetime, measurement_key, measurement_value
)
except Exception as e:
logger.error(f"{e}")
# Retrieve measurements for PV prediction
entity_ids = self.config.adapter.homeassistant.pv_production_emr_entity_ids
if entity_ids:
@@ -477,7 +541,7 @@ class HomeAssistantAdapter(AdapterProvider):
measurement_key = entity_id
if measurement_key not in measurement_keys:
measurement_keys.append(measurement_key)
self.comfig.measurement.pv_production_emr_keys = measurement_keys
self.config.measurement.pv_production_emr_keys = measurement_keys
try:
state = self.get_entity_state(entity_id)
logger.debug(f"Entity {entity_id}: {state}")

6
src/akkudoktoreos/server/dash/configuration.py
View File

@@ -703,6 +703,12 @@ def Configuration(
elif config["name"].startswith("adapter.homeassistant.load_emr_entity_ids"):
# Home Assistant adapter load energy meter readings entities
update_form_factory = make_config_update_list_form(homeassistant_entity_ids)
elif config["name"].startswith("adapter.homeassistant.grid_export_emr_entity_ids"):
# Home Assistant adapter grid export energy meter readings entities
update_form_factory = make_config_update_list_form(homeassistant_entity_ids)
elif config["name"].startswith("adapter.homeassistant.grid_import_emr_entity_ids"):
# Home Assistant adapter grid import energy meter readings entities
update_form_factory = make_config_update_list_form(homeassistant_entity_ids)
elif config["name"].startswith("adapter.homeassistant.pv_production_emr_entity_ids"):
# Home Assistant adapter pv energy meter readings entities
update_form_factory = make_config_update_list_form(homeassistant_entity_ids)