Update prek/pre-commit config

Author: iMicknl

.pre-commit-config.yaml

@@ -1,25 +1,42 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.14.10
+  hooks:
+    # Run the linter.
+    - id: ruff-check
+      args: [ --fix ]
+    # Run the formatter.
+    - id: ruff-format
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
     hooks:
-      - id: check-json
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-json
         exclude: .devcontainer
-      - id: check-yaml
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.5
+    -   id: check-yaml
+    -   id: check-added-large-files
+    -   id: no-commit-to-branch
+        stages: [pre-commit]
+        args: [--branch, main]
+-   repo: https://github.com/rhysd/actionlint
+    rev: v1.7.7
     hooks:
-      - id: ruff
-        name: ruff check
-        types: [ python ]
-      - id: ruff-format
-        name: ruff format
-        types: [ python ]
-  - repo: local
+    -   id: actionlint
+-   repo: local
     hooks:
       - id: mypy
         name: mypy
         entry: mypy
         language: system
         types: [ python ]
+        exclude: tests
+      - id: ty
+        name: ty check
+        entry: uv run ty check .
+        language: system
+        types: [ python ]
+        exclude: tests

pyproject.toml

@@ -30,6 +30,7 @@ dev = [
     "prek>=0.3.8,<1.0",
     "ruff>=0.9.0,<1.0",
     "mypy>=1.19,<2.0",
+    "ty>=0.0.29,<1.0",
 ]
 
 [build-system]

sagemcom_api/client.py

@@ -3,15 +3,17 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Mapping
 import hashlib
 import json
 import math
 import random
+import urllib.parse
+from collections.abc import Mapping
 from types import TracebackType
 from typing import Any
-import urllib.parse
 
+import backoff
+import humps
 from aiohttp import (
     ClientConnectorError,
     ClientOSError,
@@ -20,8 +22,6 @@
     ServerDisconnectedError,
     TCPConnector,
 )
-import backoff
-import humps
 
 from .const import (
     API_ENDPOINT,
@@ -106,9 +106,7 @@ def __init__(
             else ClientSession(
                 headers={"User-Agent": f"{DEFAULT_USER_AGENT}"},
                 timeout=ClientTimeout(DEFAULT_TIMEOUT),
-                connector=TCPConnector(
-                    verify_ssl=verify_ssl if verify_ssl is not None else True
-                ),
+                connector=TCPConnector(verify_ssl=verify_ssl if verify_ssl is not None else True),
             )
         )
 
@@ -143,11 +141,7 @@ def __generate_md5_nonce_hash(self):
         def md5(input_string):
             return hashlib.md5(input_string.encode()).hexdigest()
 
-        n = (
-            self.__generate_nonce(UINT_MAX)
-            if self._current_nonce is None
-            else self._current_nonce
-        )
+        n = self.__generate_nonce(UINT_MAX) if self._current_nonce is None else self._current_nonce
         f = 0
         l_nonce = ""
         ha1 = md5(self.username + ":" + l_nonce + ":" + md5(self.password))
@@ -173,9 +167,7 @@ def __generate_hash(self, value, authentication_method=None):
 
     def __get_credential_hash(self):
         """Build credential hash."""
-        return self.__generate_hash(
-            self.username + ":" + self._server_nonce + ":" + self._password_hash
-        )
+        return self.__generate_hash(self.username + ":" + self._server_nonce + ":" + self._password_hash)
 
     def __generate_auth_key(self):
         """Build auth key."""
@@ -240,8 +232,7 @@ async def __post(self, url, data):
 
             # No errors
             if (
-                error["description"] == XMO_REQUEST_NO_ERR
-                or error["description"] == "Ok"  # NOQA: W503
+                error["description"] == XMO_REQUEST_NO_ERR or error["description"] == "Ok"  # NOQA: W503
             ):
                 return result
 
@@ -373,9 +364,7 @@ async def get_encryption_method(self):
         for encryption_method in EncryptionMethod:
             try:
                 self.authentication_method = encryption_method
-                self._password_hash = self.__generate_hash(
-                    self.password, encryption_method
-                )
+                self._password_hash = self.__generate_hash(self.password, encryption_method)
 
                 await self.login()
 
@@ -468,9 +457,7 @@ async def get_values_by_xpaths(self, xpaths, options: dict | None = None) -> dic
         max_tries=1,
         on_backoff=retry_login,
     )
-    async def set_value_by_xpath(
-        self, xpath: str, value: str, options: dict | None = None
-    ) -> dict:
+    async def set_value_by_xpath(self, xpath: str, value: str, options: dict | None = None) -> dict:
         """
         Retrieve raw value from router using XPath.
 
@@ -534,9 +521,7 @@ async def get_device_info(self) -> DeviceInfo:
     )
     async def get_hosts(self, only_active: bool | None = False) -> list[Device]:
         """Retrieve hosts connected to Sagemcom F@st device."""
-        data = await self.get_value_by_xpath(
-            "Device/Hosts/Hosts", options={"capability-flags": {"interface": True}}
-        )
+        data = await self.get_value_by_xpath("Device/Hosts/Hosts", options={"capability-flags": {"interface": True}})
         devices = [Device(**d) for d in data]
 
         if only_active:

sagemcom_api/enums.py

@@ -1,7 +1,7 @@
 """Enums for the Sagemcom F@st client."""
 
-from enum import unique
 import sys
+from enum import unique
 
 # Since we support Python versions lower than 3.11, we use
 # a backport for StrEnum when needed.

tests/conftest.py

@@ -7,8 +7,8 @@
 from typing import Any, Dict, List
 from unittest.mock import AsyncMock, MagicMock
 
-from aiohttp import ClientSession
 import pytest
+from aiohttp import ClientSession
 
 from sagemcom_api.client import SagemcomClient
 from sagemcom_api.enums import EncryptionMethod

tests/unit/test_client_basic.py

@@ -40,9 +40,7 @@ async def test_login_success(mock_session_factory, login_success_response):
 
 
 @pytest.mark.asyncio
-async def test_login_authentication_error(
-    mock_session_factory, login_auth_error_response
-):
+async def test_login_authentication_error(mock_session_factory, login_auth_error_response):
     """
     Test login raises AuthenticationException on XMO_AUTHENTICATION_ERR.
 
@@ -70,9 +68,7 @@ async def test_login_authentication_error(
 
 
 @pytest.mark.asyncio
-async def test_get_value_by_xpath_url_encoding(
-    mock_session_factory, login_success_response, xpath_value_response
-):
+async def test_get_value_by_xpath_url_encoding(mock_session_factory, login_success_response, xpath_value_response):
     """
     Test XPath values are URL-encoded with safe characters preserved.