python-kasa · sdb9696 · Jan 24, 2025 · Jan 24, 2025 · sdb9696 · Jan 24, 2025
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
       - "--indent=4"
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.4
+  rev: v0.9.3
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]

diff --git a/devtools/parse_pcap_klap.py b/devtools/parse_pcap_klap.py
@@ -286,8 +286,7 @@ def main(
                     operator.local_seed = message
                     response = None
                     print(
-                        f"got handshake1 in {packet_number}, "
-                        f"looking for the response"
+                        f"got handshake1 in {packet_number}, looking for the response"
                     )
                     while (
                         True

diff --git a/kasa/cli/hub.py b/kasa/cli/hub.py
@@ -66,8 +66,8 @@ async def hub_pair(dev: SmartDevice, timeout: int):
 
     for child in pair_res:
         echo(
-            f'Paired {child["name"]} ({child["device_model"]}, '
-            f'{pretty_category(child["category"])}) with id {child["device_id"]}'
+            f"Paired {child['name']} ({child['device_model']}, "
+            f"{pretty_category(child['category'])}) with id {child['device_id']}"
         )
 
 

diff --git a/kasa/cli/lazygroup.py b/kasa/cli/lazygroup.py
@@ -66,7 +66,6 @@ def _lazy_load(self, cmd_name):
         # check the result to make debugging easier
         if not isinstance(cmd_object, click.BaseCommand):
             raise ValueError(
-                f"Lazy loading of {cmd_name} failed by returning "
-                "a non-command object"
+                f"Lazy loading of {cmd_name} failed by returning a non-command object"
             )
         return cmd_object
diff --git a/kasa/iot/iotdimmer.py b/kasa/iot/iotdimmer.py
@@ -115,9 +115,7 @@
             raise KasaException("Device is not dimmable.")
 
         if not isinstance(brightness, int):
-            raise ValueError(
-                "Brightness must be integer, " "not of %s.", type(brightness)
-            )
+            raise ValueError("Brightness must be integer, not of %s.", type(brightness))
 
         if not 0 <= brightness <= 100:
             raise ValueError(

diff --git a/kasa/iot/modules/lightpreset.py b/kasa/iot/modules/lightpreset.py
@@ -54,7 +54,7 @@ class LightPreset(IotModule, LightPresetInterface):
     async def _post_update_hook(self) -> None:
         """Update the internal presets."""
         self._presets = {
-            f"Light preset {index+1}": IotLightPreset.from_dict(vals)
+            f"Light preset {index + 1}": IotLightPreset.from_dict(vals)
             for index, vals in enumerate(self.data["preferred_state"])
             # Devices may list some light effects along with normal presets but these
             # are handled by the LightEffect module so exclude preferred states with id

diff --git a/kasa/protocols/iotprotocol.py b/kasa/protocols/iotprotocol.py
@@ -30,7 +30,7 @@ def _mask_children(children: list[dict[str, Any]]) -> list[dict[str, Any]]:
     def mask_child(child: dict[str, Any], index: int) -> dict[str, Any]:
         result = {
             **child,
-            "id": f"SCRUBBED_CHILD_DEVICE_ID_{index+1}",
+            "id": f"SCRUBBED_CHILD_DEVICE_ID_{index + 1}",
         }
         # Will leave empty aliases as blank
         if child.get("alias"):

diff --git a/kasa/protocols/smartprotocol.py b/kasa/protocols/smartprotocol.py
@@ -236,7 +236,7 @@ async def _execute_multiple_query(
 
             smart_params = {"requests": requests_step}
             smart_request = self.get_smart_request(smart_method, smart_params)
-            batch_name = f"multi-request-batch-{batch_num+1}-of-{int(end/step)+1}"
+            batch_name = f"multi-request-batch-{batch_num + 1}-of-{int(end / step) + 1}"
             if debug_enabled:
                 _LOGGER.debug(
                     "%s %s >> %s",

diff --git a/kasa/transports/xortransport.py b/kasa/transports/xortransport.py
@@ -142,18 +142,16 @@ async def send(self, request: str) -> dict:
             await self.reset()
             if ex.errno in _NO_RETRY_ERRORS:
                 raise KasaException(
-                    f"Unable to connect to the device:"
-                    f" {self._host}:{self._port}: {ex}"
+                    f"Unable to connect to the device: {self._host}:{self._port}: {ex}"
                 ) from ex
             else:
                 raise _RetryableError(
-                    f"Unable to connect to the device:"
-                    f" {self._host}:{self._port}: {ex}"
+                    f"Unable to connect to the device: {self._host}:{self._port}: {ex}"
                 ) from ex
         except Exception as ex:
             await self.reset()
             raise _RetryableError(
-                f"Unable to connect to the device:" f" {self._host}:{self._port}: {ex}"
+                f"Unable to connect to the device: {self._host}:{self._port}: {ex}"
             ) from ex
         except BaseException:
             # Likely something cancelled the task so we need to close the connection

diff --git a/pyproject.toml b/pyproject.toml
@@ -61,7 +61,7 @@ dev-dependencies = [
   "mypy~=1.0",
   "pytest-xdist>=3.6.1",
   "pytest-socket>=0.7.0",
-  "ruff==0.7.4",
+  "ruff>=0.9.0",
 ]
 
 
@@ -146,8 +146,6 @@ select = [
 ignore = [
   "D105",  # Missing docstring in magic method
   "D107",  # Missing docstring in `__init__`
-  "ANN101",  # Missing type annotation for `self`
-  "ANN102",  # Missing type annotation for `cls` in classmethod
   "ANN003",  # Missing type annotation for `**kwargs`
   "ANN401",  # allow any
 ]

diff --git a/tests/fakeprotocol_smartcam.py b/tests/fakeprotocol_smartcam.py
@@ -218,9 +218,9 @@ def _hub_remove_device(self, info, params):
 
     @staticmethod
     def _get_second_key(request_dict: dict[str, Any]) -> str:
-        assert (
-            len(request_dict) == 2
-        ), f"Unexpected dict {request_dict}, should be length 2"
+        assert len(request_dict) == 2, (
+            f"Unexpected dict {request_dict}, should be length 2"
+        )
         it = iter(request_dict)
         next(it, None)
         return next(it)

diff --git a/tests/smart/test_smartdevice.py b/tests/smart/test_smartdevice.py
@@ -223,9 +223,9 @@ async def test_update_module_update_delays(
                     now if mod_delay == 0 else now - (seconds % mod_delay)
                 )
 
-                assert (
-                    module._last_update_time == expected_update_time
-                ), f"Expected update time {expected_update_time} after {seconds} seconds for {module.name} with delay {mod_delay} got {module._last_update_time}"
+                assert module._last_update_time == expected_update_time, (
+                    f"Expected update time {expected_update_time} after {seconds} seconds for {module.name} with delay {mod_delay} got {module._last_update_time}"
+                )
 
 
 async def _get_child_responses(child_requests: list[dict[str, Any]], child_protocol):

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -653,8 +653,7 @@ async def test_light_preset(dev: Device, runner: CliRunner):
 
     if len(light_preset.preset_states_list) == 0:
         pytest.skip(
-            "Some fixtures do not have presets and"
-            " the api doesn'tsupport creating them"
+            "Some fixtures do not have presets and the api doesn'tsupport creating them"
         )
     # Start off with a known state
     first_name = light_preset.preset_list[1]

diff --git a/tests/transports/test_aestransport.py b/tests/transports/test_aestransport.py
@@ -56,7 +56,7 @@ def test_encrypt():
 
 
 status_parameters = pytest.mark.parametrize(
-    "status_code, error_code, inner_error_code, expectation",
+    ("status_code", "error_code", "inner_error_code", "expectation"),
     [
         (200, 0, 0, does_not_raise()),
         (400, 0, 0, pytest.raises(KasaException)),

diff --git a/tests/transports/test_sslaestransport.py b/tests/transports/test_sslaestransport.py
@@ -273,7 +273,7 @@ async def test_unencrypted_passthrough_errors(mocker, caplog, want_default):
         aiohttp.ClientSession, "post", side_effect=mock_ssl_aes_device.post
     )
 
-    msg = f"{host} responded with an unexpected " f"status code 401 to handshake1"
+    msg = f"{host} responded with an unexpected status code 401 to handshake1"
     with pytest.raises(KasaException, match=msg):
         await transport.send(json_dumps(request))
 
@@ -288,7 +288,7 @@ async def test_unencrypted_passthrough_errors(mocker, caplog, want_default):
         aiohttp.ClientSession, "post", side_effect=mock_ssl_aes_device.post
     )
 
-    msg = f"{host} responded with an unexpected " f"status code 401 to login"
+    msg = f"{host} responded with an unexpected status code 401 to login"
     with pytest.raises(KasaException, match=msg):
         await transport.send(json_dumps(request))
 
@@ -303,7 +303,7 @@ async def test_unencrypted_passthrough_errors(mocker, caplog, want_default):
         aiohttp.ClientSession, "post", side_effect=mock_ssl_aes_device.post
     )
 
-    msg = f"{host} responded with an unexpected " f"status code 401 to unencrypted send"
+    msg = f"{host} responded with an unexpected status code 401 to unencrypted send"
     with pytest.raises(KasaException, match=msg):
         await transport.send(json_dumps(request))
 

diff --git a/uv.lock b/uv.lock