python-izone 1.3.5__py3-none-any.whl → 1.3.7__py3-none-any.whl

pizone/__init__.py

@@ -29,10 +29,14 @@ from types import ModuleType
 from typing import Any
 
 from . import power as power_mod
-from .const import PLACEHOLDER_DEVICE_UID
 from .controller import Controller
 from .discovery import DiscoveryService, Listener, create_discovery, discovery
-from .exceptions import ControllerCommandError, ResponseDecodeError, UnpairedBridgeError
+from .exceptions import (
+    ControllerAlreadyClaimedError,
+    ControllerCommandError,
+    ResponseDecodeError,
+    UnpairedBridgeError,
+)
 from .power import BatteryLevel, Power, PowerChannel, PowerDevice, PowerGroup
 from .types import ControllerEndpoint
 from .zone import Zone
@@ -60,9 +64,9 @@ sys.modules[__name__].__class__ = _PizoneModule
 
 __all__ = [
     "ENABLE_POWER",
-    "PLACEHOLDER_DEVICE_UID",
     "BatteryLevel",
     "Controller",
+    "ControllerAlreadyClaimedError",
     "ControllerCommandError",
     "ControllerEndpoint",
     "DiscoveryService",

pizone/discovery.py

@@ -24,7 +24,7 @@ import ifaddr
 
 from .const import PLACEHOLDER_DEVICE_UID
 from .controller import Controller
-from .exceptions import raise_if_placeholder_uid
+from .exceptions import ControllerAlreadyClaimedError, raise_if_placeholder_uid
 from .types import ControllerEndpoint
 from .zone import Zone
 
@@ -50,7 +50,7 @@ DISCOVERY_RESCAN = 20.0
 RESCAN_COOLDOWN = 5.0
 
 # disposition: 1.4 — active discover_by_uid / discover_all wait
-SCAN_TIMEOUT = 20.0
+SCAN_TIMEOUT = 5.0
 
 _LOG = logging.getLogger("pizone.discovery")
 
@@ -405,7 +405,9 @@ class DiscoveryService:
     def _ensure_endpoint_available(self, endpoint: ControllerEndpoint) -> None:
         """Raise if *endpoint* is already claimed."""
         if endpoint.uid in self._claimed_endpoints:
-            raise RuntimeError(f"Controller {endpoint.uid} already created")
+            raise ControllerAlreadyClaimedError(
+                f"Controller {endpoint.uid} already created"
+            )
 
     # disposition: 1.4
     def _claim_endpoint(self, endpoint: ControllerEndpoint) -> None:
@@ -451,7 +453,9 @@ class DiscoveryService:
         """
         claimed = self._endpoint_by_host(self._claimed_endpoints, host)
         if claimed is not None:
-            raise RuntimeError(f"Controller {claimed.uid} already created")
+            raise ControllerAlreadyClaimedError(
+                f"Controller {claimed.uid} already created"
+            )
         known = self._endpoint_by_host(self._known_endpoints, host)
         if known is not None:
             return known
@@ -476,7 +480,7 @@ class DiscoveryService:
         """
         raise_if_placeholder_uid(uid)
         if uid in self._claimed_endpoints:
-            raise RuntimeError(f"Controller {uid} already created")
+            raise ControllerAlreadyClaimedError(f"Controller {uid} already created")
         endpoint = self._known_endpoints.get(uid)
         if endpoint is not None:
             return endpoint
@@ -569,7 +573,7 @@ class DiscoveryService:
 
         Raises:
             UnpairedBridgeError: If *uid* is the unpaired placeholder (no I/O).
-            RuntimeError: If a controller with *uid* already exists.
+            ControllerAlreadyClaimedError: If a controller with *uid* already exists.
             ConnectionError: If the controller cannot be reached after
                 address fallback.
             ControllerCommandError: If the device rejects the protocol request.
@@ -579,7 +583,7 @@ class DiscoveryService:
         """
         raise_if_placeholder_uid(uid)
         if uid in self._claimed_endpoints:
-            raise RuntimeError(f"Controller {uid} already created")
+            raise ControllerAlreadyClaimedError(f"Controller {uid} already created")
         pending_address_changed: ControllerEndpoint | None = None
 
         try:
@@ -756,8 +760,13 @@ class DiscoveryService:
             return
         _LOG.info("Close called on discovery service.")
         self._close_task = current
-        if self._transport:
+        if self._transport is not None:
+            # DatagramTransport.close() only schedules sock release via
+            # call_soon(_call_connection_lost). Wait until connection_lost
+            # clears _transport so a following create_discovery can bind :7005.
             self._transport.close()
+            while self._transport is not None:
+                await asyncio.sleep(0)
 
         pending = [task for task in list(self._tasks) if task is not current]
         for task in pending:
@@ -773,6 +782,7 @@ class DiscoveryService:
 
     def _on_connection_lost(self, exc: Exception | None) -> None:
         _LOG.debug("Connection Lost")
+        self._transport = None
         if not self._close_task:
             _LOG.error("Connection Lost unexpectedly: %s", repr(exc))
             self.create_task(self.close())
@@ -1002,5 +1012,12 @@ async def create_discovery(
         on_endpoint_discovered=on_endpoint_discovered,
     )
     _active_discovery = service
-    await service.start_discovery()
+    try:
+        await service.start_discovery()
+    except BaseException:
+        # close() clears the global when it finishes; clear again if close never ran.
+        with suppress(BaseException):
+            await service.close()
+        _clear_discovery_global(service)
+        raise
     return service

pizone/exceptions.py

@@ -28,6 +28,14 @@ class UnpairedBridgeError(ValueError):
     """
 
 
+class ControllerAlreadyClaimedError(Exception):
+    """A controller UID or host is already claimed on this discovery service.
+
+    Raised when ``discover_by_host``, ``discover_by_uid``, or ``create_controller``
+    would duplicate an active controller registration.
+    """
+
+
 def raise_if_placeholder_uid(uid: str) -> None:
     """Raise :exc:`UnpairedBridgeError` if *uid* is the unpaired placeholder."""
     if uid == PLACEHOLDER_DEVICE_UID:

pizone/version.py

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

{python_izone-1.3.5.dist-info → python_izone-1.3.7.dist-info}/METADATA

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

@@ -0,0 +1,14 @@
+pizone/__init__.py,sha256=9EbQzqD1XfS5fSE-zgFieuzxAfZcQb9a3wNXsMp0JKc,2644
+pizone/const.py,sha256=0skTh6zBe61AJ_57fqdBrxz3aVBM3T4Ak_cPSkOx2Bo,153
+pizone/controller.py,sha256=nctzAF8Y75T0_Ue9Hxxv9OfEex4zoNseOMjGfI6wHFE,41109
+pizone/discovery.py,sha256=9akqPwsB8gcsmqnT5GQ3CCilo4m3jYL7cA3MWFOU1Uc,37442
+pizone/exceptions.py,sha256=qzYNHzQBMDcuvLfxlvOsk6J2Lp0gtzlHqJWpzyEunvU,1603
+pizone/power.py,sha256=bXoDRVD6gCfq0kJv132sjfy13DHGd6p2uBg9HcxRSxA,10343
+pizone/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pizone/types.py,sha256=fZrnec0Q815HyG2sFciLqNX0QDbTq1_0wTF92GXQh78,200
+pizone/version.py,sha256=qggYsfTliS2fgO5WngEhVPgiQ-AREJyDah_xDSuzcIM,520
+pizone/zone.py,sha256=tqiLJAJCmp1cehCtVPjawUNY9qyYypC4x3igI5jtDNo,7446
+python_izone-1.3.7.dist-info/METADATA,sha256=t1FnN14YONJRs8bYY-sNsbADvzt6VaQbQLfOGlzCzDQ,2703
+python_izone-1.3.7.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+python_izone-1.3.7.dist-info/licenses/licence.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_izone-1.3.7.dist-info/RECORD,,

python_izone-1.3.5.dist-info/RECORD

@@ -1,14 +0,0 @@
-pizone/__init__.py,sha256=IAZBU-UVisaiR2oHEVcLCRzuxieyU57xZ70uPjgsSLw,2627
-pizone/const.py,sha256=0skTh6zBe61AJ_57fqdBrxz3aVBM3T4Ak_cPSkOx2Bo,153
-pizone/controller.py,sha256=nctzAF8Y75T0_Ue9Hxxv9OfEex4zoNseOMjGfI6wHFE,41109
-pizone/discovery.py,sha256=vMdOunGrVS1ZWOgUAmm-dLdUOM9blGPKUcYr7683IV4,36659
-pizone/exceptions.py,sha256=wRO-COpyNyKL6P1vG0MlAVwbwo2iOvH0kRO7O75PUlo,1327
-pizone/power.py,sha256=bXoDRVD6gCfq0kJv132sjfy13DHGd6p2uBg9HcxRSxA,10343
-pizone/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pizone/types.py,sha256=fZrnec0Q815HyG2sFciLqNX0QDbTq1_0wTF92GXQh78,200
-pizone/version.py,sha256=8n48nP6UfUYjAJjgHmQr6-hzX4qoTllJ-v-32sLOJbA,520
-pizone/zone.py,sha256=tqiLJAJCmp1cehCtVPjawUNY9qyYypC4x3igI5jtDNo,7446
-python_izone-1.3.5.dist-info/METADATA,sha256=u7byaXu4JhVKdbSZrYupB1xdy6MAYBAzSR_IPostzgU,2703
-python_izone-1.3.5.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_izone-1.3.5.dist-info/licenses/licence.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_izone-1.3.5.dist-info/RECORD,,