homeassistant 2025.9.4__py3-none-any.whl → 2025.10.0b0__py3-none-any.whl

homeassistant/components/mqtt/config_flow.py

@@ -39,6 +39,7 @@ from homeassistant.components.climate import (
 from homeassistant.components.cover import CoverDeviceClass
 from homeassistant.components.file_upload import process_uploaded_file
 from homeassistant.components.hassio import AddonError, AddonManager, AddonState
+from homeassistant.components.image import DEFAULT_CONTENT_TYPE
 from homeassistant.components.light import (
     DEFAULT_MAX_KELVIN,
     DEFAULT_MIN_KELVIN,
@@ -167,6 +168,7 @@ from .const import (
     CONF_COMMAND_ON_TEMPLATE,
     CONF_COMMAND_TEMPLATE,
     CONF_COMMAND_TOPIC,
+    CONF_CONTENT_TYPE,
     CONF_CURRENT_HUMIDITY_TEMPLATE,
     CONF_CURRENT_HUMIDITY_TOPIC,
     CONF_CURRENT_TEMP_TEMPLATE,
@@ -205,6 +207,8 @@ from .const import (
     CONF_HUMIDITY_MIN,
     CONF_HUMIDITY_STATE_TEMPLATE,
     CONF_HUMIDITY_STATE_TOPIC,
+    CONF_IMAGE_ENCODING,
+    CONF_IMAGE_TOPIC,
     CONF_KEEPALIVE,
     CONF_LAST_RESET_VALUE_TEMPLATE,
     CONF_MAX_KELVIN,
@@ -330,6 +334,8 @@ from .const import (
     CONF_TLS_INSECURE,
     CONF_TRANSITION,
     CONF_TRANSPORT,
+    CONF_URL_TEMPLATE,
+    CONF_URL_TOPIC,
     CONF_WHITE_COMMAND_TOPIC,
     CONF_WHITE_SCALE,
     CONF_WILL_MESSAGE,
@@ -421,21 +427,73 @@ ADVANCED_OPTIONS = "advanced_options"
 SET_CA_CERT = "set_ca_cert"
 SET_CLIENT_CERT = "set_client_cert"
 
+CA_VERIFICATION_MODES = [
+    "off",
+    "auto",
+    "custom",
+]
+
+SUBENTRY_PLATFORMS = [
+    Platform.ALARM_CONTROL_PANEL,
+    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
+    Platform.CLIMATE,
+    Platform.COVER,
+    Platform.FAN,
+    Platform.IMAGE,
+    Platform.LIGHT,
+    Platform.LOCK,
+    Platform.NOTIFY,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
+
+_CODE_VALIDATION_MODE = {
+    "remote_code": REMOTE_CODE,
+    "remote_code_text": REMOTE_CODE_TEXT,
+}
+EXCLUDE_FROM_CONFIG_IF_NONE = {CONF_ENTITY_CATEGORY}
+PWD_NOT_CHANGED = "__**password_not_changed**__"
+
+# Common selectors
 BOOLEAN_SELECTOR = BooleanSelector()
+TEMPLATE_SELECTOR = TemplateSelector(TemplateSelectorConfig())
+TEMPLATE_SELECTOR_READ_ONLY = TemplateSelector(TemplateSelectorConfig(read_only=True))
 TEXT_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.TEXT))
 TEXT_SELECTOR_READ_ONLY = TextSelector(
     TextSelectorConfig(type=TextSelectorType.TEXT, read_only=True)
 )
-URL_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.URL))
-PUBLISH_TOPIC_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.TEXT))
-PORT_SELECTOR = vol.All(
-    NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=1, max=65535)),
-    vol.Coerce(int),
+OPTIONS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[],
+        custom_value=True,
+        multiple=True,
+    )
 )
 PASSWORD_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.PASSWORD))
 QOS_SELECTOR = NumberSelector(
     NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=2)
 )
+URL_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.URL))
+
+# Config flow specific selectors
+BROKER_VERIFICATION_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=CA_VERIFICATION_MODES,
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key=SET_CA_CERT,
+    )
+)
+# mime configuration from https://pki-tutorial.readthedocs.io/en/latest/mime.html
+CA_CERT_UPLOAD_SELECTOR = FileSelector(
+    FileSelectorConfig(accept=".pem,.crt,.cer,.der,application/x-x509-ca-cert")
+)
+CERT_KEY_UPLOAD_SELECTOR = FileSelector(
+    FileSelectorConfig(accept=".pem,.key,.der,.pk8,application/pkcs8")
+)
+CERT_UPLOAD_SELECTOR = FileSelector(
+    FileSelectorConfig(accept=".pem,.crt,.cer,.der,application/x-x509-user-cert")
+)
 KEEPALIVE_SELECTOR = vol.All(
     NumberSelector(
         NumberSelectorConfig(
@@ -444,12 +502,17 @@ KEEPALIVE_SELECTOR = vol.All(
     ),
     vol.Coerce(int),
 )
+PORT_SELECTOR = vol.All(
+    NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=1, max=65535)),
+    vol.Coerce(int),
+)
 PROTOCOL_SELECTOR = SelectSelector(
     SelectSelectorConfig(
         options=SUPPORTED_PROTOCOLS,
         mode=SelectSelectorMode.DROPDOWN,
     )
 )
+PUBLISH_TOPIC_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.TEXT))
 SUPPORTED_TRANSPORTS = [
     SelectOptionDict(value=TRANSPORT_TCP, label="TCP"),
     SelectOptionDict(value=TRANSPORT_WEBSOCKETS, label="WebSocket"),
@@ -463,54 +526,16 @@ TRANSPORT_SELECTOR = SelectSelector(
 WS_HEADERS_SELECTOR = TextSelector(
     TextSelectorConfig(type=TextSelectorType.TEXT, multiline=True)
 )
-CA_VERIFICATION_MODES = [
-    "off",
-    "auto",
-    "custom",
-]
-BROKER_VERIFICATION_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=CA_VERIFICATION_MODES,
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key=SET_CA_CERT,
-    )
-)
 
