Optimize - remove storing of version

Author: bouwew

custom_components/plugwise/__init__.py

@@ -15,18 +15,16 @@
     callback,
 )
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from packaging import version
 
 from .const import (
     CONF_REFRESH_INTERVAL,  # pw-beta options
-    CONF_VERSION,
-    DEFAULT_TIMEOUT,
     DOMAIN,
     LOGGER,
     PLATFORMS,
     SERVICE_DELETE,  # pw-beta delete_notifications
 )
 from .coordinator import PlugwiseDataUpdateCoordinator
+from .util import get_timeout_for_version
 
 type PlugwiseConfigEntry = ConfigEntry[PlugwiseDataUpdateCoordinator]
 
@@ -159,13 +157,7 @@ async def async_migrate_plugwise_entry(
 
     if entry.version == 1 and entry.minor_version < 2:
         new_data = {**entry.data}
-        new_data[CONF_VERSION] = coordinator.api.smile_version
-        timeout = DEFAULT_TIMEOUT
-        if version.parse(new_data[CONF_VERSION]) >= version.parse("3.2.0"):
-            timeout = 10
-
-        new_data[CONF_TIMEOUT] = timeout
-
+        new_data[CONF_TIMEOUT] = get_timeout_for_version(coordinator.api.smile_version)
         LOGGER.debug(
             "Migration to version %s.%s successful",
             entry.version,

custom_components/plugwise/config_flow.py

@@ -43,13 +43,11 @@
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from packaging import version
 
 from .const import (
     ANNA_WITH_ADAM,
     CONF_HOMEKIT_EMULATION,  # pw-beta option
     CONF_REFRESH_INTERVAL,  # pw-beta option
-    CONF_VERSION,
     CONTEXT,
     DEFAULT_PORT,
     DEFAULT_SCAN_INTERVAL,  # pw-beta option
@@ -74,6 +72,7 @@
 
 # Upstream
 from .coordinator import PlugwiseDataUpdateCoordinator
+from .util import get_timeout_for_version
 
 type PlugwiseConfigEntry = ConfigEntry[PlugwiseDataUpdateCoordinator]
 
@@ -110,13 +109,6 @@ def _base_schema(
     return vol.Schema({vol.Required(CONF_PASSWORD): str})
 
 
-def get_timeout_for_version(version_str: str) -> int:
-    """Determine timeout value based on gateway version."""
-    if version.parse(version_str) >= version.parse("3.2.0"):
-        return 10
-    return DEFAULT_TIMEOUT
-
-
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> Smile:
     """Validate whether the user input allows us to connect to the gateway.
 
@@ -217,7 +209,6 @@ async def async_step_zeroconf(
                     CONF_PORT: discovery_info.port,
                     CONF_TIMEOUT: self._timeout,
                     CONF_USERNAME: self._username,
-                    CONF_VERSION: _version,
                 },
                 ATTR_CONFIGURATION_URL: (
                     f"http://{discovery_info.host}:{discovery_info.port}"
@@ -268,8 +259,6 @@ async def async_step_user(
                 errors=errors,
             )
 
-        user_input[CONF_VERSION] = api.smile_version
-
         await self.async_set_unique_id(
             api.smile_hostname or api.gateway_id, raise_on_progress=False
         )

custom_components/plugwise/util.py

@@ -3,12 +3,14 @@
 from __future__ import annotations
 
 from collections.abc import Awaitable, Callable, Coroutine
+from packaging import version
 from typing import Any, Concatenate
 
 from plugwise.exceptions import PlugwiseException
 
 from homeassistant.exceptions import HomeAssistantError
 
+from .const import DEFAULT_TIMEOUT
 from .entity import PlugwiseEntity
 
 # For reference:
@@ -17,6 +19,13 @@
 # _P = ParamSpec("_P")
 
 
+def get_timeout_for_version(version_str: str) -> int:
+    """Determine timeout value based on gateway version."""
+    if version.parse(version_str) >= version.parse("3.2.0"):
+        return 10
+    return DEFAULT_TIMEOUT
+
+
 def plugwise_command[_PlugwiseEntityT: PlugwiseEntity, **_P, _R](
     func: Callable[Concatenate[_PlugwiseEntityT, _P], Awaitable[_R]],
 ) -> Callable[Concatenate[_PlugwiseEntityT, _P], Coroutine[Any, Any, _R]]:

tests/components/plugwise/conftest.py

@@ -9,7 +9,7 @@
 from plugwise import PlugwiseData
 import pytest
 
-from homeassistant.components.plugwise.const import CONF_VERSION, DOMAIN
+from homeassistant.components.plugwise.const import DOMAIN
 from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
@@ -42,7 +42,6 @@ def mock_config_entry() -> MockConfigEntry:
             CONF_PORT: 80,
             CONF_TIMEOUT: 30,
             CONF_USERNAME: "smile",
-            CONF_VERSION: "4.3.2"
         },
         minor_version=2,
         version=1,

tests/components/plugwise/snapshots/test_init.ambr

@@ -8,7 +8,6 @@
       'port': 80,
       'timeout': 10,
       'username': 'smile',
-      'version': '4.0.15',
     }),
     'disabled_by': None,
     'domain': 'plugwise',

tests/components/plugwise/test_config_flow.py

@@ -16,7 +16,6 @@
 from homeassistant.components.plugwise.const import (
     CONF_HOMEKIT_EMULATION,
     CONF_REFRESH_INTERVAL,
-    CONF_VERSION,
     DEFAULT_PORT,
     DOMAIN,
 )
@@ -46,9 +45,6 @@
 TEST_TIMEOUT = 10
 TEST_USERNAME = "smile"
 TEST_USERNAME2 = "stretch"
-TEST_VERSION = "4.3.2"
-TEST_VERSION_LEGACY = "2.1.0"
-
 TEST_DISCOVERY = zeroconf.ZeroconfServiceInfo(
     ip_address=TEST_HOST,
     ip_addresses=[TEST_HOST],
@@ -150,7 +146,6 @@ async def test_form(
         CONF_PORT: DEFAULT_PORT,
         CONF_USERNAME: TEST_USERNAME,
         CONF_TIMEOUT: TEST_TIMEOUT_LEGACY,
-        CONF_VERSION: TEST_VERSION,
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
@@ -197,7 +192,6 @@ async def test_zeroconf_form(
         CONF_PORT: DEFAULT_PORT,
         CONF_USERNAME: username,
         CONF_TIMEOUT: timeout,
-        CONF_VERSION: TEST_VERSION,
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
@@ -234,7 +228,6 @@ async def test_zeroconf_stretch_form(
         CONF_PORT: DEFAULT_PORT,
         CONF_USERNAME: TEST_USERNAME2,
         CONF_TIMEOUT: TEST_TIMEOUT_LEGACY,
-        CONF_VERSION: TEST_VERSION,
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
@@ -397,7 +390,6 @@ async def test_flow_errors(
         CONF_PORT: DEFAULT_PORT,
         CONF_USERNAME: TEST_USERNAME,
         CONF_TIMEOUT: TEST_TIMEOUT_LEGACY,
-        CONF_VERSION: TEST_VERSION,
     }
 
     assert len(mock_setup_entry.mock_calls) == 1
@@ -440,7 +432,6 @@ async def test_options_flow_thermo(
             CONF_HOST: TEST_HOST,
             CONF_PASSWORD: TEST_PASSWORD,
             CONF_TIMEOUT: TEST_TIMEOUT,
-            CONF_VERSION: TEST_VERSION,
         },
         minor_version=2,
         options={

tests/components/plugwise/test_init.py

@@ -14,7 +14,7 @@
 import pytest
 
 from freezegun.api import FrozenDateTimeFactory
-from homeassistant.components.plugwise.const import CONF_VERSION, DOMAIN
+from homeassistant.components.plugwise.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.const import (
     CONF_HOST,
@@ -251,7 +251,6 @@ async def test_entry_migration(
             CONF_PASSWORD: "test-password",
             CONF_PORT: 80,
             CONF_USERNAME: "smile",
-            CONF_VERSION: "4.3.2",
         },
         minor_version=1,
         version=1,