refactor: improve ruff linter config and fix violations (homeassistant-ai#624)

* refactor: improve ruff linter config and fix violations

Expand ruff rule sets (add PIE, PERF, ASYNC, A, LOG, SIM, RUF) and
fix violations surfaced by the new rules:

- B904: add `from e` to raises inside except blocks
- E722: replace bare `except:` with `except Exception:`
- B007: prefix unused loop variables with `_`
- PERF401: convert manual list-append loops to comprehensions/extend
- SIM103: simplify needless if/return-bool to direct return
- SIM117: combine nested `with` statements
- SIM115: use context managers for open()
- ASYNC251: replace blocking time.sleep with async equivalent
- F821: add missing imports (asyncio)

Also remove unused black/isort dev dependencies (ruff handles both),
and exclude vendored tests/initial_test_state from linting.

* chore: add gitignore entries for WSL artifacts and stale git fragments

Author: sergeykad

custom_components/ha_mcp_tools/__init__.py

@@ -16,7 +16,12 @@
 
 import voluptuous as vol
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, ServiceCall, ServiceResponse, SupportsResponse
+from homeassistant.core import (
+    HomeAssistant,
+    ServiceCall,
+    ServiceResponse,
+    SupportsResponse,
+)
 from homeassistant.helpers import config_validation as cv
 
 from .const import ALLOWED_READ_DIRS, ALLOWED_WRITE_DIRS, DOMAIN
@@ -137,12 +142,7 @@ def _is_path_allowed_for_read(config_dir: Path, rel_path: str) -> bool:
         return True
 
     # Check for custom_components/**/*.py pattern
-    if fnmatch.fnmatch(normalized, "custom_components/*/*.py"):
-        return True
-    if fnmatch.fnmatch(normalized, "custom_components/**/*.py"):
-        return True
-
-    return False
+    return fnmatch.fnmatch(normalized, "custom_components/**/*.py")
 
 
 def _mask_secrets_content(content: str) -> str:
@@ -296,7 +296,7 @@ async def handle_read_file(call: ServiceCall) -> ServiceResponse:
             content = await hass.async_add_executor_job(target_file.read_text)
 
             # Apply special handling for specific files
-            normalized = os.path.normpath(rel_path)
+            normalized = os.path.normpath(rel_path)  # noqa: ASYNC240
 
             # Mask secrets.yaml
             if normalized == "secrets.yaml":

homeassistant-addon/start.py

@@ -135,7 +135,7 @@ def main() -> int:
     # Import and run MCP server directly
     try:
         log_info("Importing ha_mcp module...")
-        from ha_mcp.__main__ import mcp, _get_timestamped_uvicorn_log_config
+        from ha_mcp.__main__ import _get_timestamped_uvicorn_log_config, mcp
 
         log_info("Starting MCP server...")
         mcp.run(

pyproject.toml

@@ -54,30 +54,6 @@ packages = { find = { where = ["src", "."], include = ["ha_mcp*", "tests"] } }
 [tool.setuptools.package-data]
 ha_mcp = ["py.typed", "_pypi_marker", "resources/*.md", "resources/*.json"]
 
-[tool.black]
-line-length = 88
-target-version = ['py313']
-include = '\.pyi?$'
-extend-exclude = '''
-/(
-  # directories
-  \.eggs
-  | \.git
-  | \.hg
-  | \.mypy_cache
-  | \.tox
-  | \.venv
-  | build
-  | dist
-)/
-'''
-
-[tool.isort]
-profile = "black"
-multi_line_output = 3
-line_length = 88
-known_first_party = ["ha_mcp"]
-
 [tool.mypy]
 python_version = "3.11"
 warn_return_any = true
@@ -102,30 +78,43 @@ ignore_missing_imports = true
 [tool.ruff]
 target-version = "py313"
 line-length = 88
+extend-exclude = ["tests/initial_test_state"]
 
 [tool.ruff.lint]
 select = [
-    "E",  # pycodestyle errors
-    "W",  # pycodestyle warnings
-    "F",  # pyflakes
-    "I",  # isort
-    "B",  # flake8-bugbear
-    "C4", # flake8-comprehensions
-    "UP", # pyupgrade
-    "RUF100", # unused noqa
+    "E",     # pycodestyle errors
+    "W",     # pycodestyle warnings
+    "F",     # pyflakes
+    "I",     # isort
+    "B",     # flake8-bugbear
+    "C4",    # flake8-comprehensions
+    "UP",    # pyupgrade
+    "RUF",   # ruff-specific rules
+    "PIE",   # misc lints
+    "PERF",  # performance anti-patterns
+    "ASYNC", # async best practices
+    "A",     # builtin shadowing
+    "LOG",   # logging best practices
+    "SIM",   # simplify
 ]
 ignore = [
-    "E501",  # line too long, handled by black
-    "B008",  # do not perform function calls in argument defaults
-    "C901",  # too complex
-    "B904",  # raise exceptions with from None/err - non-critical
-    "F841",  # local variable assigned but never used
-    "B007",  # loop control variable not used within loop body
-    "W293",  # blank line contains whitespace
-    "W291",  # trailing whitespace
-    "F821",  # undefined name (often false positives in complex imports)
-    "E722",  # bare except (temporary for cleanup)
-    "I001",  # import sorting handled by isort
+    "E501",    # line too long — formatter handles this
+    "B008",    # function calls in defaults — FastMCP pattern
+    "C901",    # complexity — too many to fix now
+    "SIM102",  # collapsible-if — sometimes less readable
+    "SIM108",  # ternary — sometimes less readable
+    "SIM105",  # contextlib.suppress — style preference
+    "ASYNC109",# timeout params are standard in HA API patterns
+    "RUF001",  # ambiguous unicode — HA entity names use degree symbols etc
+    "RUF003",  # ambiguous unicode in comments
+    "RUF010",  # explicit f-string type conversion — str(x) is clearer than !s
+    "F841",    # unused variable — too many to fix now
+    "RUF059",  # unused unpacked variable
+    "SIM118",  # in-dict-keys — style preference
+    "PIE810",  # multiple-starts-ends-with — style preference
+    "RUF005",  # collection-literal-concatenation
+    "RUF022",  # unsorted-dunder-all
+    "RUF013",  # implicit-optional
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -161,10 +150,8 @@ asyncio_mode = "auto"
 
 [dependency-groups]
 dev = [
-    "black>=23.0.0",
     "build>=1.2.2",
     "docker>=7.1.0",
-    "isort>=5.12.0",
     "mypy>=1.17.0",
     "psutil>=7.0.0",
     "pytest>=8.4.2",

scripts/validate_server_manifest.py

@@ -10,7 +10,6 @@
 
 from jsonschema import validate
 
-
 SCHEMA_URL = "https://static.modelcontextprotocol.io/schemas/2025-10-17/server.schema.json"
 
 

src/ha_mcp/__main__.py

@@ -33,6 +33,7 @@ def __init__(self, auth_provider):
     def _get_oauth_client(self):
         """Get the OAuth client for the current request context."""
         from fastmcp.server.dependencies import get_access_token
+
         from ha_mcp.client.rest_client import HomeAssistantClient
 
         # Get the access token from the current request context
@@ -169,11 +170,8 @@ def _check_stdin_available() -> bool:
         return True
 
     # Block character devices that aren't TTYs (like /dev/null in Docker without -i)
-    if stat.S_ISCHR(mode):
-        return False
-
     # Unknown type - allow it and let the server handle any issues
-    return True
+    return not stat.S_ISCHR(mode)
 
 
 def _handle_config_error(error: Exception) -> None:
@@ -271,7 +269,9 @@ def _create_server():
     from pydantic import ValidationError
 
     try:
-        from ha_mcp.server import HomeAssistantSmartMCPServer  # type: ignore[import-not-found]
+        from ha_mcp.server import (
+            HomeAssistantSmartMCPServer,  # type: ignore[import-not-found]
+        )
 
         return HomeAssistantSmartMCPServer()
     except ValidationError as e:

src/ha_mcp/auth/provider.py

@@ -16,7 +16,12 @@
 from urllib.parse import urlencode
 
 import httpx
-from fastmcp.server.auth.auth import AccessToken  # FastMCP version has claims field
+from fastmcp.server.auth.auth import (
+    AccessToken,  # FastMCP version has claims field
+    ClientRegistrationOptions,
+    OAuthProvider,
+    RevocationOptions,
+)
 from mcp.server.auth.provider import (
     AuthorizationCode,
     AuthorizationParams,
@@ -31,12 +36,6 @@
 from starlette.responses import HTMLResponse, RedirectResponse, Response
 from starlette.routing import Route
 
-from fastmcp.server.auth.auth import (
-    ClientRegistrationOptions,
-    OAuthProvider,
-    RevocationOptions,
-)
-
 from .consent_form import create_consent_html, create_error_html
 
 logger = logging.getLogger(__name__)

src/ha_mcp/client/rest_client.py

@@ -17,19 +17,16 @@
 class HomeAssistantError(Exception):
     """Base exception for Home Assistant API errors."""
 
-    pass
 
 
 class HomeAssistantConnectionError(HomeAssistantError):
     """Connection error to Home Assistant."""
 
-    pass
 
 
 class HomeAssistantAuthError(HomeAssistantError):
     """Authentication error with Home Assistant."""
 
-    pass
 
 
 class HomeAssistantAPIError(HomeAssistantError):
@@ -432,7 +429,7 @@ async def _resolve_automation_id(self, identifier: str) -> str:
                 raise HomeAssistantAPIError(
                     f"Failed to resolve automation {identifier}: {str(e)}",
                     status_code=404,
-                )
+                ) from e
         else:
             # Assume it's already a unique_id
             return identifier
@@ -463,7 +460,7 @@ async def get_automation_config(self, identifier: str) -> dict[str, Any]:
                 raise HomeAssistantAPIError(
                     f"Automation not found: {identifier} (unique_id: {unique_id})",
                     status_code=404,
-                )
+                ) from e
             raise
 
     async def upsert_automation_config(
@@ -548,7 +545,7 @@ async def upsert_automation_config(
             if "400" in str(e):
                 raise HomeAssistantAPIError(
                     f"Invalid automation configuration: {str(e)}", status_code=400
-                )
+                ) from e
             raise
 
     async def delete_automation_config(self, identifier: str) -> dict[str, Any]:
@@ -582,7 +579,7 @@ async def delete_automation_config(self, identifier: str) -> dict[str, Any]:
                 raise HomeAssistantAPIError(
                     f"Automation not found: {identifier} (unique_id: {unique_id})",
                     status_code=404,
-                )
+                ) from e
             elif e.status_code == 405:
                 raise HomeAssistantAPIError(
                     f"Cannot delete automation '{identifier}': The HTTP DELETE method is blocked. "
@@ -595,14 +592,14 @@ async def delete_automation_config(self, identifier: str) -> dict[str, Any]:
                     f"(e.g., 'DELETE_{identifier}') so you can identify and manually delete it later "
                     f"via the Home Assistant UI (Settings > Automations & Scenes).",
                     status_code=405,
-                )
+                ) from e
             raise
         except Exception as e:
             if "404" in str(e):
                 raise HomeAssistantAPIError(
                     f"Automation not found: {identifier} (unique_id: {unique_id})",
                     status_code=404,
-                )
+                ) from e
             raise
 
     async def start_config_flow(
@@ -845,7 +842,7 @@ async def get_script_config(self, script_id: str) -> dict[str, Any]:
             if e.status_code == 404:
                 raise HomeAssistantAPIError(
                     f"Script not found: {script_id}", status_code=404
-                )
+                ) from e
             raise
         except Exception as e:
             logger.error(f"Failed to get script config for {script_id}: {e}")
@@ -897,7 +894,7 @@ async def delete_script_config(self, script_id: str) -> dict[str, Any]:
             if e.status_code == 404:
                 raise HomeAssistantAPIError(
                     f"Script not found: {script_id}", status_code=404
-                )
+                ) from e
             elif e.status_code == 405:
                 raise HomeAssistantAPIError(
                     f"Cannot delete script '{script_id}': The HTTP DELETE method is blocked. "
@@ -912,9 +909,7 @@ async def delete_script_config(self, script_id: str) -> dict[str, Any]:
                     f"(e.g., 'DELETE_{script_id}') so you can identify and manually delete it later "
                     f"via the Home Assistant UI (Settings > Automations & Scenes > Scripts).",
                     status_code=405,
-                )
-            raise
-        except Exception as e:
+                ) from e
             raise
 
 

