Remove not used selfs, from functions, move above Class

Author: bouwew

plugwise/common.py

@@ -30,6 +30,86 @@
 from munch import Munch
 
 
+def collect_power_values(
+    data: GwEntityData, loc: Munch, tariff: str, legacy: bool = False
+) -> None:
+    """Something."""
+    for loc.peak_select in ("nl_peak", "nl_offpeak"):
+        loc.locator = (
+            f'./{loc.log_type}[type="{loc.measurement}"]/period/'
+            f'measurement[@{tariff}="{loc.peak_select}"]'
+        )
+        if legacy:
+            loc.locator = (
+                f"./{loc.meas_list[0]}_{loc.log_type}/measurement"
+                f'[@directionality="{loc.meas_list[1]}"][@{tariff}="{loc.peak_select}"]'
+            )
+
+        loc = power_data_peak_value(loc, legacy)
+        if not loc.found:
+            continue
+
+        data = power_data_energy_diff(loc.measurement, loc.net_string, loc.f_val, data)
+        key = cast(SensorType, loc.key_string)
+        data["sensors"][key] = loc.f_val
+
+
+def power_data_peak_value(loc: Munch, legacy: bool) -> Munch:
+    """Helper-function for _power_data_from_location() and _power_data_from_modules()."""
+    loc.found = True
+    if loc.logs.find(loc.locator) is None:
+        loc = check_alternative_location(loc, legacy)
+        if not loc.found:
+            return loc
+
+    if (peak := loc.peak_select.split("_")[1]) == "offpeak":
+        peak = "off_peak"
+    log_found = loc.log_type.split("_")[0]
+    loc.key_string = f"{loc.measurement}_{peak}_{log_found}"
+    if "gas" in loc.measurement or loc.log_type == "point_meter":
+        loc.key_string = f"{loc.measurement}_{log_found}"
+    # Only for P1 Actual -------------------#
+    if "phase" in loc.measurement:
+        loc.key_string = f"{loc.measurement}"
+    # --------------------------------------#
+    loc.net_string = f"net_electricity_{log_found}"
+    val = loc.logs.find(loc.locator).text
+    loc.f_val = power_data_local_format(loc.attrs, loc.key_string, val)
+
+    return loc
+
+
+def power_data_energy_diff(
+    measurement: str,
+    net_string: SensorType,
+    f_val: float | int,
+    data: GwEntityData,
+) -> GwEntityData:
+    """Calculate differential energy."""
+    if (
+        "electricity" in measurement
+        and "phase" not in measurement
+        and "interval" not in net_string
+    ):
+        diff = 1
+        if "produced" in measurement:
+            diff = -1
+        if net_string not in data["sensors"]:
+            tmp_val: float | int = 0
+        else:
+            tmp_val = data["sensors"][net_string]
+
+        if isinstance(f_val, int):
+            tmp_val += f_val * diff
+        else:
+            tmp_val += float(f_val * diff)
+            tmp_val = float(f"{round(tmp_val, 3):.3f}")
+
+        data["sensors"][net_string] = tmp_val
+
+    return data
+
+
 class SmileCommon:
     """The SmileCommon class."""
 
