Rework and bump version

Author: CoMPaTech

airos/airos8.py

@@ -9,6 +9,7 @@
 from urllib.parse import urlparse
 
 import aiohttp
+from aiohttp.client_exceptions import ClientConnectorError
 from mashumaro.exceptions import InvalidFieldValue, MissingField
 
 from .data import AirOS8Data as AirOSData, redact_data_smart
@@ -186,12 +187,16 @@ async def login(self) -> bool:
                     log = f"Login failed with status {response.status}. Full Response: {response.text}"
                     _LOGGER.error(log)
                     raise AirOSConnectionAuthenticationError from None
-        except (TimeoutError, aiohttp.ClientError) as err:
-            _LOGGER.exception("Error during login")
-            raise AirOSDeviceConnectionError from err
+
         except asyncio.CancelledError:
             _LOGGER.info("Login task was cancelled")
             raise
+        except (TimeoutError, ClientConnectorError) as err:
+            _LOGGER.exception("Error during login")
+            raise AirOSDeviceConnectionError from err
+        except aiohttp.ClientError as err:
+            _LOGGER.exception("Unexpected client error during login")
+            raise AirOSDeviceConnectionError from err
 
     def derived_data(
         self, response: dict[str, Any] | None = None
@@ -302,12 +307,15 @@ async def status(self) -> AirOSData:
                         response_text,
                     )
                     raise AirOSDeviceConnectionError
-        except (TimeoutError, aiohttp.ClientError) as err:
-            _LOGGER.exception("Status API call failed: %s", err)
-            raise AirOSDeviceConnectionError from err
         except asyncio.CancelledError:
             _LOGGER.info("API status retrieval task was cancelled")
             raise
+        except (TimeoutError, ClientConnectorError) as err:
+            _LOGGER.exception("Status API call failed: %s", err)
+            raise AirOSDeviceConnectionError from err
+        except aiohttp.ClientError as err:
+            _LOGGER.exception("Unexpected client error during status API call")
+            raise AirOSDeviceConnectionError from err
 
     async def stakick(self, mac_address: str = None) -> bool:
         """Reconnect client station."""
@@ -340,12 +348,16 @@ async def stakick(self, mac_address: str = None) -> bool:
                 log = f"Unable to restart connection response status {response.status} with {response_text}"
                 _LOGGER.error(log)
                 return False
-        except (TimeoutError, aiohttp.ClientError) as err:
-            _LOGGER.exception("Error during call to reconnect remote: %s", err)
-            raise AirOSDeviceConnectionError from err
+
         except asyncio.CancelledError:
             _LOGGER.info("Reconnect task was cancelled")
             raise
+        except (TimeoutError, ClientConnectorError) as err:
+            _LOGGER.exception("Error during call to reconnect remote: %s", err)
+            raise AirOSDeviceConnectionError from err
+        except aiohttp.ClientError as err:
+            _LOGGER.exception("Unexpected client error reconnect request")
+            raise AirOSDeviceConnectionError from err
 
     async def provmode(self, active: bool = False) -> bool:
         """Set provisioning mode."""
@@ -379,9 +391,13 @@ async def provmode(self, active: bool = False) -> bool:
                 log = f"Unable to change provisioning mode response status {response.status} with {response_text}"
                 _LOGGER.error(log)
                 return False
-        except (TimeoutError, aiohttp.ClientError) as err:
-            _LOGGER.exception("Error during call to change provisioning mode: %s", err)
-            raise AirOSDeviceConnectionError from err
+
         except asyncio.CancelledError:
             _LOGGER.info("Provisioning mode change task was cancelled")
             raise
+        except (TimeoutError, ClientConnectorError) as err:
+            _LOGGER.exception("Error during call to change provisioning mode: %s", err)
+            raise AirOSDeviceConnectionError from err
+        except aiohttp.ClientError as err:
+            _LOGGER.exception("Unexpected client error changing provisioning mode")
+            raise AirOSDeviceConnectionError from err

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "airos"
-version         = "0.2.8a0"
+version         = "0.2.8a1"
 license         = "MIT"
 description     = "Ubiquity airOS module(s) for Python 3."
 readme          = "README.md"