src/ha_mcp/client/websocket_client.py

@@ -449,9 +449,9 @@ async def send_command(self, command_type: str, **kwargs: Any) -> dict[str, Any]
                 )
                 return {"success": True, **response}
 
-        except TimeoutError:
+        except TimeoutError as e:
             self.cancel_pending_response(message_id)
-            raise Exception("Command timeout")
+            raise Exception("Command timeout") from e
         except Exception:
             self.cancel_pending_response(message_id)
             raise

src/ha_mcp/tools/__init__.py

@@ -4,8 +4,8 @@
 from .smart_search import SmartSearchTools, create_smart_search_tools
 
 __all__ = [
-    "SmartSearchTools",
-    "create_smart_search_tools",
     "DeviceControlTools",
+    "SmartSearchTools",
     "create_device_control_tools",
+    "create_smart_search_tools",
 ]

src/ha_mcp/tools/backup.py

@@ -7,7 +7,7 @@
 import asyncio
 import logging
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, Annotated
+from typing import TYPE_CHECKING, Annotated, Any
 
 from pydantic import Field
 
@@ -214,7 +214,7 @@ async def create_backup(
         if ws_client:
             try:
                 await ws_client.disconnect()
-            except:
+            except Exception:
                 pass  # Ignore errors during cleanup
 
 
@@ -345,7 +345,7 @@ async def restore_backup(
         if ws_client:
             try:
                 await ws_client.disconnect()
-            except:
+            except Exception:
                 pass  # Ignore errors during cleanup