WIP

Author: andrew-codechimp

custom_components/battery_notes/__init__.py

@@ -8,20 +8,16 @@
 
 import logging
 import re
-from dataclasses import dataclass
-from datetime import datetime
 
 import voluptuous as vol
 from awesomeversion.awesomeversion import AwesomeVersion
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import __version__ as HA_VERSION  # noqa: N812
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
-from homeassistant.util.hass_dict import HassKey
 
 from .config_flow import CONFIG_VERSION
 from .const import (
@@ -44,14 +40,18 @@
     DEFAULT_SCHEMA_URL,
     DOMAIN,
     MIN_HA_VERSION,
+    MY_KEY,
     PLATFORMS,
 )
-from .coordinator import BatteryNotesCoordinator
+from .coordinator import (
+    BatteryNotesConfigEntry,
+    BatteryNotesCoordinator,
+    BatteryNotesDomainConfig,
+)
 from .discovery import DiscoveryManager
 from .library_updater import LibraryUpdater
 from .services import setup_services
 from .store import (
-    BatteryNotesStorage,
     async_get_registry,
 )
 
@@ -91,35 +91,6 @@
     extra=vol.ALLOW_EXTRA,
 )
 
-@dataclass
-class BatteryNotesDomainConfig:
-    """Class for sharing config data within the BatteryNotes integration."""
-    enable_autodiscovery: bool = True
-    show_all_devices: bool = False
-    enable_replaced: bool = True
-    hide_battery: bool = False
-    round_battery: bool = False
-    default_battery_low_threshold: int = DEFAULT_BATTERY_LOW_THRESHOLD
-    battery_increased_threshod: int = DEFAULT_BATTERY_INCREASE_THRESHOLD
-    library_url: str = DEFAULT_LIBRARY_URL
-    schema_url: str = DEFAULT_SCHEMA_URL
-    library_updater: LibraryUpdater | None
-    library_last_update: datetime | None = None
-    user_library: str = ""
-    coordinator: BatteryNotesCoordinator | None
-
-type BatteryNotesConfigEntry = ConfigEntry[BatteryNotesData]
-
-MY_KEY: HassKey["BatteryNotesDomainConfig"] = HassKey(DOMAIN)
-
-@dataclass
-class BatteryNotesData:
-    """Class for sharing data within the BatteryNotes integration."""
-
-    domain_config: BatteryNotesDomainConfig
-    store: BatteryNotesStorage
-    coordinator: BatteryNotesCoordinator
-
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Integration setup."""

custom_components/battery_notes/binary_sensor.py

@@ -63,7 +63,7 @@
     CoordinatorEntity,
 )
 
-from . import MY_KEY, PLATFORMS, BatteryNotesConfigEntry
+from . import PLATFORMS
 from .common import validate_is_float
 from .const import (
     ATTR_BATTERY_LOW_THRESHOLD,
@@ -72,8 +72,12 @@
     ATTR_BATTERY_TYPE_AND_QUANTITY,
     CONF_SOURCE_ENTITY_ID,
     DOMAIN,
+    MY_KEY,
+)
+from .coordinator import (
+    BatteryNotesConfigEntry,
+    BatteryNotesCoordinator,
 )
-from .coordinator import BatteryNotesCoordinator
 from .entity import (
     BatteryNotesEntityDescription,
 )

custom_components/battery_notes/button.py

@@ -33,7 +33,7 @@
 )
 from homeassistant.helpers.reload import async_setup_reload_service
 
-from . import PLATFORMS, BatteryNotesConfigEntry
+from . import PLATFORMS
 from .const import (
     ATTR_BATTERY_QUANTITY,
     ATTR_BATTERY_TYPE,
@@ -45,7 +45,7 @@
     DOMAIN,
     EVENT_BATTERY_REPLACED,
 )
-from .coordinator import BatteryNotesCoordinator
+from .coordinator import BatteryNotesConfigEntry, BatteryNotesCoordinator
 from .entity import (
     BatteryNotesEntityDescription,
 )

custom_components/battery_notes/const.py

@@ -1,13 +1,18 @@
 """Constants for battery_notes."""
 
 import json
+from dataclasses import dataclass
+from datetime import datetime
 from logging import Logger, getLogger
 from pathlib import Path
 from typing import Final
 
 import voluptuous as vol
 from homeassistant.const import Platform
 from homeassistant.helpers import config_validation as cv
+from homeassistant.util.hass_dict import HassKey
+
+from .library_updater import LibraryUpdater
 
 LOGGER: Logger = getLogger(__package__)
 
@@ -112,3 +117,21 @@
     Platform.SENSOR,
     Platform.BINARY_SENSOR,
 ]
+
+@dataclass
+class BatteryNotesDomainConfig:
+    """Class for sharing config data within the BatteryNotes integration."""
+    enable_autodiscovery: bool = True
+    show_all_devices: bool = False
+    enable_replaced: bool = True
+    hide_battery: bool = False
+    round_battery: bool = False
+    default_battery_low_threshold: int = DEFAULT_BATTERY_LOW_THRESHOLD
+    battery_increased_threshod: int = DEFAULT_BATTERY_INCREASE_THRESHOLD
+    library_url: str = DEFAULT_LIBRARY_URL
+    schema_url: str = DEFAULT_SCHEMA_URL
+    library_updater: LibraryUpdater | None
+    library_last_update: datetime | None = None
+    user_library: str = ""
+
+MY_KEY: HassKey[BatteryNotesDomainConfig] = HassKey(DOMAIN)

custom_components/battery_notes/coordinator.py

@@ -3,13 +3,15 @@
 from __future__ import annotations
 
 import logging
+from dataclasses import dataclass
 from datetime import datetime
 from typing import cast
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
 from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.sensor import SensorDeviceClass
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_DEVICE_ID,
     PERCENTAGE,
@@ -24,7 +26,6 @@
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
 
-from . import BatteryNotesConfigEntry
 from .common import validate_is_float
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
@@ -46,17 +47,33 @@
     CONF_BATTERY_TYPE,
     CONF_FILTER_OUTLIERS,
     CONF_SOURCE_ENTITY_ID,
+    DEFAULT_BATTERY_INCREASE_THRESHOLD,
+    DEFAULT_BATTERY_LOW_THRESHOLD,
+    DEFAULT_LIBRARY_URL,
+    DEFAULT_SCHEMA_URL,
     DOMAIN,
     EVENT_BATTERY_INCREASED,
     EVENT_BATTERY_THRESHOLD,
     LAST_REPLACED,
     LAST_REPORTED,
     LAST_REPORTED_LEVEL,
+    BatteryNotesDomainConfig,
 )
 from .filters import LowOutlierFilter
+from .library_updater import LibraryUpdater
+from .store import BatteryNotesStorage
 
 _LOGGER = logging.getLogger(__name__)
 
+type BatteryNotesConfigEntry = ConfigEntry[BatteryNotesData]
+
+@dataclass
+class BatteryNotesData:
+    """Class for sharing data within the BatteryNotes integration."""
+
+    domain_config: BatteryNotesDomainConfig
+    store: BatteryNotesStorage
+    coordinator: BatteryNotesCoordinator
 
 
 class BatteryNotesCoordinator(DataUpdateCoordinator[None]):

custom_components/battery_notes/diagnostics.py

@@ -13,9 +13,9 @@
     entity_registry as er,
 )
 
-from . import BatteryNotesConfigEntry
 from .common import get_device_model_id
 from .const import CONF_SOURCE_ENTITY_ID
+from .coordinator import BatteryNotesConfigEntry
 
 
 async def async_get_config_entry_diagnostics(

custom_components/battery_notes/library.py

@@ -10,10 +10,10 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.storage import STORAGE_DIR
 
-from . import MY_KEY
 from .const import (
     DATA_LIBRARY,
     DOMAIN,
+    MY_KEY,
 )
 
 _LOGGER = logging.getLogger(__name__)

custom_components/battery_notes/library_updater.py

@@ -18,15 +18,8 @@
 from homeassistant.helpers.event import async_track_utc_time_change
 from homeassistant.helpers.storage import STORAGE_DIR
 
-from . import MY_KEY
 from .const import (
-    CONF_ENABLE_AUTODISCOVERY,
-    CONF_LIBRARY_URL,
-    CONF_SCHEMA_URL,
-    DEFAULT_LIBRARY_URL,
-    DEFAULT_SCHEMA_URL,
-    DOMAIN,
-    DOMAIN_CONFIG,
+    MY_KEY,
 )
 from .discovery import DiscoveryManager
 
@@ -47,13 +40,10 @@ def __init__(self, hass: HomeAssistant):
         """Initialize the library updater."""
         self.hass = hass
 
-        if DOMAIN_CONFIG in self.hass.data[DOMAIN]:
-            domain_config: dict = self.hass.data[DOMAIN][DOMAIN_CONFIG]
-            library_url = domain_config.get(CONF_LIBRARY_URL, DEFAULT_LIBRARY_URL)
-            schema_url = domain_config.get(CONF_SCHEMA_URL, DEFAULT_SCHEMA_URL)
-        else:
-            library_url = DEFAULT_LIBRARY_URL
-            schema_url = DEFAULT_SCHEMA_URL
+        domain_config = self.hass.data[MY_KEY]
+
+        library_url = domain_config.library_url
+        schema_url = domain_config.schema_url
 
         self._client = LibraryUpdaterClient(library_url=library_url, schema_url=schema_url, session=async_get_clientsession(hass))
 
@@ -71,12 +61,9 @@ async def timer_update(self, now: datetime):
 
         await self.get_library_updates(now)
 
-        if DOMAIN_CONFIG not in self.hass.data[DOMAIN]:
-            return
-
-        domain_config: dict = self.hass.data[DOMAIN][DOMAIN_CONFIG]
+        domain_config = self.hass.data[MY_KEY]
 
-        if domain_config.get(CONF_ENABLE_AUTODISCOVERY):
+        if domain_config.enable_autodiscovery:
             discovery_manager = DiscoveryManager(self.hass, domain_config)
             await discovery_manager.start_discovery()
         else:

custom_components/battery_notes/sensor.py

@@ -53,7 +53,6 @@
     CoordinatorEntity,
 )
 
-from . import MY_KEY, BatteryNotesConfigEntry
 from .common import validate_is_float
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
@@ -72,9 +71,10 @@
     CONF_SOURCE_ENTITY_ID,
     DOMAIN,
     LAST_REPLACED,
+    MY_KEY,
     PLATFORMS,
 )
-from .coordinator import BatteryNotesCoordinator
+from .coordinator import BatteryNotesConfigEntry, BatteryNotesCoordinator
 from .entity import (
     BatteryNotesEntityDescription,
 )

custom_components/battery_notes/services.py

@@ -13,7 +13,6 @@
 from homeassistant.helpers import entity_registry as er
 from homeassistant.util import dt as dt_util
 
-from . import BatteryNotesConfigEntry
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LAST_REPORTED,
@@ -42,6 +41,7 @@
     SERVICE_DATA_DATE_TIME_REPLACED,
     SERVICE_DATA_DAYS_LAST_REPORTED,
 )
+from .coordinator import BatteryNotesConfigEntry
 
 _LOGGER = logging.getLogger(__name__)