-# mime configuration from https://pki-tutorial.readthedocs.io/en/latest/mime.html
-CA_CERT_UPLOAD_SELECTOR = FileSelector(
-    FileSelectorConfig(accept=".pem,.crt,.cer,.der,application/x-x509-ca-cert")
-)
-CERT_UPLOAD_SELECTOR = FileSelector(
-    FileSelectorConfig(accept=".pem,.crt,.cer,.der,application/x-x509-user-cert")
-)
-KEY_UPLOAD_SELECTOR = FileSelector(
-    FileSelectorConfig(accept=".pem,.key,.der,.pk8,application/pkcs8")
-)
-
-# Subentry selectors
-SUBENTRY_PLATFORMS = [
-    Platform.ALARM_CONTROL_PANEL,
-    Platform.BINARY_SENSOR,
-    Platform.BUTTON,
-    Platform.CLIMATE,
-    Platform.COVER,
-    Platform.FAN,
-    Platform.LIGHT,
-    Platform.LOCK,
-    Platform.NOTIFY,
-    Platform.SENSOR,
-    Platform.SWITCH,
-]
-SUBENTRY_PLATFORM_SELECTOR = SelectSelector(
+# MQTT device subentry selectors
+ENTITY_CATEGORY_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=[platform.value for platform in SUBENTRY_PLATFORMS],
+        options=[category.value for category in EntityCategory],
         mode=SelectSelectorMode.DROPDOWN,
-        translation_key=CONF_PLATFORM,
+        translation_key=CONF_ENTITY_CATEGORY,
+        sort=True,
     )
 )
-TEMPLATE_SELECTOR = TemplateSelector(TemplateSelectorConfig())
-TEMPLATE_SELECTOR_READ_ONLY = TemplateSelector(TemplateSelectorConfig(read_only=True))
-
 SUBENTRY_AVAILABILITY_SCHEMA = vol.Schema(
     {
         vol.Optional(CONF_AVAILABILITY_TOPIC): TEXT_SELECTOR,
@@ -523,69 +548,11 @@ SUBENTRY_AVAILABILITY_SCHEMA = vol.Schema(
         ): TEXT_SELECTOR,
     }
 )
-ENTITY_CATEGORY_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[category.value for category in EntityCategory],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key=CONF_ENTITY_CATEGORY,
-        sort=True,
-    )
-)
-
-# Sensor specific selectors
-SENSOR_DEVICE_CLASS_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[device_class.value for device_class in SensorDeviceClass],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key="device_class_sensor",
-        sort=True,
-    )
-)
-BINARY_SENSOR_DEVICE_CLASS_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[device_class.value for device_class in BinarySensorDeviceClass],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key="device_class_binary_sensor",
-        sort=True,
-    )
-)
-SENSOR_ENTITY_CATEGORY_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[EntityCategory.DIAGNOSTIC.value],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key=CONF_ENTITY_CATEGORY,
-        sort=True,
-    )
-)
-
-BUTTON_DEVICE_CLASS_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[device_class.value for device_class in ButtonDeviceClass],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key="device_class_button",
-        sort=True,
-    )
-)
-COVER_DEVICE_CLASS_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[device_class.value for device_class in CoverDeviceClass],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key="device_class_cover",
-        sort=True,
-    )
-)
-SENSOR_STATE_CLASS_SELECTOR = SelectSelector(
+SUBENTRY_PLATFORM_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=[device_class.value for device_class in SensorStateClass],
+        options=[platform.value for platform in SUBENTRY_PLATFORMS],
         mode=SelectSelectorMode.DROPDOWN,
-        translation_key=CONF_STATE_CLASS,
-    )
-)
-OPTIONS_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[],
-        custom_value=True,
-        multiple=True,
+        translation_key=CONF_PLATFORM,
     )
 )
 SUGGESTED_DISPLAY_PRECISION_SELECTOR = NumberSelector(
@@ -595,7 +562,7 @@ TIMEOUT_SELECTOR = NumberSelector(
     NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0)
 )
 
-# Alarm control panel selectors
+# Entity platform specific selectors
 ALARM_CONTROL_PANEL_FEATURES_SELECTOR = SelectSelector(
     SelectSelectorConfig(
         options=list(ALARM_CONTROL_PANEL_SUPPORTED_FEATURES),
@@ -609,64 +576,37 @@ ALARM_CONTROL_PANEL_CODE_MODE = SelectSelector(
         translation_key="alarm_control_panel_code_mode",
     )
 )
-
-# Climate specific selectors
-CLIMATE_MODE_SELECTOR = SelectSelector(
+BINARY_SENSOR_DEVICE_CLASS_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=["auto", "off", "cool", "heat", "dry", "fan_only"],
-        multiple=True,
-        translation_key="climate_modes",
+        options=[device_class.value for device_class in BinarySensorDeviceClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_binary_sensor",
+        sort=True,
     )
 )
-
-
-@callback
-def temperature_selector(config: dict[str, Any]) -> Selector:
-    """Return a temperature selector with configured or system unit."""
-
-    return NumberSelector(
-        NumberSelectorConfig(
-            mode=NumberSelectorMode.BOX,
-            unit_of_measurement=cv.temperature_unit(config[CONF_TEMPERATURE_UNIT]),
-        )
-    )
-
-
-@callback
-def temperature_step_selector(config: dict[str, Any]) -> Selector:
-    """Return a temperature step selector."""
-
-    return NumberSelector(
-        NumberSelectorConfig(
-            mode=NumberSelectorMode.BOX,
-            min=0.1,
-            max=10.0,
-            step=0.1,
-            unit_of_measurement=cv.temperature_unit(config[CONF_TEMPERATURE_UNIT]),
-        )
-    )
-
-
-TEMPERATURE_UNIT_SELECTOR = SelectSelector(
+BUTTON_DEVICE_CLASS_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=[
-            SelectOptionDict(value="C", label="°C"),
-            SelectOptionDict(value="F", label="°F"),
-        ],
+        options=[device_class.value for device_class in ButtonDeviceClass],
         mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_button",
+        sort=True,
     )
 )
