Add ruff (lint + format) and ty (type checking) to the project
Adds [tool.ruff] and [tool.ty] config to pyproject.toml with a curated ruff rule set (E, F, W, I, UP, B, C4, SIM, RUF, ASYNC, LOG, G, PIE, RET, PERF, N), pins ruff/ty in requirements-dev.txt, reformats the whole tree with `ruff format`, and fixes the pre-existing lint and type-check debt those tools surfaced so both run clean. Production-code type fixes include: HA's ConfigFlowResult vs. the generic FlowResult in config_flow.py, narrowing BoundEntity.desc to its platform-specific subclass (SelectDesc/NumberDesc/SensorDesc/etc.) via cast() instead of an unchecked annotation, converting HA device_class strings to their proper enum types, a resolve_registry callback typed as `object` instead of `DeviceRegistry | None`, and a couple of other narrow correctness fixes (CA key type validation, an index-out-of-bounds false positive from an empty-tuple fallback, a bool/dict argument swap). Test-file fixes are mechanical: narrowing SamsungEntityDescription to the correct subclass via isinstance()/cast() before accessing subclass-only fields, and asserting Optional write_fn/unit_fn fields are set before calling them.
This commit is contained in:
147 files changed
+9977
-7584
No files matched your search
@@ -4,10 +4,10 @@ from custom_components.localthings.registry.capabilities.operational import OPER
|
||||
|
||||
|
||||
def test_machine_state_maps_samsung_to_ocf():
|
||||
ms = next(e for e in OPERATIONAL_STATE.entities if e.key == 'machine_state')
|
||||
assert ms.value_fn('Run') == 'active'
|
||||
assert ms.value_fn('Pause') == 'pause'
|
||||
assert ms.value_fn('Ready') == 'idle'
|
||||
ms = next(e for e in OPERATIONAL_STATE.entities if e.key == "machine_state")
|
||||
assert ms.value_fn("Run") == "active"
|
||||
assert ms.value_fn("Pause") == "pause"
|
||||
assert ms.value_fn("Ready") == "idle"
|
||||
|
||||
|
||||
class TestProgressPercentage:
|
||||
@@ -16,13 +16,13 @@ class TestProgressPercentage:
|
||||
active state the same way `progress`/`cycle_active`/`finish_time` are."""
|
||||
|
||||
def test_zeroed_when_not_active(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'progress_percentage')
|
||||
rep = {'x.com.samsung.da.state': 'Ready', 'x.com.samsung.da.progressPercentage': '1'}
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "progress_percentage")
|
||||
rep = {"x.com.samsung.da.state": "Ready", "x.com.samsung.da.progressPercentage": "1"}
|
||||
assert desc.rep_fn(rep) == 0
|
||||
|
||||
def test_passes_through_when_active(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'progress_percentage')
|
||||
rep = {'x.com.samsung.da.state': 'Run', 'x.com.samsung.da.progressPercentage': '42'}
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "progress_percentage")
|
||||
rep = {"x.com.samsung.da.state": "Run", "x.com.samsung.da.progressPercentage": "42"}
|
||||
assert desc.rep_fn(rep) == 42
|
||||
|
||||
|
||||
@@ -30,34 +30,34 @@ class TestCompletionMinutes:
|
||||
"""Unit tests for completion_minutes entity."""
|
||||
|
||||
def test_completion_minutes_parsing(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "completion_minutes")
|
||||
|
||||
# 1 hour 25 mins 30 secs -> 85 mins + 1 sec ceiling = 86 mins
|
||||
rep = {'x.com.samsung.da.remainingTime': '01:25:30'}
|
||||
rep = {"x.com.samsung.da.remainingTime": "01:25:30"}
|
||||
assert desc.rep_fn(rep) == 86
|
||||
|
||||
# Exact minutes: 1 hour 30 mins 00 secs -> 90 mins
|
||||
rep_exact = {'x.com.samsung.da.remainingTime': '01:30:00'}
|
||||
rep_exact = {"x.com.samsung.da.remainingTime": "01:30:00"}
|
||||
assert desc.rep_fn(rep_exact) == 90
|
||||
|
||||
def test_completion_minutes_fallback_key(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||
rep = {'remainingTime': '00:45:00'}
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "completion_minutes")
|
||||
rep = {"remainingTime": "00:45:00"}
|
||||
assert desc.rep_fn(rep) == 45
|
||||
|
||||
def test_completion_minutes_stale_finish_gated(self):
|
||||
"""Firmware freezes remainingTime at '00:01:00' when progress reaches 'Finish'.
|
||||
Should return 0 to prevent stuck values."""
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "completion_minutes")
|
||||
rep = {
|
||||
'x.com.samsung.da.progress': 'Finish',
|
||||
'x.com.samsung.da.remainingTime': '00:01:00',
|
||||
"x.com.samsung.da.progress": "Finish",
|
||||
"x.com.samsung.da.remainingTime": "00:01:00",
|
||||
}
|
||||
assert desc.rep_fn(rep) == 0
|
||||
|
||||
def test_completion_minutes_missing_or_invalid(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "completion_minutes")
|
||||
|
||||
rep = {}
|
||||
assert desc.rep_fn(rep) is None
|
||||
|
||||
@@ -70,20 +70,20 @@ class TestFinishTime:
|
||||
the UI rounded them down to the minute for display."""
|
||||
|
||||
def test_seconds_and_microseconds_are_zeroed(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'finish_time')
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "finish_time")
|
||||
rep = {
|
||||
'x.com.samsung.da.state': 'Run',
|
||||
'x.com.samsung.da.remainingTime': '00:29:00',
|
||||
"x.com.samsung.da.state": "Run",
|
||||
"x.com.samsung.da.remainingTime": "00:29:00",
|
||||
}
|
||||
result = desc.rep_fn(rep)
|
||||
assert result.second == 0
|
||||
assert result.microsecond == 0
|
||||
|
||||
def test_stable_across_polls_within_same_minute(self):
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'finish_time')
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "finish_time")
|
||||
rep = {
|
||||
'x.com.samsung.da.state': 'Run',
|
||||
'x.com.samsung.da.remainingTime': '00:29:00',
|
||||
"x.com.samsung.da.state": "Run",
|
||||
"x.com.samsung.da.remainingTime": "00:29:00",
|
||||
}
|
||||
first = desc.rep_fn(rep)
|
||||
second = desc.rep_fn(rep)
|
||||
@@ -92,31 +92,43 @@ class TestFinishTime:
|
||||
|
||||
class TestDelayFieldFallback:
|
||||
def test_reads_delay_end_time_when_delay_start_time_absent(self):
|
||||
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'delay_start_hours')
|
||||
rep = {'x.com.samsung.da.delayEndTime': '02:30:00'}
|
||||
from custom_components.localthings.registry.capabilities.operational import (
|
||||
OPERATIONAL_STATE,
|
||||
)
|
||||
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "delay_start_hours")
|
||||
rep = {"x.com.samsung.da.delayEndTime": "02:30:00"}
|
||||
assert desc.rep_fn(rep) == 2.5
|
||||
|
||||
def test_prefers_delay_start_time_when_both_present(self):
|
||||
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'delay_start_hours')
|
||||
from custom_components.localthings.registry.capabilities.operational import (
|
||||
OPERATIONAL_STATE,
|
||||
)
|
||||
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "delay_start_hours")
|
||||
rep = {
|
||||
'x.com.samsung.da.delayStartTime': '01:00:00',
|
||||
'x.com.samsung.da.delayEndTime': '02:00:00',
|
||||
"x.com.samsung.da.delayStartTime": "01:00:00",
|
||||
"x.com.samsung.da.delayEndTime": "02:00:00",
|
||||
}
|
||||
assert desc.rep_fn(rep) == 1.0
|
||||
|
||||
def test_write_targets_delay_end_time_when_that_is_what_device_reports(self):
|
||||
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'delay_start_hours')
|
||||
rep = {'x.com.samsung.da.delayEndTime': '00:00:00'}
|
||||
from custom_components.localthings.registry.capabilities.operational import (
|
||||
OPERATIONAL_STATE,
|
||||
)
|
||||
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "delay_start_hours")
|
||||
rep = {"x.com.samsung.da.delayEndTime": "00:00:00"}
|
||||
path, body = desc.write_fn(1.5, rep)
|
||||
assert path == ['operational', 'state', 'vs', '0']
|
||||
assert body == {'x.com.samsung.da.delayEndTime': '1:30:00'}
|
||||
assert path == ["operational", "state", "vs", "0"]
|
||||
assert body == {"x.com.samsung.da.delayEndTime": "1:30:00"}
|
||||
|
||||
def test_write_targets_delay_start_time_by_default(self):
|
||||
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'delay_start_hours')
|
||||
rep = {'x.com.samsung.da.delayStartTime': '00:00:00'}
|
||||
path, body = desc.write_fn(1.5, rep)
|
||||
assert body == {'x.com.samsung.da.delayStartTime': '1:30:00'}
|
||||
from custom_components.localthings.registry.capabilities.operational import (
|
||||
OPERATIONAL_STATE,
|
||||
)
|
||||
|
||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == "delay_start_hours")
|
||||
rep = {"x.com.samsung.da.delayStartTime": "00:00:00"}
|
||||
_path, body = desc.write_fn(1.5, rep)
|
||||
assert body == {"x.com.samsung.da.delayStartTime": "1:30:00"}
|
||||
Reference in new issue
Block a user