Copy updates from fixtures_local branch

Author: bouwew

plugwise/smile.py

@@ -1,21 +1,11 @@
 """Plugwise Home Assistant module."""
-
 import asyncio
 import datetime as dt
 import logging
 
 import aiohttp
 import async_timeout
-from dateutil.parser import parse
-from defusedxml import ElementTree as etree
-
-# Time related
-import pytz
-
-# Version detection
-import semver
-
-from plugwise.constants import (
+from .constants import (
     APPLIANCES,
     ATTR_NAME,
     ATTR_TYPE,
@@ -31,13 +21,16 @@
     LOCATIONS,
     MODULES,
     NOTIFICATIONS,
+    POWER_WATT,
     RULES,
     SMILES,
     STATUS,
     SWITCH_GROUP_TYPES,
     SYSTEM,
 )
-from plugwise.exceptions import (
+from dateutil.parser import parse
+from defusedxml import ElementTree as etree
+from .exceptions import (
     ConnectionFailedError,
     DeviceSetupError,
     DeviceTimeoutError,
@@ -47,7 +40,13 @@
     UnsupportedDeviceError,
     XMLDataMissingError,
 )
-from plugwise.util import (
+
+# Time related
+import pytz
+
+# Version detection
+import semver
+from .util import (
     determine_selected,
     escape_illegal_xml_characters,
     format_measure,
@@ -87,8 +86,6 @@ async def _create_session() -> aiohttp.ClientSession:
             self.websession = websession
 
         self._auth = aiohttp.BasicAuth(username, password=password)
-        # Work-around for Stretchv2-aiohttp-deflate-error, can be removed for aiohttp v3.7
-        self._headers = {"Accept-Encoding": "gzip"}
 
         self._timeout = timeout
         self._endpoint = f"http://{host}:{str(port)}"
@@ -232,10 +229,7 @@ async def request(
         try:
             with async_timeout.timeout(self._timeout):
                 if method == "get":
-                    # Work-around, see above, can be removed for aiohttp v3.7:
-                    resp = await self.websession.get(
-                        url, auth=self._auth, headers=self._headers
-                    )
+                    resp = await self.websession.get(url, auth=self._auth)
                 if method == "put":
                     resp = await self.websession.put(
                         url, data=data, headers=headers, auth=self._auth
@@ -905,25 +899,31 @@ def get_power_data_from_location(self, loc_id):
                     key_string = f"{measurement}_{peak}_{log_found}"
                     net_string = f"net_electricity_{log_found}"
                     val = loc_logs.find(locator).text
+                    if attrs[ATTR_UNIT_OF_MEASUREMENT] == POWER_WATT:
+                        f_val = int(round(float(val)))
+                    else:
+                        f_val = format_measure(val, attrs[ATTR_UNIT_OF_MEASUREMENT])
                     if all(
                         item in key_string for item in ["electricity", "cumulative"]
                     ):
                         f_val = format_measure(val, ENERGY_KILO_WATT_HOUR)
-                    else:
-                        f_val = format_measure(val, attrs[ATTR_UNIT_OF_MEASUREMENT])
-                    if "gas" in measurement:
-                        key_string = f"{measurement}_{log_found}"
-                        f_val = float(f"{round(float(val), 3):.3f}")
-
                     # Energy differential
                     if "electricity" in measurement:
-                        f_val = float(f"{round(float(val), 1):.1f}")
                         diff = 1
                         if "produced" in measurement:
                             diff = -1
                         if net_string not in direct_data:
-                            direct_data[net_string] = float()
-                        direct_data[net_string] += float(f_val * diff)
+                            direct_data[net_string] = 0
+                        if f_val != 0:
+                            if isinstance(f_val, int):
+                                direct_data[net_string] += int(
+                                    round(float(f_val * diff))
+                                )
+                            else:
+                                direct_data[net_string] += float(f_val * diff)
+
+                    if "gas" in measurement:
+                        key_string = f"{measurement}_{log_found}"
 
                     direct_data[key_string] = f_val
 

tests/test_smile.py

@@ -330,27 +330,7 @@ async def device_test(self, smile=Smile, testdata=None):
                                 measure_key, measure_assert
                             ),
                         )
-                        if isinstance(data[measure_key], float):
-                            if all(
-                                item in measure_key
-                                for item in ["electricity", "cumulative"]
-                            ):
-                                measure = float(
-                                    "{:.1f}".format(
-                                        round(float(data[measure_key]) / 1000, 1)
-                                    )
-                                )
-                            elif float(data[measure_key]) < 10:
-                                measure = float(
-                                    "{:.2f}".format(round(float(data[measure_key]), 2))
-                                )
-                            else:
-                                measure = float(
-                                    "{:.1f}".format(round(float(data[measure_key]), 1))
-                                )
-                            assert measure == measure_assert
-                        else:
-                            assert data[measure_key] == measure_assert
+                        assert data[measure_key] == measure_assert
 
     @pytest.mark.asyncio
     async def tinker_relay(self, smile, dev_ids=None, members=None, unhappy=False):
@@ -571,9 +551,9 @@ async def test_connect_smile_p1_v2(self):
             "938696c4bcdb4b8a9a595cb38ed43913": {
                 "electricity_consumed_peak_point": 458.0,
                 "net_electricity_point": 458.0,
-                "gas_consumed_cumulative": 584.4,
-                "electricity_produced_peak_cumulative": 1296.1,
-                "electricity_produced_off_peak_cumulative": 482.6,
+                "gas_consumed_cumulative": 584.433,
+                "electricity_produced_peak_cumulative": 1296.136,
+                "electricity_produced_off_peak_cumulative": 482.598,
             }
         }
 
@@ -608,7 +588,7 @@ async def test_connect_smile_p1_v2_2(self):
             "199aa40f126840f392983d171374ab0b": {
                 "electricity_consumed_peak_point": 368.0,
                 "net_electricity_point": 368.0,
-                "gas_consumed_cumulative": 2638.0,
+                "gas_consumed_cumulative": 2637.993,
                 "electricity_produced_peak_cumulative": 0.0,
             }
         }
@@ -1146,7 +1126,7 @@ async def test_connect_p1v3(self):
             "ba4de7613517478da82dd9b6abea36af": {
                 "electricity_consumed_peak_point": 650.0,
                 "electricity_produced_peak_cumulative": 0.0,
-                "electricity_consumed_off_peak_cumulative": 10263.2,
+                "electricity_consumed_off_peak_cumulative": 10263.159,
             }
         }
 
@@ -1178,7 +1158,7 @@ async def test_connect_p1v3solarfake(self):
             "ba4de7613517478da82dd9b6abea36af": {
                 "electricity_consumed_peak_point": 644.0,
                 "electricity_produced_peak_cumulative": 20.0,
-                "electricity_consumed_off_peak_cumulative": 10263.2,
+                "electricity_consumed_off_peak_cumulative": 10263.159,
                 "net_electricity_point": 244,
             }
         }
@@ -1211,11 +1191,11 @@ async def test_connect_p1v3_full_option(self):
             # Gateway / P1 itself
             "e950c7d5e1ee407a858e2a8b5016c8b3": {
                 "electricity_consumed_peak_point": 0.0,
-                "electricity_produced_peak_cumulative": 396.6,
-                "electricity_consumed_off_peak_cumulative": 551.1,
-                "electricity_produced_peak_point": 2761.0,
-                "net_electricity_point": -2761.0,
-                "gas_consumed_cumulative": 584.9,
+                "electricity_produced_peak_cumulative": 396.559,
+                "electricity_consumed_off_peak_cumulative": 551.09,
+                "electricity_produced_peak_point": 2761,
+                "net_electricity_point": -2761,
+                "gas_consumed_cumulative": 584.85,
             }
         }
 
@@ -1432,4 +1412,4 @@ class ConnectError(PlugwiseTestError):
         """Raised when connectivity test fails."""
 
     class UnexpectedError(PlugwiseTestError):
-        """Raised when something went against logic."""
+        """Raised when something went against logic."""