Use VolDictType for service schemas

homeassistant/components/camera/__init__.py

@@ -64,7 +64,7 @@
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.network import get_url
 from homeassistant.helpers.template import Template
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.typing import ConfigType, VolDictType
 from homeassistant.loader import bind_hass
 
 from .const import (  # noqa: F401
@@ -130,14 +130,14 @@ class CameraEntityFeature(IntFlag):
 
 MIN_STREAM_INTERVAL: Final = 0.5  # seconds
 
-CAMERA_SERVICE_SNAPSHOT: Final = {vol.Required(ATTR_FILENAME): cv.template}
+CAMERA_SERVICE_SNAPSHOT: VolDictType = {vol.Required(ATTR_FILENAME): cv.template}
 
-CAMERA_SERVICE_PLAY_STREAM: Final = {
+CAMERA_SERVICE_PLAY_STREAM: VolDictType = {
     vol.Required(ATTR_MEDIA_PLAYER): cv.entities_domain(DOMAIN_MP),
     vol.Optional(ATTR_FORMAT, default="hls"): vol.In(OUTPUT_FORMATS),
 }
 
-CAMERA_SERVICE_RECORD: Final = {
+CAMERA_SERVICE_RECORD: VolDictType = {
     vol.Required(CONF_FILENAME): cv.template,
     vol.Optional(CONF_DURATION, default=30): vol.Coerce(int),
     vol.Optional(CONF_LOOKBACK, default=0): vol.Coerce(int),

homeassistant/components/elkm1/alarm_control_panel.py

@@ -31,6 +31,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.typing import VolDictType
 
 from . import ElkAttachedEntity, ElkEntity, ElkM1ConfigEntry, create_elk_entities
 from .const import (
@@ -41,7 +42,7 @@
 )
 from .models import ELKM1Data
 
-DISPLAY_MESSAGE_SERVICE_SCHEMA = {
+DISPLAY_MESSAGE_SERVICE_SCHEMA: VolDictType = {
     vol.Optional("clear", default=2): vol.All(vol.Coerce(int), vol.In([0, 1, 2])),
     vol.Optional("beep", default=False): cv.boolean,
     vol.Optional("timeout", default=0): vol.All(

homeassistant/components/elkm1/const.py

@@ -6,6 +6,7 @@
 import voluptuous as vol
 
 from homeassistant.const import ATTR_CODE, CONF_ZONE
+from homeassistant.helpers.typing import VolDictType
 
 DOMAIN = "elkm1"
 
@@ -48,6 +49,6 @@
 ATTR_CHANGED_BY_TIME = "changed_by_time"
 ATTR_VALUE = "value"
 
-ELK_USER_CODE_SERVICE_SCHEMA = {
+ELK_USER_CODE_SERVICE_SCHEMA: VolDictType = {
     vol.Required(ATTR_CODE): vol.All(vol.Coerce(int), vol.Range(0, 999999))
 }

homeassistant/components/elkm1/sensor.py

@@ -20,6 +20,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import VolDictType
 
 from . import ElkAttachedEntity, ElkEntity, ElkM1ConfigEntry, create_elk_entities
 from .const import ATTR_VALUE, ELK_USER_CODE_SERVICE_SCHEMA
@@ -30,7 +31,7 @@
 SERVICE_SENSOR_ZONE_TRIGGER = "sensor_zone_trigger"
 UNDEFINED_TEMPERATURE = -40
 
-ELK_SET_COUNTER_SERVICE_SCHEMA = {
+ELK_SET_COUNTER_SERVICE_SCHEMA: VolDictType = {
     vol.Required(ATTR_VALUE): vol.All(vol.Coerce(int), vol.Range(0, 65535))
 }
 

homeassistant/components/environment_canada/camera.py

@@ -11,13 +11,14 @@
     AddEntitiesCallback,
     async_get_current_platform,
 )
+from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import device_info
 from .const import ATTR_OBSERVATION_TIME, DOMAIN
 
 SERVICE_SET_RADAR_TYPE = "set_radar_type"
-SET_RADAR_TYPE_SCHEMA = {
+SET_RADAR_TYPE_SCHEMA: VolDictType = {
     vol.Required("radar_type"): vol.In(["Auto", "Rain", "Snow"]),
 }
 

homeassistant/components/flux_led/light.py

@@ -28,6 +28,7 @@
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.color import (
     color_temperature_kelvin_to_mired,
@@ -88,7 +89,7 @@
 SERVICE_SET_ZONES: Final = "set_zones"
 SERVICE_SET_MUSIC_MODE: Final = "set_music_mode"
 
-CUSTOM_EFFECT_DICT: Final = {
+CUSTOM_EFFECT_DICT: VolDictType = {
     vol.Required(CONF_COLORS): vol.All(
         cv.ensure_list,
         vol.Length(min=1, max=16),
@@ -102,7 +103,7 @@
     ),
 }
 
-SET_MUSIC_MODE_DICT: Final = {
+SET_MUSIC_MODE_DICT: VolDictType = {
     vol.Optional(ATTR_SENSITIVITY, default=100): vol.All(
         vol.Coerce(int), vol.Range(min=0, max=100)
     ),
@@ -121,7 +122,7 @@
     ),
 }
 
-SET_ZONES_DICT: Final = {
+SET_ZONES_DICT: VolDictType = {
     vol.Required(CONF_COLORS): vol.All(
         cv.ensure_list,
         vol.Length(min=1, max=2048),

homeassistant/components/geniushub/switch.py

@@ -11,15 +11,15 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, VolDictType
 
 from . import ATTR_DURATION, DOMAIN, GeniusZone
 
 GH_ON_OFF_ZONE = "on / off"
 
 SVC_SET_SWITCH_OVERRIDE = "set_switch_override"
 
-SET_SWITCH_OVERRIDE_SCHEMA = {
+SET_SWITCH_OVERRIDE_SCHEMA: VolDictType = {
     vol.Optional(ATTR_DURATION): vol.All(
         cv.time_period,
         vol.Range(min=timedelta(minutes=5), max=timedelta(days=1)),

homeassistant/components/harmony/remote.py

@@ -26,6 +26,7 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.helpers.typing import VolDictType
 
 from .const import (
     ACTIVITY_POWER_OFF,
@@ -50,7 +51,7 @@
 
 ATTR_CHANNEL = "channel"
 
-HARMONY_CHANGE_CHANNEL_SCHEMA = {
+HARMONY_CHANGE_CHANNEL_SCHEMA: VolDictType = {
     vol.Required(ATTR_CHANNEL): cv.positive_int,
 }
 

homeassistant/components/isy994/services.py

@@ -18,6 +18,7 @@
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import async_get_platforms
 from homeassistant.helpers.service import entity_service_call
+from homeassistant.helpers.typing import VolDictType
 
 from .const import _LOGGER, DOMAIN
 
@@ -102,12 +103,14 @@ def valid_isy_commands(value: Any) -> str:
     vol.Required(CONF_SIZE): vol.All(vol.Coerce(int), vol.In(VALID_PARAMETER_SIZES)),
 }
 
-SERVICE_SET_USER_CODE_SCHEMA = {
+SERVICE_SET_USER_CODE_SCHEMA: VolDictType = {
     vol.Required(CONF_USER_NUM): vol.Coerce(int),
     vol.Required(CONF_CODE): vol.Coerce(int),
 }
 
-SERVICE_DELETE_USER_CODE_SCHEMA = {vol.Required(CONF_USER_NUM): vol.Coerce(int)}
+SERVICE_DELETE_USER_CODE_SCHEMA: VolDictType = {
+    vol.Required(CONF_USER_NUM): vol.Coerce(int)
+}
 
 SERVICE_SEND_PROGRAM_COMMAND_SCHEMA = vol.All(
     cv.has_at_least_one_key(CONF_ADDRESS, CONF_NAME),

homeassistant/components/izone/climate.py

@@ -35,7 +35,7 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.temperature import display_temp as show_temp
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.typing import ConfigType, VolDictType
 
 from .const import (
     DATA_CONFIG,
@@ -65,7 +65,7 @@
 IZONE_SERVICE_AIRFLOW_MIN = "airflow_min"
 IZONE_SERVICE_AIRFLOW_MAX = "airflow_max"
 
-IZONE_SERVICE_AIRFLOW_SCHEMA = {
+IZONE_SERVICE_AIRFLOW_SCHEMA: VolDictType = {
     vol.Required(ATTR_AIRFLOW): vol.All(
         vol.Coerce(int), vol.Range(min=0, max=100), msg="invalid airflow"
     ),

homeassistant/components/keymitt_ble/switch.py

@@ -14,13 +14,14 @@
     AddEntitiesCallback,
     async_get_current_platform,
 )
+from homeassistant.helpers.typing import VolDictType
 
 from .const import DOMAIN
 from .coordinator import MicroBotDataUpdateCoordinator
 from .entity import MicroBotEntity
 
 CALIBRATE = "calibrate"
-CALIBRATE_SCHEMA = {
+CALIBRATE_SCHEMA: VolDictType = {
     vol.Required("depth"): cv.positive_int,
     vol.Required("duration"): cv.positive_int,
     vol.Required("mode"): vol.In(["normal", "invert", "toggle"]),

homeassistant/components/kodi/media_player.py

@@ -49,7 +49,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.network import is_internal_request
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, VolDictType
 import homeassistant.util.dt as dt_util
 
 from .browse_media import (
@@ -147,7 +147,7 @@
 ATTR_METHOD = "method"
 
 
-KODI_ADD_MEDIA_SCHEMA = {
+KODI_ADD_MEDIA_SCHEMA: VolDictType = {
     vol.Required(ATTR_MEDIA_TYPE): cv.string,
     vol.Optional(ATTR_MEDIA_ID): cv.string,
     vol.Optional(ATTR_MEDIA_NAME): cv.string,

homeassistant/components/lifx/light.py

@@ -25,6 +25,7 @@
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
+from homeassistant.helpers.typing import VolDictType
 
 from .const import (
     _LOGGER,
@@ -53,7 +54,7 @@
 
 SERVICE_LIFX_SET_STATE = "set_state"
 
-LIFX_SET_STATE_SCHEMA = {
+LIFX_SET_STATE_SCHEMA: VolDictType = {
     **LIGHT_TURN_ON_SCHEMA,
     ATTR_INFRARED: vol.All(vol.Coerce(int), vol.Clamp(min=0, max=255)),
     ATTR_ZONES: vol.All(cv.ensure_list, [cv.positive_int]),
@@ -63,7 +64,7 @@
 
 SERVICE_LIFX_SET_HEV_CYCLE_STATE = "set_hev_cycle_state"
 
-LIFX_SET_HEV_CYCLE_STATE_SCHEMA = {
+LIFX_SET_HEV_CYCLE_STATE_SCHEMA: VolDictType = {
     ATTR_POWER: vol.Required(cv.boolean),
     ATTR_DURATION: vol.All(vol.Coerce(float), vol.Clamp(min=0, max=86400)),
 }

homeassistant/components/light/__init__.py

@@ -31,7 +31,7 @@
 )
 from homeassistant.helpers.entity import ToggleEntity, ToggleEntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.typing import ConfigType, VolDictType
 from homeassistant.loader import bind_hass
 import homeassistant.util.color as color_util
 
@@ -247,7 +247,7 @@ def get_supported_color_modes(hass: HomeAssistant, entity_id: str) -> set[str] |
 VALID_BRIGHTNESS_STEP_PCT = vol.All(vol.Coerce(float), vol.Clamp(min=-100, max=100))
 VALID_FLASH = vol.In([FLASH_SHORT, FLASH_LONG])
 
-LIGHT_TURN_ON_SCHEMA = {
+LIGHT_TURN_ON_SCHEMA: VolDictType = {
     vol.Exclusive(ATTR_PROFILE, COLOR_GROUP): cv.string,
     ATTR_TRANSITION: VALID_TRANSITION,
     vol.Exclusive(ATTR_BRIGHTNESS, ATTR_BRIGHTNESS): VALID_BRIGHTNESS,
@@ -286,7 +286,10 @@ def get_supported_color_modes(hass: HomeAssistant, entity_id: str) -> set[str] |
     ATTR_EFFECT: cv.string,
 }
 
-LIGHT_TURN_OFF_SCHEMA = {ATTR_TRANSITION: VALID_TRANSITION, ATTR_FLASH: VALID_FLASH}
+LIGHT_TURN_OFF_SCHEMA: VolDictType = {
+    ATTR_TRANSITION: VALID_TRANSITION,
+    ATTR_FLASH: VALID_FLASH,
+}
 
 
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/lyric/climate.py

@@ -37,6 +37,7 @@
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from . import LyricDeviceEntity
@@ -111,7 +112,7 @@
 SERVICE_HOLD_TIME = "set_hold_time"
 ATTR_TIME_PERIOD = "time_period"
 
-SCHEMA_HOLD_TIME = {
+SCHEMA_HOLD_TIME: VolDictType = {
     vol.Required(ATTR_TIME_PERIOD, default="01:00:00"): vol.All(
         cv.time_period,
         cv.positive_timedelta,

homeassistant/components/motion_blinds/cover.py

@@ -20,6 +20,7 @@
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import async_call_later
+from homeassistant.helpers.typing import VolDictType
 
 from .const import (
     ATTR_ABSOLUTE_POSITION,
@@ -75,7 +76,7 @@
 }
 
 
-SET_ABSOLUTE_POSITION_SCHEMA = {
+SET_ABSOLUTE_POSITION_SCHEMA: VolDictType = {
     vol.Required(ATTR_ABSOLUTE_POSITION): vol.All(cv.positive_int, vol.Range(max=100)),
     vol.Optional(ATTR_TILT_POSITION): vol.All(cv.positive_int, vol.Range(max=100)),
     vol.Optional(ATTR_WIDTH): vol.All(cv.positive_int, vol.Range(max=100)),

homeassistant/components/nexia/climate.py

@@ -37,6 +37,7 @@
 from homeassistant.helpers import entity_platform
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import VolDictType
 
 from .const import (
     ATTR_AIRCLEANER_MODE,
@@ -55,11 +56,11 @@
 SERVICE_SET_HUMIDIFY_SETPOINT = "set_humidify_setpoint"
 SERVICE_SET_HVAC_RUN_MODE = "set_hvac_run_mode"
 
-SET_AIRCLEANER_SCHEMA = {
+SET_AIRCLEANER_SCHEMA: VolDictType = {
     vol.Required(ATTR_AIRCLEANER_MODE): cv.string,
 }
 
-SET_HUMIDITY_SCHEMA = {
+SET_HUMIDITY_SCHEMA: VolDictType = {
     vol.Required(ATTR_HUMIDITY): vol.All(vol.Coerce(int), vol.Range(min=35, max=65)),
 }
 

homeassistant/components/rainbird/switch.py

@@ -14,6 +14,7 @@
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import VolDictType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import ATTR_DURATION, CONF_IMPORTED_NAMES, DOMAIN, MANUFACTURER
@@ -23,7 +24,7 @@
 
 SERVICE_START_IRRIGATION = "start_irrigation"
 
-SERVICE_SCHEMA_IRRIGATION = {
+SERVICE_SCHEMA_IRRIGATION: VolDictType = {
     vol.Required(ATTR_DURATION): cv.positive_float,
 }
 

homeassistant/components/rainmachine/switch.py

@@ -6,7 +6,7 @@
 from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Any, Concatenate
+from typing import Any, Concatenate, cast
 
 from regenmaschine.errors import RainMachineError
 import voluptuous as vol
@@ -18,6 +18,7 @@
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import VolDictType
 
 from . import RainMachineData, RainMachineEntity, async_update_programs_and_zones
 from .const import (
@@ -191,7 +192,8 @@ async def async_setup_entry(
         ("stop_program", {}, "async_stop_program"),
         ("stop_zone", {}, "async_stop_zone"),
     ):
-        platform.async_register_entity_service(service_name, schema, method)
+        schema_dict = cast(VolDictType, schema)
+        platform.async_register_entity_service(service_name, schema_dict, method)
 
     data: RainMachineData = hass.data[DOMAIN][entry.entry_id]
     entities: list[RainMachineBaseSwitch] = []