@@ -110,86 +190,6 @@ def _appl_thermostat_info(
 
         return appl
 
-    def _collect_power_values(
-        self, data: GwEntityData, loc: Munch, tariff: str, legacy: bool = False
-    ) -> None:
-        """Something."""
-        for loc.peak_select in ("nl_peak", "nl_offpeak"):
-            loc.locator = (
-                f'./{loc.log_type}[type="{loc.measurement}"]/period/'
-                f'measurement[@{tariff}="{loc.peak_select}"]'
-            )
-            if legacy:
-                loc.locator = (
-                    f"./{loc.meas_list[0]}_{loc.log_type}/measurement"
-                    f'[@directionality="{loc.meas_list[1]}"][@{tariff}="{loc.peak_select}"]'
-                )
-
-            loc = self._power_data_peak_value(loc, legacy)
-            if not loc.found:
-                continue
-
-            data = self._power_data_energy_diff(
-                loc.measurement, loc.net_string, loc.f_val, data
-            )
-            key = cast(SensorType, loc.key_string)
-            data["sensors"][key] = loc.f_val
-
-    def _power_data_peak_value(self, loc: Munch, legacy: bool) -> Munch:
-        """Helper-function for _power_data_from_location() and _power_data_from_modules()."""
-        loc.found = True
-        if loc.logs.find(loc.locator) is None:
-            loc = check_alternative_location(loc, legacy)
-            if not loc.found:
-                return loc
-
-        if (peak := loc.peak_select.split("_")[1]) == "offpeak":
-            peak = "off_peak"
-        log_found = loc.log_type.split("_")[0]
-        loc.key_string = f"{loc.measurement}_{peak}_{log_found}"
-        if "gas" in loc.measurement or loc.log_type == "point_meter":
-            loc.key_string = f"{loc.measurement}_{log_found}"
-        # Only for P1 Actual -------------------#
-        if "phase" in loc.measurement:
-            loc.key_string = f"{loc.measurement}"
-        # --------------------------------------#
-        loc.net_string = f"net_electricity_{log_found}"
-        val = loc.logs.find(loc.locator).text
-        loc.f_val = power_data_local_format(loc.attrs, loc.key_string, val)
-
-        return loc
-
-    def _power_data_energy_diff(
-        self,
-        measurement: str,
-        net_string: SensorType,
-        f_val: float | int,
-        data: GwEntityData,
-    ) -> GwEntityData:
-        """Calculate differential energy."""
-        if (
-            "electricity" in measurement
-            and "phase" not in measurement
-            and "interval" not in net_string
-        ):
-            diff = 1
-            if "produced" in measurement:
-                diff = -1
-            if net_string not in data["sensors"]:
-                tmp_val: float | int = 0
-            else:
-                tmp_val = data["sensors"][net_string]
-
-            if isinstance(f_val, int):
-                tmp_val += f_val * diff
-            else:
-                tmp_val += float(f_val * diff)
-                tmp_val = float(f"{round(tmp_val, 3):.3f}")
-
-            data["sensors"][net_string] = tmp_val
-
-        return data
-
     def _create_gw_entities(self, appl: Munch) -> None:
         """Helper-function for creating/updating gw_entities."""
         self.gw_entities[appl.entity_id] = {"dev_class": appl.pwclass}

plugwise/helper.py

@@ -8,7 +8,7 @@
 import datetime as dt
 from typing import cast
 
-from plugwise.common import SmileCommon
+from plugwise.common import SmileCommon, collect_power_values
 from plugwise.constants import (
     ACTIVE_ACTUATORS,
     ACTUATOR_CLASSES,
@@ -389,7 +389,7 @@ def _power_data_from_location(self) -> GwEntityData:
         loc.logs = self._home_location.find("./logs")
         for loc.measurement, loc.attrs in P1_MEASUREMENTS.items():
             for loc.log_type in log_list:
-                self._collect_power_values(data, loc, t_string)
+                collect_power_values(data, loc, t_string)
 
         self._count += len(data["sensors"])
         return data

plugwise/legacy/helper.py

@@ -7,7 +7,7 @@
 
 from typing import cast
 
-from plugwise.common import SmileCommon
+from plugwise.common import SmileCommon, collect_power_values
 from plugwise.constants import (
     ACTIVE_ACTUATORS,
     ACTUATOR_CLASSES,
@@ -308,7 +308,7 @@ def _power_data_from_modules(self) -> GwEntityData:
             loc.meas_list = loc.measurement.split("_")
             for loc.logs in mod_logs:
                 for loc.log_type in mod_list:
-                    self._collect_power_values(data, loc, t_string, legacy=True)
+                    collect_power_values(data, loc, t_string, legacy=True)
 
         self._count += len(data["sensors"])
         return data