python-izone 1.3.3__py3-none-any.whl → 1.3.4__py3-none-any.whl

pizone/__init__.py

@@ -8,17 +8,24 @@ Synchronous property reads return cached device data and do not raise
 raise :exc:`ConnectionError` when the device cannot be reached. They raise
 :exc:`~pizone.exceptions.ControllerCommandError` when the device responds but
 rejects the request (``{ERROR...}`` body or HTTP 4xx).
+
+Layered connection state on :class:`~pizone.controller.Controller`:
+
+- :attr:`~pizone.controller.Controller.bridge_connected` — ASH bridge HTTP transport
+- :attr:`~pizone.controller.Controller.connected` — bridge plus valid iZone AC data
+- :attr:`~pizone.power.Power.connected` — power monitor I/O (when enabled)
 """
 
 from .controller import Controller
 from .discovery import DiscoveryService, Listener, discovery
-from .exceptions import ControllerCommandError
+from .exceptions import ControllerCommandError, ResponseDecodeError
 from .power import BatteryLevel, Power, PowerChannel, PowerDevice, PowerGroup
 from .zone import Zone
 
 __all__ = [
     "Controller",
     "ControllerCommandError",
+    "ResponseDecodeError",
     "Zone",
     "DiscoveryService",
     "Listener",

pizone/controller.py

@@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Any, cast
 
 import aiohttp
 
-from .exceptions import ControllerCommandError
+from .exceptions import ControllerCommandError, ResponseDecodeError
 from .power import Power
 from .zone import Zone
 
@@ -79,6 +79,27 @@ class Controller:
         "var-speed": [Fan.LOW, Fan.MED, Fan.HIGH, Fan.AUTO],
     }
 
+    _FAULT_STATE_VALUES = frozenset({"error"})
+    _SYSTEM_STATE_DEFAULTS: ControllerData = {
+        "SysOn": "off",
+        "SysMode": "cool",
+        "SysFan": "auto",
+        "SleepTimer": 0,
+        "FreeAir": "disabled",
+        "Supply": "0.0",
+        "Setpoint": "0.0",
+        "Temp": "0.0",
+        "EcoLock": "false",
+        "EcoMin": "15.0",
+        "EcoMax": "30.0",
+        "RAS": "zones",
+        "CtrlZone": 0,
+        "NoOfZones": 0,
+        "NoOfConst": 0,
+        "SysType": "0",
+        "FanAuto": "disabled",
+    }
+
     def __init__(
         self,
         discovery_service: DiscoveryService,
@@ -280,14 +301,13 @@ class Controller:
 
     @property
     def mode(self) -> Mode:
-        """System mode (cooling, heating, etc.).
-
-        Raises:
-            ValueError: If the cached mode is not a valid :class:`Mode` member.
-        """
+        """System mode (cooling, heating, etc.)."""
         if self.free_air:
             return self.Mode.FREE_AIR
-        return self.Mode(self._get_system_state("SysMode"))
+        try:
+            return self.Mode(self._get_system_state("SysMode"))
+        except ValueError:
+            return self.Mode.COOL
 
     async def set_mode(self, value: Mode) -> None:
         """Set the system mode (cooling, heating, etc.).
@@ -309,12 +329,11 @@ class Controller:
 
     @property
     def fan(self) -> Fan:
-        """The current fan level.
-
-        Raises:
-            ValueError: If the cached fan mode is not a valid :class:`Fan` member.
-        """
-        return self.Fan(self._get_system_state("SysFan"))
+        """The current fan level."""
+        try:
+            return self.Fan(self._get_system_state("SysFan"))
+        except ValueError:
+            return self.Fan.AUTO
 
     async def set_fan(self, value: Fan) -> None:
         """Set the fan level.
@@ -606,7 +625,13 @@ class Controller:
         )
 
     def _get_system_state(self, state: str) -> DictValue:
-        return self._system_settings[state]
+        default = self._SYSTEM_STATE_DEFAULTS.get(state, "")
+        value = self._system_settings.get(state)
+        if value is None:
+            return default
+        if state in ("SysFan", "RAS", "SysMode") and str(value) in self._FAULT_STATE_VALUES:
+            return default
+        return value
 
     async def _set_system_state(
         self,
@@ -691,8 +716,8 @@ class Controller:
         """Fetch a JSON resource via HTTP GET without updating connection state.
 
         Raises:
-            ConnectionError: If the device cannot be reached or the response
-                cannot be decoded.
+            ConnectionError: If the device cannot be reached.
+            ResponseDecodeError: If the response cannot be decoded as JSON.
             ControllerCommandError: If the device returns HTTP 4xx.
         """
         session = self._discovery_service.session
@@ -716,7 +741,7 @@ class Controller:
                 if text[-4:] == "{OK}":
                     return json.loads(text[:-4])
                 _LOG.error('Decode error for "%s"', text, exc_info=True)
-                raise ConnectionError(
+                raise ResponseDecodeError(
                     "Unable to decode response from the controller"
                 ) from ex
 
@@ -762,8 +787,8 @@ class Controller:
         """Fetch a JSON resource from the device via HTTP GET.
 
         Raises:
