chore: fix typing in tests

Author: cryptk

.pre-commit-config.yaml

@@ -57,5 +57,5 @@ repos:
         hooks:
             -   id: mypy
                 exclude: cli.py
-                additional_dependencies: [ "pydantic>=2.0.0", "pydantic-xml>=2.18.0", "pytest>=8.0.0" ]
-                args: [ "--config-file=./pyproject.toml", "--follow-imports=silent", "--strict", "--ignore-missing-imports", "--disallow-subclassing-any", "--no-warn-return-any" ]
+                additional_dependencies: [ "pydantic>=2.0.0", "pytest>=8.0.0" ]
+                args: [ "--config-file=./pyproject.toml"]

.vscode/settings.json

@@ -8,7 +8,7 @@
     "--cov-report=xml:coverage.xml",
     "tests"
   ],
-  "mypy-type-checker.importStrategy": "fromEnvironment",
+  // "mypy-type-checker.importStrategy": "fromEnvironment",
   "python.analysis.typeCheckingMode": "basic",
   "[python]": {
     "editor.defaultFormatter": "charliermarsh.ruff",

pyproject.toml

@@ -13,7 +13,7 @@ license = {text = "Apache-2.0"}
 dependencies = [
     "pydantic >=2.0.0,<3.0.0",
     "click >=8.0.0,<8.4.0",
-    "xmltodict >=1.0.2,<2.0.0",
+    "xmltodict >=1.0.1,<2.0.0",
 ]
 
 [project.scripts]
@@ -24,12 +24,22 @@ cli = [
     "scapy>=2.6.1,<3.0.0",
 ]
 
+[dependency-groups]
+dev = [
+    "pre-commit>=4.0.0,<5.0.0",
+    "mypy>=1.18.2,<2.0.0",
+    "types-xmltodict >=1.0.1,<2.0.0",
+    "pytest>=8.0.0,<9.0.0",
+    "pytest-cov>=7.0.0,<8.0.0",
+    "pytest-asyncio>=1.2.0,<2.0.0",
+    "pytest-subtests>=0.15.0,<1.0.0",
+]
+
 [tool.mypy]
 python_version = "3.13"
-plugins = [
-    "pydantic.mypy",
-    "pydantic_xml.mypy",
-]
+# plugins = [
+#     "pydantic.mypy"
+# ]
 follow_imports = "silent"
 strict = true
 ignore_missing_imports = true

tests/test_api.py

@@ -1,5 +1,3 @@
-# type: ignore
-
 """Comprehensive tests for the OmniLogic API layer.
 
 Focuses on:
@@ -11,7 +9,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 from unittest.mock import AsyncMock, MagicMock, patch
 from xml.etree import ElementTree as ET
 
@@ -20,7 +18,7 @@
 from pyomnilogic_local.api.api import OmniLogicAPI, _validate_id, _validate_speed, _validate_temperature
 from pyomnilogic_local.api.constants import MAX_SPEED_PERCENT, MAX_TEMPERATURE_F, MIN_SPEED_PERCENT, MIN_TEMPERATURE_F, XML_NAMESPACE
 from pyomnilogic_local.api.exceptions import OmniValidationError
-from pyomnilogic_local.omnitypes import ColorLogicBrightness, ColorLogicShow40, ColorLogicSpeed, HeaterMode
+from pyomnilogic_local.omnitypes import ColorLogicBrightness, ColorLogicShow40, ColorLogicSpeed, HeaterMode, MessageType
 
 if TYPE_CHECKING:
     from pytest_subtests import SubTests
@@ -60,7 +58,7 @@ def _find_param(root: ET.Element, name: str) -> ET.Element:
 
 def test_validate_temperature(subtests: SubTests) -> None:
     """Test temperature validation with various inputs using table-driven approach."""
-    test_cases = [
+    test_cases: list[tuple[Any, str, bool, str]] = [
         # (temperature, param_name, should_pass, description)  # noqa: ERA001
         (MIN_TEMPERATURE_F, "temp", True, "minimum valid temperature"),
         (MAX_TEMPERATURE_F, "temp", True, "maximum valid temperature"),
@@ -83,7 +81,7 @@ def test_validate_temperature(subtests: SubTests) -> None:
 
 def test_validate_speed(subtests: SubTests) -> None:
     """Test speed validation with various inputs using table-driven approach."""
-    test_cases = [
+    test_cases: list[tuple[Any, str, bool, str]] = [
         # (speed, param_name, should_pass, description)  # noqa: ERA001
         (MIN_SPEED_PERCENT, "speed", True, "minimum valid speed (0)"),
         (MAX_SPEED_PERCENT, "speed", True, "maximum valid speed (100)"),
@@ -106,7 +104,7 @@ def test_validate_speed(subtests: SubTests) -> None:
 
 def test_validate_id(subtests: SubTests) -> None:
     """Test ID validation with various inputs using table-driven approach."""
-    test_cases = [
+    test_cases: list[tuple[Any, str, bool, str]] = [
         # (id_value, param_name, should_pass, description)  # noqa: ERA001
         (0, "pool_id", True, "zero ID"),
         (1, "pool_id", True, "positive ID"),
@@ -149,7 +147,7 @@ def test_api_init_custom_params() -> None:
 
 def test_api_init_validation(subtests: SubTests) -> None:
     """Test OmniLogicAPI initialization validation using table-driven approach."""
-    test_cases = [
+    test_cases: list[tuple[Any, Any, Any, bool, str]] = [
         # (ip, port, timeout, should_pass, description)  # noqa: ERA001
         ("", 10444, 5.0, False, "empty IP address"),
         ("192.168.1.100", 0, 5.0, False, "zero port"),
@@ -489,7 +487,7 @@ async def test_async_send_message_creates_transport() -> None:
     with patch("asyncio.get_running_loop") as mock_loop:
         mock_loop.return_value.create_datagram_endpoint = AsyncMock(return_value=(mock_transport, mock_protocol))
 
-        await api.async_send_message(0x01, "test", need_response=False)
+        await api.async_send_message(MessageType.REQUEST_CONFIGURATION, "test", need_response=False)
 
         # Verify endpoint was created with correct parameters
         mock_loop.return_value.create_datagram_endpoint.assert_called_once()
@@ -512,7 +510,7 @@ async def test_async_send_message_with_response() -> None:
     with patch("asyncio.get_running_loop") as mock_loop:
         mock_loop.return_value.create_datagram_endpoint = AsyncMock(return_value=(mock_transport, mock_protocol))
 
-        result = await api.async_send_message(0x01, "test", need_response=True)
+        result = await api.async_send_message(MessageType.REQUEST_CONFIGURATION, "test", need_response=True)
 
         assert result == "test response"
         mock_protocol.send_and_receive.assert_called_once()
@@ -531,7 +529,7 @@ async def test_async_send_message_without_response() -> None:
     with patch("asyncio.get_running_loop") as mock_loop:
         mock_loop.return_value.create_datagram_endpoint = AsyncMock(return_value=(mock_transport, mock_protocol))
 
-        result = await api.async_send_message(0x01, "test", need_response=False)
+        result = await api.async_send_message(MessageType.REQUEST_CONFIGURATION, "test", need_response=False)  # type: ignore[func-returns-value]
 
         assert result is None
         mock_protocol.send_message.assert_called_once()
@@ -551,7 +549,7 @@ async def test_async_send_message_closes_transport_on_error() -> None:
         mock_loop.return_value.create_datagram_endpoint = AsyncMock(return_value=(mock_transport, mock_protocol))
 
         with pytest.raises(Exception, match="Test error"):
-            await api.async_send_message(0x01, "test", need_response=False)
+            await api.async_send_message(MessageType.REQUEST_CONFIGURATION, "test", need_response=False)
 
         # Verify transport was still closed despite the error
         mock_transport.close.assert_called_once()

tests/test_decorators.py

@@ -1,4 +1,3 @@
-# type: ignore
 """Tests for equipment control method decorators.
 
 Focuses on:
@@ -10,6 +9,7 @@
 
 from __future__ import annotations
 
+from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
@@ -35,8 +35,8 @@ def __init__(self, is_ready: bool = True):
         self._omni = MagicMock()
         self._omni._telemetry_dirty = False
         self.method_called = False
-        self.method_args = None
-        self.method_kwargs = None
+        self.method_args: tuple[Any, ...] | None = None
+        self.method_kwargs: dict[str, Any] | None = None
 
     @control_method
     async def turn_on(self) -> None:
@@ -69,7 +69,7 @@ async def set_complex_operation(self, param1: int, param2: str, flag: bool = Fal
 
 
 @pytest.mark.asyncio
-async def test_control_method_when_ready_executes_function():
+async def test_control_method_when_ready_executes_function() -> None:
     """Test that control_method executes the wrapped function when equipment is ready."""
     equipment = MockEquipment(is_ready=True)
 
@@ -79,7 +79,7 @@ async def test_control_method_when_ready_executes_function():
 
 
 @pytest.mark.asyncio
-async def test_control_method_when_not_ready_raises_error():
+async def test_control_method_when_not_ready_raises_error() -> None:
     """Test that control_method raises OmniEquipmentNotReadyError when equipment is not ready."""
     equipment = MockEquipment(is_ready=False)
 
@@ -91,7 +91,7 @@ async def test_control_method_when_not_ready_raises_error():
 
 
 @pytest.mark.asyncio
-async def test_control_method_marks_telemetry_dirty():
+async def test_control_method_marks_telemetry_dirty() -> None:
     """Test that control_method marks telemetry as dirty after successful execution."""
     equipment = MockEquipment(is_ready=True)
 
@@ -103,7 +103,7 @@ async def test_control_method_marks_telemetry_dirty():
 
 
 @pytest.mark.asyncio
-async def test_control_method_does_not_mark_dirty_if_not_ready():
+async def test_control_method_does_not_mark_dirty_if_not_ready() -> None:
     """Test that control_method does not mark state dirty if readiness check fails."""
     equipment = MockEquipment(is_ready=False)
 
@@ -114,7 +114,7 @@ async def test_control_method_does_not_mark_dirty_if_not_ready():
 
 
 @pytest.mark.asyncio
-async def test_control_method_passes_arguments():
+async def test_control_method_passes_arguments() -> None:
     """Test that control_method properly passes arguments to wrapped function."""
     equipment = MockEquipment(is_ready=True)
 
@@ -125,7 +125,7 @@ async def test_control_method_passes_arguments():
 
 
 @pytest.mark.asyncio
-async def test_control_method_passes_kwargs():
+async def test_control_method_passes_kwargs() -> None:
     """Test that control_method properly passes keyword arguments to wrapped function."""
     equipment = MockEquipment(is_ready=True)
 
@@ -138,7 +138,7 @@ async def test_control_method_passes_kwargs():
 
 
 @pytest.mark.asyncio
-async def test_control_method_error_message_for_different_methods():
+async def test_control_method_error_message_for_different_methods() -> None:
     """Test that control_method generates appropriate error messages for different method names."""
     equipment = MockEquipment(is_ready=False)
 
@@ -164,7 +164,7 @@ async def test_control_method_error_message_for_different_methods():
 
 
 @pytest.mark.asyncio
-async def test_control_method_preserves_function_metadata():
+async def test_control_method_preserves_function_metadata() -> None:
     """Test that control_method preserves the wrapped function's metadata."""
     equipment = MockEquipment(is_ready=True)
 
@@ -177,7 +177,7 @@ async def test_control_method_preserves_function_metadata():
 
 
 @pytest.mark.asyncio
-async def test_control_method_without_omni_reference():
+async def test_control_method_without_omni_reference() -> None:
     """Test that control_method logs warning when equipment lacks _omni reference."""
     equipment = MockEquipment(is_ready=True)
     del equipment._omni