python-izone 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

pizone/controller.py

@@ -122,7 +122,7 @@ class Controller:
         """Load system, zone, and optional power data from the device.
 
         Raises:
-            ConnectionError: If any initial HTTP request fails.
+            ConnectionError: If a required HTTP request fails.
             KeyError: If a required field is missing from a device response.
         """
         await self._refresh_system(notify=False)
@@ -131,24 +131,58 @@ class Controller:
             str(self._system_settings.get("FanAuto", "disabled"))
         ]
 
+        await self._probe_v2_api()
+
         zone_count = int(self._system_settings["NoOfZones"])
         self.zones = [Zone(self, i) for i in range(zone_count)]
 
-        if self._is_ipower:
-            self._power = Power(self)
-            await asyncio.gather(
-                self._refresh_zones(notify=False),
-                self._power.init(),
-            )
-            if self._power.enabled:
-                await self._refresh_power(notify=False)
-        else:
-            self._power = None
-            await self._refresh_zones(notify=False)
+        await self._refresh_zones(notify=False)
+
+        await self._probe_power()
 
         self._initialized = True
         self._discovery_service.create_task(self._poll_loop())
 
+    async def _probe_v2_api(self) -> None:
+        """Detect V2 API support; non-fatal on failure."""
+        try:
+            response = await self._send_command_async(
+                "iZoneRequestV2",
+                {"iZoneV2Request": {"Type": 1, "No": 0, "No1": 0}},
+                mark_disconnected=False,
+            )
+            data = json.loads(response)
+            uid = data["AirStreamDeviceUId"]
+            self._is_v2 = uid == self._device_uid and "SystemV2" in data
+        except (ConnectionError, ControllerCommandError, json.JSONDecodeError, KeyError):
+            self._is_v2 = False
+
+    async def _probe_power(self) -> None:
+        """Probe power monitor endpoint when discovery hinted iPower; non-fatal."""
+        if not self._is_ipower:
+            self._power = None
+            return
+
+        try:
+            power = Power(self)
+            await power.init(mark_disconnected=False)
+            if power.enabled:
+                self._power = power
+                return
+            _LOG.warning(
+                "Power monitor disabled on uid=%s; skipping power support",
+                self._device_uid,
+            )
+        except (ConnectionError, ControllerCommandError, json.JSONDecodeError, KeyError):
+            _LOG.warning(
+                "Power monitor probe failed for uid=%s",
+                self._device_uid,
+                exc_info=True,
+            )
+
+        self._is_ipower = False
+        self._power = None
+
     async def _poll_loop(self) -> None:
         while True:
             try:
@@ -206,6 +240,11 @@ class Controller:
         """Return whether this is a v2 controller."""
         return self._is_v2
 
+    @property
+    def is_ipower(self) -> bool:
+        """Return whether power monitoring is available."""
+        return self._is_ipower
+
     @property
     def discovery(self) -> DiscoveryService:
         """Discovery service for this controller."""
@@ -630,10 +669,14 @@ class Controller:
             raise ConnectionError("Unable to connect to the controller") from ex
 
     async def _send_command_async(
-        self, command: str, data: dict[str, Any]
+        self, command: str, data: dict[str, Any], *, mark_disconnected: bool = True
     ) -> str:
         """Send a command to the device via HTTP POST.
 
+        Args:
+            mark_disconnected: When ``False``, transport failures do not mark
+                the controller disconnected.
+
         Raises:
             ConnectionError: If the device cannot be reached or the HTTP request fails.
             ControllerCommandError: If the device returns HTTP 4xx or an
@@ -665,7 +708,8 @@ class Controller:
                     )
                 result = await response.text(encoding="latin_1")
         except (asyncio.TimeoutError, aiohttp.ClientError) as ex:
-            self._failed_connection(ex)
+            if mark_disconnected:
+                self._failed_connection(ex)
             raise ConnectionError("Unable to connect to controller") from ex
 
         if len(result) >= 7 and result[:6] == "{ERROR":

pizone/power.py

@@ -191,15 +191,21 @@ class Power:
         self._devices = tuple(PowerDevice(self, i) for i in range(5))
         self._groups: tuple[PowerGroup, ...] | None = None
 
-    async def init(self) -> None:
+    async def init(self, *, mark_disconnected: bool = True) -> None:
         """Load power monitor configuration from the device.
 