-            ConnectionError: If the device cannot be reached, the response
-                cannot be decoded, or the HTTP request fails.
+            ConnectionError: If the device cannot be reached or the HTTP request fails.
+            ResponseDecodeError: If the response cannot be decoded as JSON.
             ControllerCommandError: If the device returns HTTP 4xx.
         """
         try:
@@ -776,11 +801,11 @@ class Controller:
                 False, ConnectionError("Unable to connect to the controller")
             )
             raise ConnectionError("Unable to connect to the controller") from ex
+        except ResponseDecodeError:
+            self._set_bridge_ok(True)
+            raise
         except ConnectionError as ex:
-            if str(ex) == "Unable to decode response from the controller":
-                self._set_bridge_ok(True)
-            else:
-                self._set_bridge_ok(False, ex)
+            self._set_bridge_ok(False, ex)
             raise
         self._set_bridge_ok(True)
         return result

pizone/exceptions.py

@@ -8,3 +8,11 @@ class ControllerCommandError(Exception):
     device is reachable. Not used for transport failures (timeouts, connection
     refused, etc.) — those remain :exc:`ConnectionError`.
     """
+
+
+class ResponseDecodeError(ConnectionError):
+    """The bridge responded over HTTP but the body could not be decoded as JSON.
+
+    Raised when transport succeeds and the response is not a transport failure,
+    but JSON parsing fails (and the ``{OK}`` suffix workaround does not apply).
+    """

pizone/version.py

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

{python_izone-1.3.3.dist-info → python_izone-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-izone
-Version: 1.3.3
+Version: 1.3.4
 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.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+pizone/__init__.py,sha256=F1D0SKGns5TUvAH4iZOovrE4ZQH3GXHWW3bUPcovDrw,1365
+pizone/controller.py,sha256=K0cscWcwHe4OFaVI_F-wV9J-Da3QGNfCFDpKgdVFkCM,30012
+pizone/discovery.py,sha256=8sBl1QlMlkGs_gwt-neGouwpYahwrlkAH37KEw9SbH0,18135
+pizone/exceptions.py,sha256=8rqSGIrQV5KQeOx_Lc6Mh7FVAbSl4-Q6qyW-cwrqlZ0,658
+pizone/power.py,sha256=FsKS8LhyHS2cUDKnDX6Vc1bWhpXSZABIpPLNQERqlLk,9899
+pizone/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pizone/version.py,sha256=J1PLKOPRRvOkHG-jR78Tmen2I1NkbGLw4y0NdfCA_Ts,520
+pizone/zone.py,sha256=0rVYIiqGXUJeT3i_EBLPOTEsFIY6nNSheMuI7Up8GzU,7232
+python_izone-1.3.4.dist-info/METADATA,sha256=mOBTQOsYuJe2T_NaTDB_G-CrBofSrGJoqs9-3qyKFOI,2657
+python_izone-1.3.4.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+python_izone-1.3.4.dist-info/licenses/licence.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_izone-1.3.4.dist-info/RECORD,,

python_izone-1.3.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-pizone/__init__.py,sha256=xRQgtXzCtsGhJDBOzDxV105Trv2NCFe8Em6fZEqZ4bc,997
-pizone/controller.py,sha256=bQ74OOnvm_zD3l0t2HHxnC2vngmabscKWMjSUcp5Teg,29242
-pizone/discovery.py,sha256=8sBl1QlMlkGs_gwt-neGouwpYahwrlkAH37KEw9SbH0,18135
-pizone/exceptions.py,sha256=mWsvXzBNh6mKOPs0QFLqgO6ipa6Se6PEGhFTwr9_ehA,362
-pizone/power.py,sha256=FsKS8LhyHS2cUDKnDX6Vc1bWhpXSZABIpPLNQERqlLk,9899
-pizone/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pizone/version.py,sha256=WO3CO-96xugvoM5BpChi50zqqd0fgW_W282M3M9MvT4,520
-pizone/zone.py,sha256=0rVYIiqGXUJeT3i_EBLPOTEsFIY6nNSheMuI7Up8GzU,7232
-python_izone-1.3.3.dist-info/METADATA,sha256=n1Lm9EMNZfkWnQtG2OOAddebn3jwUMpWxPzAESiy-P8,2657
-python_izone-1.3.3.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_izone-1.3.3.dist-info/licenses/licence.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_izone-1.3.3.dist-info/RECORD,,