-PRECISION_SELECTOR = SelectSelector(
+CLIMATE_MODE_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=["1.0", "0.5", "0.1"],
+        options=["auto", "off", "cool", "heat", "dry", "fan_only"],
+        multiple=True,
+        translation_key="climate_modes",
+    )
+)
+COVER_DEVICE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in CoverDeviceClass],
         mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_cover",
+        sort=True,
     )
 )
-
-# Cover specific selectors
-POSITION_SELECTOR = NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX))
-
-# Fan specific selectors
 FAN_SPEED_RANGE_MIN_SELECTOR = vol.All(
     NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=1)),
     vol.Coerce(int),
@@ -675,22 +615,53 @@ FAN_SPEED_RANGE_MAX_SELECTOR = vol.All(
     NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=2)),
     vol.Coerce(int),
 )
-PRESET_MODES_SELECTOR = OPTIONS_SELECTOR
-
-# Switch specific selectors
-SWITCH_DEVICE_CLASS_SELECTOR = SelectSelector(
+FLASH_TIME_SELECTOR = NumberSelector(
+    NumberSelectorConfig(
+        mode=NumberSelectorMode.BOX,
+        min=1,
+    )
+)
+HUMIDITY_SELECTOR = vol.All(
+    NumberSelector(
+        NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=100, step=1)
+    ),
+    vol.Coerce(int),
+)
+IMAGE_CONTENT_TYPE_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=[device_class.value for device_class in SwitchDeviceClass],
+        options=[
+            SelectOptionDict(
+                value="image/jpeg", label="Joint Photographic Expert Group image (JPEG)"
+            ),
+            SelectOptionDict(
+                value="image/png", label="Portable Network Graphics (PNG)"
+            ),
+            SelectOptionDict(
+                value="image/apng", label="Animated Portable Network Graphics (APNG)"
+            ),
+            SelectOptionDict(value="image/avif", label="AV1 Image File Format (AVIF)"),
+            SelectOptionDict(
+                value="image/gif", label="Graphics Interchange Format (GIF)"
+            ),
+            SelectOptionDict(
+                value="image/svg+xml", label="Scalable Vector Graphics (SVG)"
+            ),
+            SelectOptionDict(value="image/webp", label="Web Picture format (WEBP)"),
+        ],
         mode=SelectSelectorMode.DROPDOWN,
-        translation_key="device_class_switch",
     )
 )
-
-# Light specific selectors
-LIGHT_SCHEMA_SELECTOR = SelectSelector(
+IMAGE_ENCODING_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=["basic", "json", "template"],
-        translation_key="light_schema",
+        options=["raw", "b64"],
+        translation_key="image_encoding",
+        mode=SelectSelectorMode.DROPDOWN,
+    )
+)
+IMAGE_PROCESSING_MODE_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=["image_url", "image_data"],
+        translation_key="image_processing_mode",
     )
 )
 KELVIN_SELECTOR = NumberSelector(
@@ -702,6 +673,28 @@ KELVIN_SELECTOR = NumberSelector(
         unit_of_measurement="K",
     )
 )
+LIGHT_SCHEMA_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=["basic", "json", "template"],
+        translation_key="light_schema",
+    )
+)
+ON_COMMAND_TYPE_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=VALUES_ON_COMMAND_TYPE,
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key=CONF_ON_COMMAND_TYPE,
+        sort=True,
+    )
+)
+POSITION_SELECTOR = NumberSelector(NumberSelectorConfig(mode=NumberSelectorMode.BOX))
+PRECISION_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=["1.0", "0.5", "0.1"],
+        mode=SelectSelectorMode.DROPDOWN,
+    )
+)
+PRESET_MODES_SELECTOR = OPTIONS_SELECTOR
 SCALE_SELECTOR = NumberSelector(
     NumberSelectorConfig(
         mode=NumberSelectorMode.BOX,
@@ -710,20 +703,29 @@ SCALE_SELECTOR = NumberSelector(
         step=1,
     )
 )
-FLASH_TIME_SELECTOR = NumberSelector(
-    NumberSelectorConfig(
-        mode=NumberSelectorMode.BOX,
-        min=1,
+SENSOR_DEVICE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in SensorDeviceClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_sensor",
+        sort=True,
     )
 )
-ON_COMMAND_TYPE_SELECTOR = SelectSelector(
+SENSOR_ENTITY_CATEGORY_SELECTOR = SelectSelector(
     SelectSelectorConfig(
-        options=VALUES_ON_COMMAND_TYPE,
+        options=[EntityCategory.DIAGNOSTIC.value],
         mode=SelectSelectorMode.DROPDOWN,
-        translation_key=CONF_ON_COMMAND_TYPE,
+        translation_key=CONF_ENTITY_CATEGORY,
         sort=True,
     )
 )
+SENSOR_STATE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in SensorStateClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key=CONF_STATE_CLASS,
+    )
+)
 SUPPORTED_COLOR_MODES_SELECTOR = SelectSelector(
     SelectSelectorConfig(
         options=[platform.value for platform in VALID_COLOR_MODES],
@@ -733,11 +735,31 @@ SUPPORTED_COLOR_MODES_SELECTOR = SelectSelector(
         sort=True,
     )
 )
-
-EXCLUDE_FROM_CONFIG_IF_NONE = {CONF_ENTITY_CATEGORY}
+SWITCH_DEVICE_CLASS_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[device_class.value for device_class in SwitchDeviceClass],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key="device_class_switch",
+    )
+)
+TARGET_TEMPERATURE_FEATURE_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=["single", "high_low", "none"],
+        mode=SelectSelectorMode.DROPDOWN,
+        translation_key="target_temperature_feature",
+    )
+)
+TEMPERATURE_UNIT_SELECTOR = SelectSelector(
+    SelectSelectorConfig(
+        options=[
+            SelectOptionDict(value="C", label="°C"),
+            SelectOptionDict(value="F", label="°F"),
+        ],
+        mode=SelectSelectorMode.DROPDOWN,
+    )
+)
 
 
-# Target temperature feature selector
 @callback
 def configured_target_temperature_feature(config: dict[str, Any]) -> str:
     """Calculate current target temperature feature from config."""
