Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion requirements_lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ mypy==1.16.1
pylint==3.3.7
pylint-strict-informational==0.1
pre-commit==4.2.0
ruff==0.11.13
ruff==0.12.4
40 changes: 18 additions & 22 deletions scripts/run_mock_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,23 @@
DATEFMT = "%Y-%m-%d %H:%M:%S"
FMT = "%(asctime)s [%(levelname)s] %(message)s"

try:
from colorlog import ColoredFormatter

logging_formatter = ColoredFormatter(
f"%(log_color)s{FMT}%(reset)s",
datefmt=DATEFMT,
log_colors={
"DEBUG": "cyan",
"INFO": "green",
"WARNING": "yellow",
"ERROR": "red",
"CRITICAL": "red",
},
)
except ImportError:
logging_formatter = logging.Formatter(fmt=FMT, datefmt=DATEFMT)


class ExitException(Exception):
"""Represent an exit error."""
Expand Down Expand Up @@ -357,28 +374,7 @@ def main() -> None:

# adapted from homeassistant.bootstrap.async_enable_logging
logging.basicConfig(level=args.log_level)
try:
# pylint: disable=import-outside-toplevel
from colorlog import ColoredFormatter

colorfmt = f"%(log_color)s{FMT}%(reset)s"
logging.getLogger().handlers[0].setFormatter(
ColoredFormatter(
colorfmt,
datefmt=DATEFMT,
log_colors={
"DEBUG": "cyan",
"INFO": "green",
"WARNING": "yellow",
"ERROR": "red",
"CRITICAL": "red",
},
)
)
except ImportError:
logging.getLogger().handlers[0].setFormatter(
logging.Formatter(fmt=FMT, datefmt=DATEFMT)
)
logging.getLogger().handlers[0].setFormatter(logging_formatter)

server = MockZwaveJsServer(network_state_dump, events_to_replay, command_results)
web.run_app(server.app, host=args.host, port=args.port)
Expand Down
4 changes: 2 additions & 2 deletions zwave_js_server/model/config_manager/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from __future__ import annotations

from typing import TYPE_CHECKING, Any, Optional
from typing import TYPE_CHECKING, Any

from ..device_config import DeviceConfig

Expand All @@ -26,7 +26,7 @@ async def lookup_device(
manufacturer_id: int,
product_type: int,
product_id: int,
firmware_version: Optional[str] = None,
firmware_version: str | None = None,
) -> DeviceConfig | None:
"""Look up the definition of a given device in the configuration DB."""
cmd: dict[str, Any] = {
Expand Down