lifx-async 4.3.3__py3-none-any.whl → 4.3.4__py3-none-any.whl

lifx/devices/base.py

@@ -252,6 +252,8 @@ class Device:
         self.serial = serial_obj.to_string()
         self.ip = ip
         self.port = port
+        self._timeout = timeout
+        self._max_retries = max_retries
 
         # Create lightweight connection handle - connection pooling is internal
         self.connection = DeviceConnection(
@@ -304,10 +306,16 @@ class Device:
             ```
         """
         if serial is None:
-            temp_conn = DeviceConnection(serial="000000000000", ip=ip, port=port)
+            temp_conn = DeviceConnection(
+                serial="000000000000",
+                ip=ip,
+                port=port,
+                timeout=timeout,
+                max_retries=max_retries,
+            )
             try:
                 response = await temp_conn.request(
-                    packets.Device.GetService(), timeout=DISCOVERY_TIMEOUT
+                    packets.Device.GetService(), timeout=timeout
                 )
                 if response and isinstance(response, packets.Device.StateService):
                     if temp_conn.serial and temp_conn.serial != "000000000000":
@@ -890,9 +898,17 @@ class Device:
 
         try:
             # Check each device for the target label
-            async for disc in discover_devices(timeout=discover_timeout):
+            async for disc in discover_devices(
+                timeout=discover_timeout,
+                device_timeout=self._timeout,
+                max_retries=self._max_retries,
+            ):
                 temp_conn = DeviceConnection(
-                    serial=disc.serial, ip=disc.ip, port=disc.port
+                    serial=disc.serial,
+                    ip=disc.ip,
+                    port=disc.port,
+                    timeout=self._timeout,
+                    max_retries=self._max_retries,
                 )
 
                 try:
@@ -1063,9 +1079,17 @@ class Device:
 
         try:
             # Check each device for the target label
-            async for disc in discover_devices(timeout=discover_timeout):
+            async for disc in discover_devices(
+                timeout=discover_timeout,
+                device_timeout=self._timeout,
+                max_retries=self._max_retries,
+            ):
                 temp_conn = DeviceConnection(
-                    serial=disc.serial, ip=disc.ip, port=disc.port
+                    serial=disc.serial,
+                    ip=disc.ip,
+                    port=disc.port,
+                    timeout=self._timeout,
+                    max_retries=self._max_retries,
                 )
 
                 try:

lifx/network/connection.py

@@ -467,13 +467,10 @@ class DeviceConnection:
         correlation_keys: list[tuple[int, int, str]] = []
 
         # Calculate per-attempt timeouts with exponential backoff
-        # Start with a reasonable minimum (100ms) to avoid too-short initial timeouts
-        min_attempt_timeout = 0.1  # 100ms minimum
-        if max_retries > 0:
-            attempt_timeout = max(min_attempt_timeout, timeout / (2 * max_retries))
-        else:
-            # Only one attempt total, use entire timeout
-            attempt_timeout = timeout
+        # Use proper exponential backoff distribution: timeout / (2^(n+1) - 1)
+        # This ensures total of all attempt timeouts equals the overall timeout budget
+        total_weight = (2 ** (max_retries + 1)) - 1
+        base_timeout = timeout / total_weight
 
         # Idle timeout for multi-response protocols
         # Stop streaming if no responses for this long after first response
@@ -482,14 +479,17 @@ class DeviceConnection:
         last_error: Exception | None = None
         has_yielded = False
         overall_start = time.monotonic()
+        total_sleep_time = 0.0  # Track sleep time to exclude from timeout budget
 
         try:
             for attempt in range(max_retries + 1):
                 # Calculate current attempt timeout with exponential backoff
-                current_timeout = min(
-                    attempt_timeout * (2**attempt),
-                    timeout - (time.monotonic() - overall_start),
+                # Exclude sleep time from elapsed time to preserve timeout budget
+                elapsed_response_time = (
+                    time.monotonic() - overall_start - total_sleep_time
                 )
+                ideal_timeout = base_timeout * (2**attempt)
+                current_timeout = min(ideal_timeout, timeout - elapsed_response_time)
 
                 # Check if we've exceeded overall timeout budget
                 if current_timeout <= 0:
@@ -616,6 +616,9 @@ class DeviceConnection:
                         # Sleep with jitter before retry
                         sleep_time = self._calculate_retry_sleep_with_jitter(attempt)
                         await asyncio.sleep(sleep_time)
+                        total_sleep_time += (
+                            sleep_time  # Track sleep to exclude from timeout
+                        )
                         continue
                     else:
                         # All retries exhausted
@@ -673,9 +676,14 @@ class DeviceConnection:
         base_timeout = timeout / total_weight
 
         last_error: Exception | None = None
+        total_sleep_time = 0.0  # Track sleep time to exclude from timeout budget
+        overall_start = time.monotonic()
 
         for attempt in range(max_retries + 1):
-            current_timeout = base_timeout * (2**attempt)
+            # Calculate timeout with budget remaining after excluding sleep time
+            elapsed_response_time = time.monotonic() - overall_start - total_sleep_time
+            ideal_timeout = base_timeout * (2**attempt)
+            current_timeout = min(ideal_timeout, timeout - elapsed_response_time)
             sequence = attempt
 
             # Correlation key: (source, sequence, serial)
@@ -737,6 +745,9 @@ class DeviceConnection:
                     # Sleep with jitter before retry
                     sleep_time = self._calculate_retry_sleep_with_jitter(attempt)
                     await asyncio.sleep(sleep_time)
+                    total_sleep_time += (
+                        sleep_time  # Track sleep to exclude from timeout
+                    )
                     continue
                 else:
                     break

{lifx_async-4.3.3.dist-info → lifx_async-4.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lifx-async
-Version: 4.3.3
+Version: 4.3.4
 Summary: A modern, type-safe, async Python library for controlling LIFX lights
 Author-email: Avi Miller <me@dje.li>
 Maintainer-email: Avi Miller <me@dje.li>

{lifx_async-4.3.3.dist-info → lifx_async-4.3.4.dist-info}/RECORD

@@ -5,7 +5,7 @@ lifx/const.py,sha256=dW64lf_jwAD40GSd6hkFkrni5j-w2qkV3pl6YNdCxv4,3426
 lifx/exceptions.py,sha256=pikAMppLn7gXyjiQVWM_tSvXKNh-g366nG_UWyqpHhc,815
 lifx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lifx/devices/__init__.py,sha256=V7hW8sM_RwFgbR4Hv1ByR1JLhYq7Ft1X9pylQjCXYB8,777
-lifx/devices/base.py,sha256=bxnFRkYWmOfih9wDALKpiepOzlEabtuNS21tZhPVk6U,40765
+lifx/devices/base.py,sha256=uD3hQe2kjycRZneSptON6psOhoEgPRHVelCoLgdHbFw,41482
 lifx/devices/hev.py,sha256=2zZNYm3TFrL755B4cRPNdYtcDLZEQwGl_22112WsSZc,9504
 lifx/devices/infrared.py,sha256=TrCgJyEioIPlFumMmcSmuGYmRsSGlQ5Rllg6_9Wtg4Y,4248
 lifx/devices/light.py,sha256=9rL24fa44Y7QrRBDSQuG6xpWsaPbQTTm4ExvrDnYWHo,27572
@@ -20,7 +20,7 @@ lifx/effects/models.py,sha256=MS5D-cxD0Ar8XhqbqKAc9q2sk38IP1vPkYwd8V7jCr8,2446
 lifx/effects/pulse.py,sha256=t5eyjfFWG1xT-RXKghRqHYJ9CG_50tPu4jsDapJZ2mw,8721
 lifx/effects/state_manager.py,sha256=iDfYowiCN5IJqcR1s-pM0mQEJpe-RDsMcOOSMmtPVDE,8983
 lifx/network/__init__.py,sha256=uSyA8r8qISG7qXUHbX8uk9A2E8rvDADgCcf94QIZ9so,499
-lifx/network/connection.py,sha256=dgkTptyFf_3Cfd2_UCh_M75lVmIHTdGuU92nzqQcsdY,37358
+lifx/network/connection.py,sha256=K5zzwYWKBvSBMqcP6a5Fp9JkVIiOLXJSAi1XMT4g-Go,38191
 lifx/network/discovery.py,sha256=FoFoZcw3dtJs1daESiZiNXytanKQsMTdF9PjOxEgHM0,23804
 lifx/network/message.py,sha256=jCLC9v0tbBi54g5CaHLFM_nP1Izu8kJmo2tt23HHBbA,2600
 lifx/network/transport.py,sha256=8QS0YV32rdP0EDiPEwuvZXbplRWL08pmjKybd87mkZ0,11070
@@ -40,7 +40,7 @@ lifx/theme/canvas.py,sha256=4h7lgN8iu_OdchObGDgbxTqQLCb-FRKC-M-YCWef_i4,8048
 lifx/theme/generators.py,sha256=L0X6_iApLx6XDboGlYunaVsl6nvUCqMfn23VQmRkyCk,6125
 lifx/theme/library.py,sha256=tKlKZNqJp8lRGDnilWyDm_Qr1vCRGGwuvWVS82anNpQ,21326
 lifx/theme/theme.py,sha256=qMEx_8E41C0Cc6f083XHiAXEglTv4YlXW0UFsG1rQKg,5521
-lifx_async-4.3.3.dist-info/METADATA,sha256=gI8tKKKOoM36x6oeh3w5d8YBgDxeUIXlwTybiRRr7XE,2609
-lifx_async-4.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lifx_async-4.3.3.dist-info/licenses/LICENSE,sha256=eBz48GRA3gSiWn3rYZAz2Ewp35snnhV9cSqkVBq7g3k,1832
-lifx_async-4.3.3.dist-info/RECORD,,
+lifx_async-4.3.4.dist-info/METADATA,sha256=MkrET2BAkIwK9D5rlzSmJyM9pp2DyHzBbSjHLvF27AM,2609
+lifx_async-4.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lifx_async-4.3.4.dist-info/licenses/LICENSE,sha256=eBz48GRA3gSiWn3rYZAz2Ewp35snnhV9cSqkVBq7g3k,1832
+lifx_async-4.3.4.dist-info/RECORD,,