@@ -752,26 +774,6 @@ def configured_target_temperature_feature(config: dict[str, Any]) -> str:
     return "none"
 
 
-TARGET_TEMPERATURE_FEATURE_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=["single", "high_low", "none"],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key="target_temperature_feature",
-    )
-)
-HUMIDITY_SELECTOR = vol.All(
-    NumberSelector(
-        NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=100, step=1)
-    ),
-    vol.Coerce(int),
-)
-
-_CODE_VALIDATION_MODE = {
-    "remote_code": REMOTE_CODE,
-    "remote_code_text": REMOTE_CODE_TEXT,
-}
-
-
 @callback
 def default_alarm_control_panel_code(config: dict[str, Any]) -> str:
     """Return alarm control panel code based on the stored code and code mode."""
@@ -786,6 +788,29 @@ def default_alarm_control_panel_code(config: dict[str, Any]) -> str:
     return code
 
 
+@callback
+def default_precision(config: dict[str, Any]) -> str:
+    """Return the thermostat precision for system default unit."""
+
+    return str(
+        config.get(
+            CONF_PRECISION,
+            0.1
+            if cv.temperature_unit(config[CONF_TEMPERATURE_UNIT])
+            is UnitOfTemperature.CELSIUS
+            else 1.0,
+        )
+    )
+
+
+@callback
+def no_empty_list(value: list[Any]) -> list[Any]:
+    """Validate a selector returns at least one item."""
+    if not value:
+        raise vol.Invalid("empty_list_not_allowed")
+    return value
+
+
 @callback
 def temperature_default_from_celsius_to_system_default(
     value: float,
@@ -805,20 +830,87 @@ def temperature_default_from_celsius_to_system_default(
 
 
 @callback
-def default_precision(config: dict[str, Any]) -> str:
-    """Return the thermostat precision for system default unit."""
+def temperature_selector(config: dict[str, Any]) -> Selector:
+    """Return a temperature selector with configured or system unit."""
 
-    return str(
-        config.get(
-            CONF_PRECISION,
-            0.1
-            if cv.temperature_unit(config[CONF_TEMPERATURE_UNIT])
-            is UnitOfTemperature.CELSIUS
-            else 1.0,
+    return NumberSelector(
+        NumberSelectorConfig(
+            mode=NumberSelectorMode.BOX,
+            unit_of_measurement=cv.temperature_unit(config[CONF_TEMPERATURE_UNIT]),
+        )
+    )
+
+
+@callback
+def temperature_step_selector(config: dict[str, Any]) -> Selector:
+    """Return a temperature step selector."""
+
+    return NumberSelector(
+        NumberSelectorConfig(
+            mode=NumberSelectorMode.BOX,
+            min=0.1,
+            max=10.0,
+            step=0.1,
+            unit_of_measurement=cv.temperature_unit(config[CONF_TEMPERATURE_UNIT]),
         )
     )
 
 
+@callback
+def unit_of_measurement_selector(user_data: dict[str, Any | None]) -> Selector:
+    """Return a context based unit of measurement selector."""
+
+    if (state_class := user_data.get(CONF_STATE_CLASS)) in STATE_CLASS_UNITS:
+        return SelectSelector(
+            SelectSelectorConfig(
+                options=[str(uom) for uom in STATE_CLASS_UNITS[state_class]],
+                sort=True,
+                custom_value=True,
+            )
+        )
+
+    if (
+        device_class := user_data.get(CONF_DEVICE_CLASS)
+    ) is None or device_class not in DEVICE_CLASS_UNITS:
+        return TEXT_SELECTOR
+    return SelectSelector(
+        SelectSelectorConfig(
+            options=[str(uom) for uom in DEVICE_CLASS_UNITS[device_class]],
+            sort=True,
+            custom_value=True,
+        )
+    )
+
+
+@callback
+def validate(validator: Callable[[Any], Any]) -> Callable[[Any], Any]:
+    """Run validator, then return the unmodified input."""
+
+    def _validate(value: Any) -> Any:
+        validator(value)
+        return value
+
+    return _validate
+
+
+@callback
+def validate_field(
+    field: str,
+    validator: Callable[..., Any],
+    user_input: dict[str, Any] | None,
+    errors: dict[str, str],
+    error: str,
+) -> None:
+    """Validate a single field."""
+    if user_input is None or field not in user_input or validator is None:
+        return
+    try:
+        user_input[field] = validator(user_input[field])
+    except (ValueError, vol.Error, vol.Invalid):
+        errors[field] = error
+
+
+# Entity platform config validation
 @callback
 def validate_climate_platform_config(config: dict[str, Any]) -> dict[str, str]:
     """Validate the climate platform options."""
@@ -902,6 +994,17 @@ def validate_fan_platform_config(config: dict[str, Any]) -> dict[str, str]:
     return errors
 
 
+@callback
+def validate_light_platform_config(user_data: dict[str, Any]) -> dict[str, str]:
+    """Validate MQTT light configuration."""
+    errors: dict[str, Any] = {}
+    if user_data.get(CONF_MIN_KELVIN, DEFAULT_MIN_KELVIN) >= user_data.get(
+        CONF_MAX_KELVIN, DEFAULT_MAX_KELVIN
+    ):
+        errors["advanced_settings"] = "max_below_min_kelvin"
+    return errors
+
+
 @callback
 def validate_sensor_platform_config(
     config: dict[str, Any],
@@ -944,29 +1047,29 @@ def validate_sensor_platform_config(
         (state_class := config.get(CONF_STATE_CLASS)) is not None
         and state_class in STATE_CLASS_UNITS
         and config.get(CONF_UNIT_OF_MEASUREMENT) not in STATE_CLASS_UNITS[state_class]
-    ):
-        errors[CONF_UNIT_OF_MEASUREMENT] = "invalid_uom_for_state_class"
-
-    return errors
-
-
-@callback
-def no_empty_list(value: list[Any]) -> list[Any]:
-    """Validate a selector returns at least one item."""
-    if not value:
-        raise vol.Invalid("empty_list_not_allowed")
-    return value
-
+    ):
+        errors[CONF_UNIT_OF_MEASUREMENT] = "invalid_uom_for_state_class"
 
-@callback
-def validate(validator: Callable[[Any], Any]) -> Callable[[Any], Any]:
-    """Run validator, then return the unmodified input."""
+    return errors
 
-    def _validate(value: Any) -> Any:
-        validator(value)
-        return value
 
-    return _validate
+ENTITY_CONFIG_VALIDATOR: dict[
+    str,
+    Callable[[dict[str, Any]], dict[str, str]] | None,
+] = {
+    Platform.ALARM_CONTROL_PANEL: None,
+    Platform.BINARY_SENSOR.value: None,
+    Platform.BUTTON.value: None,
+    Platform.CLIMATE.value: validate_climate_platform_config,
+    Platform.COVER.value: validate_cover_platform_config,
+    Platform.FAN.value: validate_fan_platform_config,
+    Platform.IMAGE.value: None,
+    Platform.LIGHT.value: validate_light_platform_config,
+    Platform.LOCK.value: None,
+    Platform.NOTIFY.value: None,
+    Platform.SENSOR.value: validate_sensor_platform_config,
+    Platform.SWITCH.value: None,
+}
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -989,43 +1092,6 @@ class PlatformField:
     section: str | None = None
 
 
-@callback
-def unit_of_measurement_selector(user_data: dict[str, Any | None]) -> Selector:
-    """Return a context based unit of measurement selector."""
-
-    if (state_class := user_data.get(CONF_STATE_CLASS)) in STATE_CLASS_UNITS:
-        return SelectSelector(
-            SelectSelectorConfig(
-                options=[str(uom) for uom in STATE_CLASS_UNITS[state_class]],
-                sort=True,
-                custom_value=True,
-            )
-        )
-
-    if (
-        device_class := user_data.get(CONF_DEVICE_CLASS)
-    ) is None or device_class not in DEVICE_CLASS_UNITS:
-        return TEXT_SELECTOR
-    return SelectSelector(
-        SelectSelectorConfig(
-            options=[str(uom) for uom in DEVICE_CLASS_UNITS[device_class]],
-            sort=True,
-            custom_value=True,
-        )
-    )
-
-
-@callback
-def validate_light_platform_config(user_data: dict[str, Any]) -> dict[str, str]:
-    """Validate MQTT light configuration."""
-    errors: dict[str, Any] = {}
-    if user_data.get(CONF_MIN_KELVIN, DEFAULT_MIN_KELVIN) >= user_data.get(
-        CONF_MAX_KELVIN, DEFAULT_MAX_KELVIN
-    ):
-        errors["advanced_settings"] = "max_below_min_kelvin"
-    return errors
-
-
 COMMON_ENTITY_FIELDS: dict[str, PlatformField] = {
     CONF_PLATFORM: PlatformField(
         selector=SUBENTRY_PLATFORM_SELECTOR,
@@ -1042,7 +1108,6 @@ COMMON_ENTITY_FIELDS: dict[str, PlatformField] = {
         selector=TEXT_SELECTOR, required=False, validator=cv.url, error="invalid_url"
     ),
 }
-
 SHARED_PLATFORM_ENTITY_FIELDS: dict[str, PlatformField] = {
     CONF_ENTITY_CATEGORY: PlatformField(
         selector=ENTITY_CATEGORY_SELECTOR,
@@ -1050,7 +1115,6 @@ SHARED_PLATFORM_ENTITY_FIELDS: dict[str, PlatformField] = {
         default=None,
     ),
 }
-
 PLATFORM_ENTITY_FIELDS: dict[str, dict[str, PlatformField]] = {
     Platform.ALARM_CONTROL_PANEL.value: {
         CONF_SUPPORTED_FEATURES: PlatformField(
@@ -1190,6 +1254,33 @@ PLATFORM_ENTITY_FIELDS: dict[str, dict[str, PlatformField]] = {
             default=lambda config: bool(config.get(CONF_DIRECTION_COMMAND_TOPIC)),
         ),
     },
+    Platform.IMAGE.value: {
+        "image_processing_mode": PlatformField(
+            selector=IMAGE_PROCESSING_MODE_SELECTOR,
+            required=True,
+            exclude_from_config=True,
+            default=(
+                lambda config: "image_url"
+                if config.get(CONF_IMAGE_TOPIC) is None
+                else "image_data"
+            ),
+        )
+    },
+    Platform.LIGHT.value: {
+        CONF_SCHEMA: PlatformField(
+            selector=LIGHT_SCHEMA_SELECTOR,
+            required=True,
+            default="basic",
+            exclude_from_reconfig=True,
+        ),
+        CONF_COLOR_TEMP_KELVIN: PlatformField(
+            selector=BOOLEAN_SELECTOR,
+            required=True,
+            default=True,
+            is_schema_default=True,
+        ),
+    },
+    Platform.LOCK.value: {},
     Platform.NOTIFY.value: {},
     Platform.SENSOR.value: {
         CONF_DEVICE_CLASS: PlatformField(
@@ -1225,21 +1316,6 @@ PLATFORM_ENTITY_FIELDS: dict[str, dict[str, PlatformField]] = {
             selector=SWITCH_DEVICE_CLASS_SELECTOR, required=False
         ),
     },
-    Platform.LIGHT.value: {
-        CONF_SCHEMA: PlatformField(
-            selector=LIGHT_SCHEMA_SELECTOR,
-            required=True,
-            default="basic",
-            exclude_from_reconfig=True,
-        ),
-        CONF_COLOR_TEMP_KELVIN: PlatformField(
-            selector=BOOLEAN_SELECTOR,
-            required=True,
-            default=True,
-            is_schema_default=True,
-        ),
-    },
-    Platform.LOCK.value: {},
 }
 PLATFORM_MQTT_FIELDS: dict[str, dict[str, PlatformField]] = {
     Platform.ALARM_CONTROL_PANEL: {
@@ -2273,93 +2349,39 @@ PLATFORM_MQTT_FIELDS: dict[str, dict[str, PlatformField]] = {
             conditions=({"fan_feature_direction": True},),
         ),
     },
-    Platform.NOTIFY.value: {
-        CONF_COMMAND_TOPIC: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=True,
-            validator=valid_publish_topic,
-            error="invalid_publish_topic",
-        ),
-        CONF_COMMAND_TEMPLATE: PlatformField(
-            selector=TEMPLATE_SELECTOR,
-            required=False,
-            validator=validate(cv.template),
-            error="invalid_template",
-        ),
-        CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
-    },
-    Platform.SENSOR.value: {
-        CONF_STATE_TOPIC: PlatformField(
+    Platform.IMAGE.value: {
+        CONF_IMAGE_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,
             required=True,
             validator=valid_subscribe_topic,
             error="invalid_subscribe_topic",
+            conditions=({"image_processing_mode": "image_data"},),
         ),
-        CONF_VALUE_TEMPLATE: PlatformField(
-            selector=TEMPLATE_SELECTOR,
-            required=False,
-            validator=validate(cv.template),
-            error="invalid_template",
-        ),
-        CONF_LAST_RESET_VALUE_TEMPLATE: PlatformField(
-            selector=TEMPLATE_SELECTOR,
-            required=False,
-            validator=validate(cv.template),
-            error="invalid_template",
-            conditions=({CONF_STATE_CLASS: "total"},),
-        ),
-        CONF_EXPIRE_AFTER: PlatformField(
-            selector=TIMEOUT_SELECTOR,
-            required=False,
-            validator=cv.positive_int,
-            section="advanced_settings",
-        ),
-    },
-    Platform.SWITCH.value: {
-        CONF_COMMAND_TOPIC: PlatformField(
-            selector=TEXT_SELECTOR,
+        CONF_CONTENT_TYPE: PlatformField(
+            selector=IMAGE_CONTENT_TYPE_SELECTOR,
             required=True,
-            validator=valid_publish_topic,
-            error="invalid_publish_topic",
+            default=DEFAULT_CONTENT_TYPE,
+            conditions=({"image_processing_mode": "image_data"},),
         ),
-        CONF_COMMAND_TEMPLATE: PlatformField(
-            selector=TEMPLATE_SELECTOR,
+        CONF_IMAGE_ENCODING: PlatformField(
+            selector=IMAGE_ENCODING_SELECTOR,
             required=False,
-            validator=validate(cv.template),
-            error="invalid_template",
+            conditions=({"image_processing_mode": "image_data"},),
+            default="raw",
         ),
-        CONF_STATE_TOPIC: PlatformField(
+        CONF_URL_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,
-            required=False,
+            required=True,
             validator=valid_subscribe_topic,
             error="invalid_subscribe_topic",
+            conditions=({"image_processing_mode": "image_url"},),
         ),
-        CONF_VALUE_TEMPLATE: PlatformField(
+        CONF_URL_TEMPLATE: PlatformField(
             selector=TEMPLATE_SELECTOR,
             required=False,
             validator=validate(cv.template),
             error="invalid_template",
         ),
-        CONF_PAYLOAD_OFF: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=False,
-            default=DEFAULT_PAYLOAD_OFF,
-        ),
-        CONF_PAYLOAD_ON: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=False,
-            default=DEFAULT_PAYLOAD_ON,
-        ),
-        CONF_STATE_OFF: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=False,
-        ),
-        CONF_STATE_ON: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=False,
-        ),
-        CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
-        CONF_OPTIMISTIC: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
     },
     Platform.LIGHT.value: {
         CONF_COMMAND_TOPIC: PlatformField(
@@ -2842,7 +2864,94 @@ PLATFORM_MQTT_FIELDS: dict[str, dict[str, PlatformField]] = {
             section="advanced_settings",
         ),
     },
-    Platform.LOCK.value: {
+    Platform.LOCK.value: {
+        CONF_COMMAND_TOPIC: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=True,
+            validator=valid_publish_topic,
+            error="invalid_publish_topic",
+        ),
+        CONF_COMMAND_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=validate(cv.template),
+            error="invalid_template",
+        ),
+        CONF_STATE_TOPIC: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            validator=valid_subscribe_topic,
+            error="invalid_subscribe_topic",
+        ),
+        CONF_VALUE_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
+            required=False,
+            validator=validate(cv.template),
+            error="invalid_template",
+        ),
+        CONF_CODE_FORMAT: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            validator=validate(cv.is_regex),
+            error="invalid_regular_expression",
+        ),
+        CONF_PAYLOAD_LOCK: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_PAYLOAD_LOCK,
+            section="lock_payload_settings",
+        ),
+        CONF_PAYLOAD_UNLOCK: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_PAYLOAD_UNLOCK,
+            section="lock_payload_settings",
+        ),
+        CONF_PAYLOAD_OPEN: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            section="lock_payload_settings",
+        ),
+        CONF_PAYLOAD_RESET: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_PAYLOAD_RESET,
+            section="lock_payload_settings",
+        ),
+        CONF_STATE_LOCKED: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_STATE_LOCKED,
+            section="lock_payload_settings",
+        ),
+        CONF_STATE_UNLOCKED: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_STATE_UNLOCKED,
+            section="lock_payload_settings",
+        ),
+        CONF_STATE_LOCKING: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_STATE_LOCKING,
+            section="lock_payload_settings",
+        ),
+        CONF_STATE_UNLOCKING: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_STATE_UNLOCKING,
+            section="lock_payload_settings",
+        ),
+        CONF_STATE_JAMMED: PlatformField(
+            selector=TEXT_SELECTOR,
+            required=False,
+            default=DEFAULT_STATE_JAMMED,
+            section="lock_payload_settings",
+        ),
+        CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
+        CONF_OPTIMISTIC: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
+    },
+    Platform.NOTIFY.value: {
         CONF_COMMAND_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,
             required=True,
@@ -2855,9 +2964,12 @@ PLATFORM_MQTT_FIELDS: dict[str, dict[str, PlatformField]] = {
             validator=validate(cv.template),
             error="invalid_template",
         ),
+        CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
+    },
+    Platform.SENSOR.value: {
         CONF_STATE_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,
-            required=False,
+            required=True,
             validator=valid_subscribe_topic,
             error="invalid_subscribe_topic",
         ),
