Update pyright, fix some imports and tests

Author: jason0x43

custom_components/hubitat/alarm_control_panel.py

@@ -5,6 +5,8 @@
 
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
+)
+from homeassistant.components.alarm_control_panel.const import (
     AlarmControlPanelEntityFeature,
     CodeFormat,
 )

custom_components/hubitat/climate.py

@@ -7,9 +7,6 @@
 from custom_components.hubitat.hubitatmaker.const import DeviceAttribute
 from homeassistant.components.climate import (
     ClimateEntity,
-    ClimateEntityFeature,
-    HVACAction,
-    HVACMode,
 )
 from homeassistant.components.climate.const import (
     ATTR_TARGET_TEMP_HIGH,
@@ -19,6 +16,9 @@
     PRESET_AWAY,
     PRESET_ECO,
     PRESET_HOME,
+    ClimateEntityFeature,
+    HVACAction,
+    HVACMode,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (

custom_components/hubitat/config_flow.py

@@ -11,6 +11,7 @@
     CONN_CLASS_LOCAL_PUSH,
     ConfigEntry,
     ConfigFlow,
+    ConfigFlowResult,
     OptionsFlow,
 )
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_TEMPERATURE_UNIT
@@ -80,7 +81,7 @@ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle the user step."""
         errors: dict[str, str] = {}
 

custom_components/hubitat/device_trigger.py

@@ -1,4 +1,5 @@
 """Provide automation triggers for certain types of Hubitat device."""
+
 import logging
 from itertools import chain
 from json import loads
@@ -7,15 +8,21 @@
 import voluptuous as vol
 
 from custom_components.hubitat.util import get_hubitat_device_id
-from homeassistant.components.automation import (
-    TriggerActionType,
-    TriggerInfo,
-)
 from homeassistant.components.device_automation.exceptions import (
     InvalidDeviceAutomationConfig,
 )
-from homeassistant.const import CONF_DEVICE_ID, CONF_DOMAIN, CONF_PLATFORM, CONF_TYPE
+from homeassistant.const import (
+    CONF_DEVICE_ID,
+    CONF_DOMAIN,
+    CONF_EVENT_DATA,
+    CONF_PLATFORM,
+    CONF_TYPE,
+)
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.trigger import (
+    TriggerActionType,
+    TriggerInfo,
+)
 from homeassistant.helpers.typing import ConfigType
 
 from .const import (
@@ -166,9 +173,9 @@ async def async_attach_trigger(
 
     trigger = event.TRIGGER_SCHEMA(
         {
-            event.CONF_PLATFORM: "event",
+            CONF_PLATFORM: "event",
             event.CONF_EVENT_TYPE: H_CONF_HUBITAT_EVENT,
-            event.CONF_EVENT_DATA: event_data,
+            CONF_EVENT_DATA: event_data,
         }
     )
 

custom_components/hubitat/switch.py

@@ -146,39 +146,37 @@ def is_button_controller(device: Device) -> bool:
     )
 
 
+def is_simple_switch(device: Device, overrides: dict[str, str] | None = None) -> bool:
+    return is_switch(device, overrides) and not is_energy_meter(device, overrides)
+
+
+def is_smart_switch(device: Device, overrides: dict[str, str] | None = None) -> bool:
+    return is_switch(device, overrides) and is_energy_meter(device, overrides)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Initialize switch devices."""
 
-    def _is_simple_switch(
-        device: Device, overrides: dict[str, str] | None = None
-    ) -> bool:
-        return is_switch(device, overrides) and not is_energy_meter(device, overrides)
-
     create_and_add_entities(
         hass,
         config_entry,
         async_add_entities,
         "switch",
         HubitatSwitch,
-        _is_simple_switch,
+        is_simple_switch,
     )
 
-    def _is_smart_switch(
-        device: Device, overrides: dict[str, str] | None = None
-    ) -> bool:
-        return is_switch(device, overrides) and is_energy_meter(device, overrides)
-
     create_and_add_entities(
         hass,
         config_entry,
         async_add_entities,
         "switch",
         HubitatPowerMeterSwitch,
-        _is_smart_switch,
+        is_smart_switch,
     )
 
     create_and_add_event_emitters(hass, config_entry, is_button_controller)

requirements-dev.lock

@@ -200,7 +200,7 @@ pyrfc3339==1.1
     # via acme
 pyric==0.1.6.3
     # via bluetooth-auto-recovery
-pyright==1.1.359
+pyright==1.1.378
     # via hubitat
 pytest==8.0.2
     # via pytest-asyncio

requirements.lock

@@ -12,7 +12,7 @@
 -e file:.
 nodeenv==1.8.0
     # via pyright
-pyright==1.1.359
+pyright==1.1.378
     # via hubitat
 setuptools==69.5.1
     # via nodeenv

tests/test_switch.py

@@ -15,9 +15,13 @@ async def test_setup_entry(create_emitters, create_entities) -> None:
     create_emitters.return_value = None
 
     from custom_components.hubitat.switch import (
+        HubitatAlarm,
         HubitatPowerMeterSwitch,
         HubitatSwitch,
         async_setup_entry,
+        is_alarm,
+        is_simple_switch,
+        is_smart_switch,
     )
 
     mock_hass = Mock(spec=["async_register"])
@@ -33,22 +37,30 @@ def add_entities(_: List[Entity]) -> None:
     assert create_entities.call_count == 3, "expected 3 calls to create entities"
 
     call1 = call(
-        mock_hass, mock_config_entry, mock_add_entities, "switch", HubitatSwitch
+        mock_hass,
+        mock_config_entry,
+        mock_add_entities,
+        "switch",
+        HubitatSwitch,
+        is_simple_switch,
     )
     call2 = call(
         mock_hass,
         mock_config_entry,
         mock_add_entities,
         "switch",
         HubitatPowerMeterSwitch,
+        is_smart_switch,
     )
     call3 = call(
         mock_hass,
         mock_config_entry,
         mock_add_entities,
         "switch",
-        HubitatPowerMeterSwitch,
+        HubitatAlarm,
+        is_alarm,
     )
-    assert create_entities.has_calls([call1, call2, call3])
+
+    create_entities.assert_has_calls([call1, call2, call3])
 
     assert create_emitters.call_count == 1, "expected 1 call to create emitters"