Move typing into the called functions, import annotations

Author: bouwew

plugwise/helper.py

@@ -1,6 +1,8 @@
 """Use of this source code is governed by the MIT license found in the LICENSE file.
 Plugwise Smile protocol helpers.
 """
+from __future__ import annotations
+
 import asyncio
 import datetime as dt
 from typing import Any
@@ -750,7 +752,7 @@ def _appliance_measurements(self, appliance, data, measurements):
 
         return data
 
-    def _get_appliance_data(self, d_id):
+    def _get_appliance_data(self, d_id) -> dict[str, Any]:
         """Helper-function for smile.py: _get_device_data().
         Collect the appliance-data based on device id.
         Determined from APPLIANCES, for legacy from DOMAIN_OBJECTS.
@@ -989,7 +991,7 @@ def _power_data_peak_value(self, loc):
 
         return loc
 
-    def _power_data_from_location(self, loc_id):
+    def _power_data_from_location(self, loc_id) -> dict[str, Any] | None:
         """Helper-function for smile.py: _get_device_data().
         Collect the power-data based on Location ID.
         """

plugwise/smile.py

@@ -184,7 +184,7 @@ def _get_device_data(self, dev_id) -> dict[str, Any]:
         Provide device-data, based on Location ID (= dev_id), from APPLIANCES.
         """
         details: dict[str, Any] = self._devices.get(dev_id)
-        device_data: dict[str, Any] = self._get_appliance_data(dev_id)
+        device_data = self._get_appliance_data(dev_id)
 
         # Generic
         if details["class"] == "gateway" or dev_id == self.gateway_id:
@@ -198,9 +198,7 @@ def _get_device_data(self, dev_id) -> dict[str, Any]:
                     device_data["outdoor_temperature"] = outdoor_temperature
 
             # Get P1 data from LOCATIONS
-            power_data: dict[str, Any] | None = self._power_data_from_location(
-                details["location"]
-            )
+            power_data = self._power_data_from_location(details["location"])
             if power_data is not None:
                 device_data.update(power_data)