@@ -2867,86 +2979,67 @@ PLATFORM_MQTT_FIELDS: dict[str, dict[str, PlatformField]] = {
             validator=validate(cv.template),
             error="invalid_template",
         ),
-        CONF_CODE_FORMAT: PlatformField(
-            selector=TEXT_SELECTOR,
+        CONF_LAST_RESET_VALUE_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
             required=False,
-            validator=validate(cv.is_regex),
-            error="invalid_regular_expression",
+            validator=validate(cv.template),
+            error="invalid_template",
+            conditions=({CONF_STATE_CLASS: "total"},),
         ),
-        CONF_PAYLOAD_LOCK: PlatformField(
-            selector=TEXT_SELECTOR,
+        CONF_EXPIRE_AFTER: PlatformField(
+            selector=TIMEOUT_SELECTOR,
             required=False,
-            default=DEFAULT_PAYLOAD_LOCK,
-            section="lock_payload_settings",
+            validator=cv.positive_int,
+            section="advanced_settings",
         ),
-        CONF_PAYLOAD_UNLOCK: PlatformField(
+    },
+    Platform.SWITCH.value: {
+        CONF_COMMAND_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,
-            required=False,
-            default=DEFAULT_PAYLOAD_UNLOCK,
-            section="lock_payload_settings",
+            required=True,
+            validator=valid_publish_topic,
+            error="invalid_publish_topic",
         ),
-        CONF_PAYLOAD_OPEN: PlatformField(
-            selector=TEXT_SELECTOR,
+        CONF_COMMAND_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
             required=False,
-            section="lock_payload_settings",
+            validator=validate(cv.template),
+            error="invalid_template",
         ),
-        CONF_PAYLOAD_RESET: PlatformField(
+        CONF_STATE_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,
             required=False,
-            default=DEFAULT_PAYLOAD_RESET,
-            section="lock_payload_settings",
+            validator=valid_subscribe_topic,
+            error="invalid_subscribe_topic",
         ),
-        CONF_STATE_LOCKED: PlatformField(
-            selector=TEXT_SELECTOR,
+        CONF_VALUE_TEMPLATE: PlatformField(
+            selector=TEMPLATE_SELECTOR,
             required=False,
-            default=DEFAULT_STATE_LOCKED,
-            section="lock_payload_settings",
+            validator=validate(cv.template),
+            error="invalid_template",
         ),
-        CONF_STATE_UNLOCKED: PlatformField(
+        CONF_PAYLOAD_OFF: PlatformField(
             selector=TEXT_SELECTOR,
             required=False,
-            default=DEFAULT_STATE_UNLOCKED,
-            section="lock_payload_settings",
+            default=DEFAULT_PAYLOAD_OFF,
         ),
-        CONF_STATE_LOCKING: PlatformField(
+        CONF_PAYLOAD_ON: PlatformField(
             selector=TEXT_SELECTOR,
             required=False,
-            default=DEFAULT_STATE_LOCKING,
-            section="lock_payload_settings",
+            default=DEFAULT_PAYLOAD_ON,
         ),
-        CONF_STATE_UNLOCKING: PlatformField(
+        CONF_STATE_OFF: PlatformField(
             selector=TEXT_SELECTOR,
             required=False,
-            default=DEFAULT_STATE_UNLOCKING,
-            section="lock_payload_settings",
         ),
-        CONF_STATE_JAMMED: PlatformField(
+        CONF_STATE_ON: PlatformField(
             selector=TEXT_SELECTOR,
             required=False,
-            default=DEFAULT_STATE_JAMMED,
-            section="lock_payload_settings",
         ),
         CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
         CONF_OPTIMISTIC: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
     },
 }
-ENTITY_CONFIG_VALIDATOR: dict[
-    str,
-    Callable[[dict[str, Any]], dict[str, str]] | None,
-] = {
-    Platform.ALARM_CONTROL_PANEL: None,
-    Platform.BINARY_SENSOR.value: None,
-    Platform.BUTTON.value: None,
-    Platform.CLIMATE.value: validate_climate_platform_config,
-    Platform.COVER.value: validate_cover_platform_config,
-    Platform.FAN.value: validate_fan_platform_config,
-    Platform.LIGHT.value: validate_light_platform_config,
-    Platform.LOCK.value: None,
-    Platform.NOTIFY.value: None,
-    Platform.SENSOR.value: validate_sensor_platform_config,
-    Platform.SWITCH.value: None,
-}
-
 MQTT_DEVICE_PLATFORM_FIELDS = {
     ATTR_NAME: PlatformField(selector=TEXT_SELECTOR, required=True),
     ATTR_SW_VERSION: PlatformField(
@@ -2969,54 +3062,6 @@ MQTT_DEVICE_PLATFORM_FIELDS = {
     ),
 }
 
-REAUTH_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_USERNAME): TEXT_SELECTOR,
-        vol.Required(CONF_PASSWORD): PASSWORD_SELECTOR,
-    }
-)
-PWD_NOT_CHANGED = "__**password_not_changed**__"
-
-
-@callback
-def update_password_from_user_input(
-    entry_password: str | None, user_input: dict[str, Any]
-) -> dict[str, Any]:
-    """Update the password if the entry has been updated.
-
-    As we want to avoid reflecting the stored password in the UI,
-    we replace the suggested value in the UI with a sentitel,
-    and we change it back here if it was changed.
-    """
-    substituted_used_data = dict(user_input)
-    # Take out the password submitted
-    user_password: str | None = substituted_used_data.pop(CONF_PASSWORD, None)
-    # Only add the password if it has changed.
-    # If the sentinel password is submitted, we replace that with our current
-    # password from the config entry data.
-    password_changed = user_password is not None and user_password != PWD_NOT_CHANGED
-    password = user_password if password_changed else entry_password
-    if password is not None:
-        substituted_used_data[CONF_PASSWORD] = password
-    return substituted_used_data
-
-
-@callback
-def validate_field(
-    field: str,
-    validator: Callable[..., Any],
-    user_input: dict[str, Any] | None,
-    errors: dict[str, str],
-    error: str,
-) -> None:
-    """Validate a single field."""
-    if user_input is None or field not in user_input or validator is None:
-        return
-    try:
-        user_input[field] = validator(user_input[field])
-    except (ValueError, vol.Error, vol.Invalid):
-        errors[field] = error
-
 
 @callback
 def _check_conditions(
@@ -3050,49 +3095,6 @@ def calculate_merged_config(
     } | merged_user_input
 
 
-@callback
-def validate_user_input(
-    user_input: dict[str, Any],
-    data_schema_fields: dict[str, PlatformField],
-    *,
-    component_data: dict[str, Any] | None = None,
-    config_validator: Callable[[dict[str, Any]], dict[str, str]] | None = None,
-) -> tuple[dict[str, Any], dict[str, str]]:
-    """Validate user input."""
-    errors: dict[str, str] = {}
-    # Merge sections
-    merged_user_input: dict[str, Any] = {}
-    for key, value in user_input.items():
-        if isinstance(value, dict):
-            merged_user_input.update(value)
-        else:
-            merged_user_input[key] = value
-
-    for field, value in merged_user_input.items():
-        validator = data_schema_fields[field].validator
-        try:
-            merged_user_input[field] = (
-                validator(value) if validator is not None else value
-            )
-        except (ValueError, vol.Error, vol.Invalid):
-            data_schema_field = data_schema_fields[field]
-            errors[data_schema_field.section or field] = (
-                data_schema_field.error or "invalid_input"
-            )
-
-    if config_validator is not None:
-        if TYPE_CHECKING:
-            assert component_data is not None
-
-        errors |= config_validator(
-            calculate_merged_config(
-                merged_user_input, data_schema_fields, component_data
-            ),
-        )
-
-    return merged_user_input, errors
-
-
 @callback
 def data_schema_from_fields(
     data_schema_fields: dict[str, PlatformField],
@@ -3210,6 +3212,49 @@ def data_schema_from_fields(
     return vol.Schema(data_schema)
 
 
+@callback
+def validate_user_input(
+    user_input: dict[str, Any],
+    data_schema_fields: dict[str, PlatformField],
+    *,
+    component_data: dict[str, Any] | None = None,
+    config_validator: Callable[[dict[str, Any]], dict[str, str]] | None = None,
+) -> tuple[dict[str, Any], dict[str, str]]:
+    """Validate user input."""
+    errors: dict[str, str] = {}
+    # Merge sections
+    merged_user_input: dict[str, Any] = {}
+    for key, value in user_input.items():
+        if isinstance(value, dict):
+            merged_user_input.update(value)
+        else:
+            merged_user_input[key] = value
+
+    for field, value in merged_user_input.items():
+        validator = data_schema_fields[field].validator
+        try:
+            merged_user_input[field] = (
+                validator(value) if validator is not None else value
+            )
+        except (ValueError, vol.Error, vol.Invalid):
+            data_schema_field = data_schema_fields[field]
+            errors[data_schema_field.section or field] = (
+                data_schema_field.error or "invalid_input"
+            )
+
+    if config_validator is not None:
+        if TYPE_CHECKING:
+            assert component_data is not None
+
+        errors |= config_validator(
+            calculate_merged_config(
+                merged_user_input, data_schema_fields, component_data
+            ),
+        )
+
+    return merged_user_input, errors
+
+
 @callback
 def subentry_schema_default_data_from_fields(
     data_schema_fields: dict[str, PlatformField],
@@ -3227,6 +3272,37 @@ def subentry_schema_default_data_from_fields(
     }
 
 
+@callback
+def update_password_from_user_input(
+    entry_password: str | None, user_input: dict[str, Any]
+) -> dict[str, Any]:
+    """Update the password if the entry has been updated.
+
+    As we want to avoid reflecting the stored password in the UI,
+    we replace the suggested value in the UI with a sentitel,
+    and we change it back here if it was changed.
+    """
+    substituted_used_data = dict(user_input)
+    # Take out the password submitted
+    user_password: str | None = substituted_used_data.pop(CONF_PASSWORD, None)
+    # Only add the password if it has changed.
+    # If the sentinel password is submitted, we replace that with our current
+    # password from the config entry data.
+    password_changed = user_password is not None and user_password != PWD_NOT_CHANGED
+    password = user_password if password_changed else entry_password
+    if password is not None:
+        substituted_used_data[CONF_PASSWORD] = password
+    return substituted_used_data
+
+
+REAUTH_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_USERNAME): TEXT_SELECTOR,
+        vol.Required(CONF_PASSWORD): PASSWORD_SELECTOR,
+    }
+)
+
+
 class FlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
@@ -4677,7 +4753,7 @@ async def async_get_broker_settings(  # noqa: C901
                 CONF_CLIENT_KEY,
                 description={"suggested_value": user_input_basic.get(CONF_CLIENT_KEY)},
             )
-        ] = KEY_UPLOAD_SELECTOR
+        ] = CERT_KEY_UPLOAD_SELECTOR
         fields[
             vol.Optional(
                 CONF_CLIENT_KEY_PASSWORD,