New method fetch_metric_data() -> MetricData

README.md

@@ -83,7 +83,8 @@ from vallox_websocket_api import Vallox, PROFILE
 client = Vallox('192.168.1.10') # Vallox unit IP
 
 async def run():
-    await client.get_profile() # RETURNS a PROFILE.* value
+    data = await client.fetch_metric_data()
+    profile = data.profile # RETURNS a PROFILE.* value
     await client.set_profile(PROFILE.HOME) # Permanently HOME profile
     await client.set_profile(PROFILE.AWAY) # Permanently AWAY profile
     await client.set_profile(PROFILE.FIREPLACE) # FIREPLACE mode for configured timeout
@@ -103,15 +104,14 @@ Reading metrics and setting values
 ## Reading Metrics
 ```python
 import asyncio
-from vallox_websocket_api import Client
+from vallox_websocket_api import Vallox
+from pprint import pprint
 
-client = Client('192.168.1.2')
+client = Vallox('192.168.1.2')
 
 async def run():
-    metrics = await client.fetch_metrics()
-
-    from pprint import pprint
-    pprint(metrics)
+    data = await client.fetch_metric_data()
+    pprint(data)
 
 asyncio.run(run())
 ```
@@ -120,9 +120,9 @@ Or if you want just a subset of metrics:
 
 ```python
 import asyncio
-from vallox_websocket_api import Client
+from vallox_websocket_api import Vallox
 
-client = Client('192.168.1.2')
+client = Vallox('192.168.1.2')
 async def run():
     metrics = await client.fetch_metrics([
       'A_CYC_TEMP_EXHAUST_AIR',
@@ -143,9 +143,9 @@ Device stores some historical data in its memory. Code to retrieve it:
 
 ```python
 import asyncio
-from vallox_websocket_api import Client
+from vallox_websocket_api import Vallox
 
-client = Client('192.168.1.2')
+client = Vallox('192.168.1.2')
 async def run():
     data = await client.fetch_raw_logs()
 
@@ -159,9 +159,9 @@ asyncio.run(run())
 Textual values will be converted to integers before sending to the unit.
 ```python
 import asyncio
-from vallox_websocket_api import Client
+from vallox_websocket_api import Vallox
 
-client = Client('192.168.9.106')
+client = Vallox('192.168.9.106')
 
 async def run():
     # Setting Home profile fan speed

tests/test_vallox_alarm.py

@@ -2,12 +2,7 @@
 
 import pytest
 
-from vallox_websocket_api.vallox import Alarm, Vallox
-
-
-@pytest.fixture
-def vallox():
-    return Vallox("127.0.0.1")
+from vallox_websocket_api.vallox import Alarm, MetricData
 
 
 @pytest.fixture
@@ -215,8 +210,9 @@ def metrics():
     }
 
 
-async def test_get_info(vallox: Vallox, metrics: dict):
-    alarms = vallox.get_alarms_from_metrics(metrics, skip_solved=False)
+async def test_get_info(metrics: dict):
+    data = MetricData(metrics)
+    alarms = data.get_alarms(skip_solved=False)
 
     assert len(alarms) == 1
 

tests/test_vallox_fan_speed.py

@@ -51,4 +51,4 @@ async def test_get_fan_speed_for_profile_home(vallox: Vallox):
     vallox.fetch_metrics.return_value = {"A_CYC_HOME_SPEED_SETTING": 19}
 
     assert await vallox.get_fan_speed(PROFILE.HOME) == 19
-    vallox.fetch_metrics.assert_called_once_with(["A_CYC_HOME_SPEED_SETTING"])
+    vallox.fetch_metrics.assert_called_once()

tests/test_vallox_next_filter_change.py

@@ -72,11 +72,4 @@ async def test_nextFilterChangeYesterday(vallox: Vallox):
 
 
 def assert_filter_metrics_called(vallox):
-    vallox.fetch_metrics.assert_called_once_with(
-        [
-            "A_CYC_FILTER_CHANGED_YEAR",
-            "A_CYC_FILTER_CHANGED_MONTH",
-            "A_CYC_FILTER_CHANGED_DAY",
-            "A_CYC_FILTER_CHANGE_INTERVAL",
-        ]
-    )
+    vallox.fetch_metrics.assert_called_once()

tests/test_vallox_profile.py

@@ -199,11 +199,4 @@ async def test_get_profile_extra(vallox: Vallox):
 
 
 def _assert_profile_metrics_fetched(vallox):
-    vallox.fetch_metrics.assert_called_once_with(
-        [
-            "A_CYC_STATE",
-            "A_CYC_BOOST_TIMER",
-            "A_CYC_FIREPLACE_TIMER",
-            "A_CYC_EXTRA_TIMER",
-        ]
-    )
+    vallox.fetch_metrics.assert_called_once()

tests/test_vallox_temperatures.py

@@ -33,9 +33,7 @@ async def test_vallox_get_temperature(vallox):
     )
 
     assert await vallox.get_temperature(PROFILE.HOME) == 19
-    vallox.fetch_metrics.assert_called_once_with(
-        list({"A_CYC_HOME_AIR_TEMP_TARGET": 19}.keys())
-    )
+    vallox.fetch_metrics.assert_called_once()
 
 
 async def test_vallox_fetch_metric(vallox, ws):