Clean up

Author: bouwew

plugwise/common.py

@@ -171,7 +171,7 @@ def _power_data_energy_diff(
             diff = 1
             if "produced" in measurement:
                 diff = -1
-            if net_string not in direct_data["sensors"]:
+            if net_string not in data["sensors"]:
                 tmp_val: float | int = 0
             else:
                 tmp_val = data["sensors"][net_string]

plugwise/data.py

@@ -58,7 +58,7 @@ def _update_zones(self) -> None:
         Collect data for each zone/location and add to self.zones.
         """
         for location_id, zone in self.zones.items():
-            data = self._get_location_data(location_id)
+            data = self._get_zone_data(location_id)
             zone.update(data)
 
     def _update_gw_entities(self) -> None:
@@ -153,7 +153,7 @@ def _update_for_cooling(self, entity: GwEntityData) -> None:
             self._count += 2  # add 4, remove 2
 
 
-    def _get_location_data(self, loc_id: str) -> GwEntityData:
+    def _get_zone_data(self, loc_id: str) -> GwEntityData:
         """Helper-function for _all_entity_data() and async_update().
 
         Provide entity-data, based on Location ID (= loc_id).

plugwise/helper.py

@@ -261,7 +261,7 @@ def __init__(self) -> None:
         self.smile_type: str
         self.smile_zigbee_mac_address: str | None
         self.therms_with_offset_func: list[str] = []
-        self.zone_data: dict[str, GwEntityData] = {}
+        self.zones: dict[str, GwEntityData] = {}
         SmileCommon.__init__(self)
 
     def _all_appliances(self) -> None:
@@ -488,7 +488,7 @@ def _get_zone_data(self, loc_id: str) -> GwEntityData:
         Collect the location-data based on location id.
         """
         data: GwEntityData = {"sensors": {}}
-        zone = self.zone_data[loc_id]
+        zone = self.zones[loc_id]
         measurements = ZONE_MEASUREMENTS
         if (
             location := self._domain_objects.find(f'./location[@id="{loc_id}"]')
@@ -552,7 +552,7 @@ def _power_data_from_location(self, loc_id: str) -> GwEntityData:
 
         Collect the power-data based on Location ID, from LOCATIONS.
         """
-        direct_data: GwEntityData = {"sensors": {}}
+        data: GwEntityData = {"sensors": {}}
         loc = Munch()
         log_list: list[str] = ["point_log", "cumulative_log", "interval_log"]
         t_string = "tariff"
@@ -561,10 +561,10 @@ def _power_data_from_location(self, loc_id: str) -> GwEntityData:
         loc.logs = search.find(f'./location[@id="{loc_id}"]/logs')
         for loc.measurement, loc.attrs in P1_MEASUREMENTS.items():
             for loc.log_type in log_list:
-                self._collect_power_values(direct_data, loc, t_string)
+                self._collect_power_values(data, loc, t_string)
 
-        self._count += len(direct_data["sensors"])
-        return direct_data
+        self._count += len(data["sensors"])
+        return data
 
     def _appliance_measurements(
         self,
@@ -866,7 +866,7 @@ def _scan_thermostats(self) -> None:
 
         for loc_id, loc_data in list(self._thermo_locs.items()):
             if loc_data["primary_prio"] != 0:
-                self.zone_data[loc_id] = {
+                self.zones[loc_id] = {
                     "dev_class": "climate",
                     "name": loc_data["name"],
                     "thermostats": {"primary": loc_data["primary"], "secondary": loc_data["secondary"]}

plugwise/legacy/helper.py

@@ -316,7 +316,7 @@ def _power_data_from_modules(self) -> GwEntityData:
 
         Collect the power-data from MODULES (P1 legacy only).
         """
-        direct_data: GwEntityData = {"sensors": {}}
+        data: GwEntityData = {"sensors": {}}
         loc = Munch()
         mod_list: list[str] = ["interval_meter", "cumulative_meter", "point_meter"]
         t_string = "tariff_indicator"
@@ -327,10 +327,10 @@ 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(direct_data, loc, t_string, legacy=True)
+                    self._collect_power_values(data, loc, t_string, legacy=True)
 
-        self._count += len(direct_data["sensors"])
-        return direct_data
+        self._count += len(data["sensors"])
+        return data
 
     def _appliance_measurements(
         self,

plugwise/util.py

@@ -23,7 +23,7 @@
     UOM,
     BinarySensorType,
     GwEntityData,
-    ModelData,
+    ModuleData,
     SensorType,
     SpecialType,
     SwitchType,
@@ -179,7 +179,7 @@ def format_measure(measure: str, unit: str) -> float | int:
     return result
 
 
-def get_vendor_name(module: etree, model_data: ModelData) -> ModelData:
+def get_vendor_name(module: etree, model_data: ModuleData) -> ModuleData:
     """Helper-function for _get_model_data()."""
     if (vendor_name := module.find("vendor_name").text) is not None:
         model_data["vendor_name"] = vendor_name