Merge pull request #23 from CoMPaTech/testing

Bump json to mashumaro

Author: CoMPaTech

README.md

@@ -22,6 +22,7 @@ async def test_airos():
     # Fetch status (large dict, including connected stations)
     result = await device.status()
     print(f"Result: {result}")
+    print(f"Result: {result.wireless.mode}")
     # Reconnect 'other side'
     result = await device.stakick("01:23:45:67:89:AB")
     print(f"Result: {result}")

airos/airos8.py

@@ -7,7 +7,9 @@
 from urllib.parse import urlparse
 
 import aiohttp
+from mashumaro.exceptions import InvalidFieldValue, MissingField
 
+from .airos8data import AirOSData
 from .exceptions import (
     ConnectionAuthenticationError,
     ConnectionSetupError,
@@ -185,7 +187,7 @@ async def login(self) -> bool:
             logger.exception("Error during login")
             raise DeviceConnectionError from err
 
-    async def status(self) -> dict:
+    async def status(self, return_json: bool = False) -> dict | AirOSData:
         """Retrieve status from the device."""
         if not self.connected:
             logger.error("Not connected, login first")
@@ -205,15 +207,22 @@ async def status(self) -> dict:
                     try:
                         response_text = await response.text()
                         response_json = json.loads(response_text)
-                        if (
-                            "host" not in response_json
-                            or "device_id" not in response_json["host"]
-                        ):
-                            logger.error(
-                                "Source data missing 'host' or 'device_id' keys"
-                            )
-                            raise KeyDataMissingError from None
-                        return response_json
+                        try:
+                            airos_data = AirOSData.from_dict(response_json)
+                        except (MissingField, InvalidFieldValue) as err:
+                            logger.exception("Failed to deserialize AirOS data")
+                            raise KeyDataMissingError from err
+
+                        # Show new enums detected
+                        if airos_data.warnings:
+                            for field_name, messages in airos_data.warnings.items():
+                                for msg in messages:
+                                    log = f"AirOS data warning for field '{field_name}': {msg}"
+                                    logger.warning(log)
+
+                        if return_json:
+                            return response_json
+                        return airos_data
                     except json.JSONDecodeError:
                         logger.exception(
                             "JSON Decode Error in authenticated status response"