+        Args:
+            mark_disconnected: When ``False``, connection failures during this
+                request do not mark the controller disconnected.
+
         Raises:
             ConnectionError: If the HTTP request fails.
             json.JSONDecodeError: If the device response is not valid JSON.
             KeyError: If the response is missing required fields.
         """
-        self._config = await self._do_request(1, "PowerMonitorConfig")
+        self._config = await self._do_request(
+            1, "PowerMonitorConfig", mark_disconnected=mark_disconnected
+        )
         gdict: dict[int, list[PowerChannel]] = {}
         for dev in self.devices:
             for chan in dev.channels:
@@ -226,9 +232,15 @@ class Power:
         self._status = status
         return True
 
-    async def _do_request(self, req_type: int, result: str) -> dict[str, Any]:
+    async def _do_request(
+        self, req_type: int, result: str, *, mark_disconnected: bool = True
+    ) -> dict[str, Any]:
         """Send a power monitor request to the device.
 
+        Args:
+            mark_disconnected: When ``False``, connection failures do not mark
+                the controller disconnected.
+
         Raises:
             ConnectionError: If the HTTP request fails.
             json.JSONDecodeError: If the device response is not valid JSON.
@@ -236,7 +248,9 @@ class Power:
         """
         # pylint: disable=protected-access
         datas = await self._controller._send_command_async(
-            "PowerRequest", {"PowerRequest": {"Type": req_type, "No": 0, "No1": 0}}
+            "PowerRequest",
+            {"PowerRequest": {"Type": req_type, "No": 0, "No1": 0}},
+            mark_disconnected=mark_disconnected,
         )
         data = json.loads(datas)
         return cast(dict[str, Any], data[result])

pizone/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.3.1'
-__version_tuple__ = version_tuple = (1, 3, 1)
+__version__ = version = '1.3.2'
+__version_tuple__ = version_tuple = (1, 3, 2)
 
 __commit_id__ = commit_id = None

{python_izone-1.3.1.dist-info → python_izone-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-izone
-Version: 1.3.1
+Version: 1.3.2
 Summary: A python interface to the iZone airconditioner controller
 Project-URL: Homepage, https://github.com/Swamp-Ig/pizone
 Author-email: Penny Wood <pypl@ninjateaparty.com>

python_izone-1.3.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+pizone/__init__.py,sha256=xRQgtXzCtsGhJDBOzDxV105Trv2NCFe8Em6fZEqZ4bc,997
+pizone/controller.py,sha256=hO2B7sIZt8Djt_Nq0_ov7ocNxBy9Nk_DtkcEmixFt2s,26114
+pizone/discovery.py,sha256=tvZs5npvL2y41vyYxn5V6EDCI9v27_Z-vy_ezSN-RA4,18133
+pizone/exceptions.py,sha256=mWsvXzBNh6mKOPs0QFLqgO6ipa6Se6PEGhFTwr9_ehA,362
+pizone/power.py,sha256=4kWS_XilZki7dLzlJ0cKYoz8s6pS76bAtrHhUXTZ_eg,9039
+pizone/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pizone/version.py,sha256=3UteJz_pk76FGRZGb0537LBHxRlaYKkTw4QYKVpfrjs,520
+pizone/zone.py,sha256=rDv-Q9k9HGIzK3arBxpKoAa-xRGETQkgBOTulMdOhqc,7163
+python_izone-1.3.2.dist-info/METADATA,sha256=pEMLJ6CTDnghdy4FJ8wIducmpD-ZxAnVPv26t347FuQ,2657
+python_izone-1.3.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+python_izone-1.3.2.dist-info/licenses/licence.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_izone-1.3.2.dist-info/RECORD,,

python_izone-1.3.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-pizone/__init__.py,sha256=xRQgtXzCtsGhJDBOzDxV105Trv2NCFe8Em6fZEqZ4bc,997
-pizone/controller.py,sha256=mR7-tJkdkXx-s7M32ZWpOUED8Gw_7NPTkUnLjnPhB2Q,24568
-pizone/discovery.py,sha256=tvZs5npvL2y41vyYxn5V6EDCI9v27_Z-vy_ezSN-RA4,18133
-pizone/exceptions.py,sha256=mWsvXzBNh6mKOPs0QFLqgO6ipa6Se6PEGhFTwr9_ehA,362
-pizone/power.py,sha256=Rp5ZoT-L8YR0mraF8YNaUqfgZTvgSZSNuBT0U5Nzt70,8536
-pizone/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pizone/version.py,sha256=x_Vew2VGpHa9c663j9Zg8FzEkVKHvv3k0XiN4-Ja9uw,520
-pizone/zone.py,sha256=rDv-Q9k9HGIzK3arBxpKoAa-xRGETQkgBOTulMdOhqc,7163
-python_izone-1.3.1.dist-info/METADATA,sha256=oN4I7S2YE8C3PtBfakmqkdr6rYs-tZsENG_M4WNM1a0,2657
-python_izone-1.3.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_izone-1.3.1.dist-info/licenses/licence.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_izone-1.3.1.dist-info/RECORD,,