[ruff] Enable SIM rules and fix code simplification violations (#9872)

esphome/__main__.py

@@ -119,9 +119,7 @@ def mqtt_logging_enabled(mqtt_config):
         return False
     if CONF_TOPIC not in log_topic:
         return False
-    if log_topic.get(CONF_LEVEL, None) == "NONE":
+    return log_topic.get(CONF_LEVEL, None) != "NONE"
-        return False
-    return True
 
 
 def get_port_type(port):

esphome/components/api/client.py

@@ -14,6 +14,8 @@ with warnings.catch_warnings():
     from aioesphomeapi import APIClient, parse_log_message
     from aioesphomeapi.log_runner import async_run
 
+import contextlib
+
 from esphome.const import CONF_KEY, CONF_PASSWORD, CONF_PORT, __version__
 from esphome.core import CORE
 
@@ -66,7 +68,5 @@ async def async_run_logs(config: dict[str, Any], address: str) -> None:
 
 def run_logs(config: dict[str, Any], address: str) -> None:
     """Run the logs command."""
-    try:
+    with contextlib.suppress(KeyboardInterrupt):
         asyncio.run(async_run_logs(config, address))
-    except KeyboardInterrupt:
-        pass

esphome/components/canbus/__init__.py

@@ -22,9 +22,8 @@ def validate_id(config):
     if CONF_CAN_ID in config:
         can_id = config[CONF_CAN_ID]
         id_ext = config[CONF_USE_EXTENDED_ID]
-        if not id_ext:
+        if not id_ext and can_id > 0x7FF:
-            if can_id > 0x7FF:
+            raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
-                raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
     return config
 
 

esphome/components/esp32/__init__.py

@@ -953,14 +953,16 @@ def _write_idf_component_yml():
 
 # Called by writer.py
 def copy_files():
-    if CORE.using_arduino:
+    if (
-        if "partitions.csv" not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]:
+        CORE.using_arduino
-            write_file_if_changed(
+        and "partitions.csv" not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]
-                CORE.relative_build_path("partitions.csv"),
+    ):
-                get_arduino_partition_csv(
+        write_file_if_changed(
-                    CORE.platformio_options.get("board_upload.flash_size")
+            CORE.relative_build_path("partitions.csv"),
-                ),
+            get_arduino_partition_csv(
-            )
+                CORE.platformio_options.get("board_upload.flash_size")
+            ),
+        )
     if CORE.using_esp_idf:
         _write_sdkconfig()
         _write_idf_component_yml()

esphome/components/esp32_ble_server/__init__.py

@@ -140,20 +140,22 @@ VALUE_TYPES = {
 
 
 def validate_char_on_write(char_config):
-    if CONF_ON_WRITE in char_config:
+    if (
-        if not char_config[CONF_WRITE] and not char_config[CONF_WRITE_NO_RESPONSE]:
+        CONF_ON_WRITE in char_config
-            raise cv.Invalid(
+        and not char_config[CONF_WRITE]
-                f"{CONF_ON_WRITE} requires the {CONF_WRITE} or {CONF_WRITE_NO_RESPONSE} property to be set"
+        and not char_config[CONF_WRITE_NO_RESPONSE]
-            )
+    ):
+        raise cv.Invalid(
+            f"{CONF_ON_WRITE} requires the {CONF_WRITE} or {CONF_WRITE_NO_RESPONSE} property to be set"
+        )
     return char_config
 
 
 def validate_descriptor(desc_config):
-    if CONF_ON_WRITE in desc_config:
+    if CONF_ON_WRITE in desc_config and not desc_config[CONF_WRITE]:
-        if not desc_config[CONF_WRITE]:
+        raise cv.Invalid(
-            raise cv.Invalid(
+            f"{CONF_ON_WRITE} requires the {CONF_WRITE} property to be set"
-                f"{CONF_ON_WRITE} requires the {CONF_WRITE} property to be set"
+        )
-            )
     if CONF_MAX_LENGTH not in desc_config:
         value = desc_config[CONF_VALUE][CONF_DATA]
         if cg.is_template(value):

esphome/components/esp32_touch/__init__.py

@@ -294,9 +294,8 @@ async def to_code(config):
         )
     )
 
-    if get_esp32_variant() == VARIANT_ESP32:
+    if get_esp32_variant() == VARIANT_ESP32 and CONF_IIR_FILTER in config:
-        if CONF_IIR_FILTER in config:
+        cg.add(touch.set_iir_filter(config[CONF_IIR_FILTER]))
-            cg.add(touch.set_iir_filter(config[CONF_IIR_FILTER]))
 
     if get_esp32_variant() == VARIANT_ESP32S2 or get_esp32_variant() == VARIANT_ESP32S3:
         if CONF_FILTER_MODE in config:

esphome/components/esp8266/__init__.py

@@ -245,7 +245,7 @@ async def to_code(config):
         if ver <= cv.Version(2, 3, 0):
             # No ld script support
             ld_script = None
-        if ver <= cv.Version(2, 4, 2):
+        elif ver <= cv.Version(2, 4, 2):
             # Old ld script path
             ld_script = ld_scripts[0]
         else:

esphome/components/ethernet/__init__.py

@@ -112,7 +112,7 @@ def _is_framework_spi_polling_mode_supported():
             return True
         if cv.Version(5, 3, 0) > framework_version >= cv.Version(5, 2, 1):
             return True
-        if cv.Version(5, 2, 0) > framework_version >= cv.Version(5, 1, 4):
+        if cv.Version(5, 2, 0) > framework_version >= cv.Version(5, 1, 4):  # noqa: SIM103
             return True
         return False
     if CORE.using_arduino:

esphome/components/fastled_spi/light.py

@@ -55,9 +55,7 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     var = await fastled_base.new_fastled_light(config)
 
-    rgb_order = cg.RawExpression(
+    rgb_order = cg.RawExpression(config.get(CONF_RGB_ORDER, "RGB"))
-        config[CONF_RGB_ORDER] if CONF_RGB_ORDER in config else "RGB"
-    )
     data_rate = None
 
     if CONF_DATA_RATE in config:

esphome/components/graph/__init__.py

@@ -116,7 +116,7 @@ GRAPH_SCHEMA = cv.Schema(
 
 
 def _relocate_fields_to_subfolder(config, subfolder, subschema):
-    fields = [k.schema for k in subschema.schema.keys()]
+    fields = [k.schema for k in subschema.schema]
     fields.remove(CONF_ID)
     if subfolder in config:
         # Ensure no ambiguous fields in base of config

esphome/components/http_request/__init__.py

@@ -70,9 +70,8 @@ def validate_url(value):
 def validate_ssl_verification(config):
     error_message = ""
 
-    if CORE.is_esp32:
+    if CORE.is_esp32 and not CORE.using_esp_idf and config[CONF_VERIFY_SSL]:
-        if not CORE.using_esp_idf and config[CONF_VERIFY_SSL]:
+        error_message = "ESPHome supports certificate verification only via ESP-IDF"
-            error_message = "ESPHome supports certificate verification only via ESP-IDF"
 
     if CORE.is_rp2040 and config[CONF_VERIFY_SSL]:
         error_message = "ESPHome does not support certificate verification on RP2040"

esphome/components/hydreon_rgxx/sensor.py

@@ -66,11 +66,10 @@ PROTOCOL_NAMES = {
 
 def _validate(config):
     for conf, models in SUPPORTED_OPTIONS.items():
-        if conf in config:
+        if conf in config and config[CONF_MODEL] not in models:
-            if config[CONF_MODEL] not in models:
+            raise cv.Invalid(
-                raise cv.Invalid(
+                f"{conf} is only available on {' and '.join(models)}, not {config[CONF_MODEL]}"
-                    f"{conf} is only available on {' and '.join(models)}, not {config[CONF_MODEL]}"
+            )
-                )
     return config
 
 

esphome/components/i2s_audio/__init__.py

@@ -243,10 +243,7 @@ def _final_validate(_):
 
 
 def use_legacy():
-    if CORE.using_esp_idf:
+    return not (CORE.using_esp_idf and not _use_legacy_driver)
-        if not _use_legacy_driver:
-            return False
-    return True
 
 
 FINAL_VALIDATE_SCHEMA = _final_validate

esphome/components/i2s_audio/microphone/__init__.py

@@ -44,9 +44,8 @@ PDM_VARIANTS = [esp32.const.VARIANT_ESP32, esp32.const.VARIANT_ESP32S3]
 def _validate_esp32_variant(config):
     variant = esp32.get_esp32_variant()
     if config[CONF_ADC_TYPE] == "external":
-        if config[CONF_PDM]:
+        if config[CONF_PDM] and variant not in PDM_VARIANTS:
-            if variant not in PDM_VARIANTS:
+            raise cv.Invalid(f"{variant} does not support PDM")
-                raise cv.Invalid(f"{variant} does not support PDM")
         return config
     if config[CONF_ADC_TYPE] == "internal":
         if variant not in INTERNAL_ADC_VARIANTS:
@@ -122,9 +121,8 @@ CONFIG_SCHEMA = cv.All(
 
 
 def _final_validate(config):
-    if not use_legacy():
+    if not use_legacy() and config[CONF_ADC_TYPE] == "internal":
-        if config[CONF_ADC_TYPE] == "internal":
+        raise cv.Invalid("Internal ADC is only compatible with legacy i2s driver.")
-            raise cv.Invalid("Internal ADC is only compatible with legacy i2s driver.")
 
 
 FINAL_VALIDATE_SCHEMA = _final_validate

esphome/components/ili9xxx/display.py

@@ -138,9 +138,10 @@ def _validate(config):
     ]:
         raise cv.Invalid("Selected model can't run on ESP8266.")
 
-    if model == "CUSTOM":
+    if model == "CUSTOM" and (
-        if CONF_INIT_SEQUENCE not in config or CONF_DIMENSIONS not in config:
+        CONF_INIT_SEQUENCE not in config or CONF_DIMENSIONS not in config
-            raise cv.Invalid("CUSTOM model requires init_sequence and dimensions")
+    ):
+        raise cv.Invalid("CUSTOM model requires init_sequence and dimensions")
 
     return config
 

esphome/components/image/__init__.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import hashlib
 import io
 import logging
@@ -174,9 +175,8 @@ class ImageGrayscale(ImageEncoder):
                 b = 1
         if self.invert_alpha:
             b ^= 0xFF
-        if self.transparency == CONF_ALPHA_CHANNEL:
+        if self.transparency == CONF_ALPHA_CHANNEL and a != 0xFF:
-            if a != 0xFF:
+            b = a
-                b = a
         self.data[self.index] = b
         self.index += 1
 
@@ -672,10 +672,8 @@ async def write_image(config, all_frames=False):
     invert_alpha = config[CONF_INVERT_ALPHA]
     frame_count = 1
     if all_frames:
-        try:
+        with contextlib.suppress(AttributeError):
             frame_count = image.n_frames
-        except AttributeError:
-            pass
         if frame_count <= 1:
             _LOGGER.warning("Image file %s has no animation frames", path)
 

esphome/components/improv_serial/__init__.py

@@ -27,14 +27,13 @@ def validate_logger(config):
     logger_conf = fv.full_config.get()[CONF_LOGGER]
     if logger_conf[CONF_BAUD_RATE] == 0:
         raise cv.Invalid("improv_serial requires the logger baud_rate to be not 0")
-    if CORE.using_esp_idf:
+    if CORE.using_esp_idf and (
-        if (
+        logger_conf[CONF_HARDWARE_UART] == USB_CDC
-            logger_conf[CONF_HARDWARE_UART] == USB_CDC
+        and get_esp32_variant() == VARIANT_ESP32S3
-            and get_esp32_variant() == VARIANT_ESP32S3
+    ):
-        ):
+        raise cv.Invalid(
-            raise cv.Invalid(
+            "improv_serial does not support the selected logger hardware_uart"
-                "improv_serial does not support the selected logger hardware_uart"
+        )
-            )
     return config
 
 

esphome/components/ina2xx_base/__init__.py

@@ -78,11 +78,8 @@ def validate_model_config(config):
     model = config[CONF_MODEL]
 
     for key in config:
-        if key in SENSOR_MODEL_OPTIONS:
+        if key in SENSOR_MODEL_OPTIONS and model not in SENSOR_MODEL_OPTIONS[key]:
-            if model not in SENSOR_MODEL_OPTIONS[key]:
+            raise cv.Invalid(f"Device model '{model}' does not support '{key}' sensor")
-                raise cv.Invalid(
-                    f"Device model '{model}' does not support '{key}' sensor"
-                )
 
     tempco = config[CONF_TEMPERATURE_COEFFICIENT]
     if tempco > 0 and model not in ["INA228", "INA229"]:

esphome/components/ld2450/text_sensor.py

@@ -56,7 +56,8 @@ async def to_code(config):
         sens = await text_sensor.new_text_sensor(mac_address_config)
         cg.add(ld2450_component.set_mac_text_sensor(sens))
     for n in range(MAX_TARGETS):
-        if direction_conf := config.get(f"target_{n + 1}"):
+        if (direction_conf := config.get(f"target_{n + 1}")) and (
-            if direction_config := direction_conf.get(CONF_DIRECTION):
+            direction_config := direction_conf.get(CONF_DIRECTION)
-                sens = await text_sensor.new_text_sensor(direction_config)
+        ):
-                cg.add(ld2450_component.set_direction_text_sensor(n, sens))
+            sens = await text_sensor.new_text_sensor(direction_config)
+            cg.add(ld2450_component.set_direction_text_sensor(n, sens))

esphome/components/light/effects.py

@@ -526,7 +526,7 @@ def validate_effects(allowed_effects):
         errors = []
         names = set()
         for i, x in enumerate(value):
-            key = next(it for it in x.keys())
+            key = next(it for it in x)
             if key not in allowed_effects:
                 errors.append(
                     cv.Invalid(

esphome/components/logger/__init__.py

@@ -346,14 +346,13 @@ async def to_code(config):
     if config.get(CONF_ESP8266_STORE_LOG_STRINGS_IN_FLASH):
         cg.add_build_flag("-DUSE_STORE_LOG_STR_IN_FLASH")
 
-    if CORE.using_arduino:
+    if CORE.using_arduino and config[CONF_HARDWARE_UART] == USB_CDC:
-        if config[CONF_HARDWARE_UART] == USB_CDC:
+        cg.add_build_flag("-DARDUINO_USB_CDC_ON_BOOT=1")
-            cg.add_build_flag("-DARDUINO_USB_CDC_ON_BOOT=1")
+        if CORE.is_esp32 and get_esp32_variant() in (
-            if CORE.is_esp32 and get_esp32_variant() in (
+            VARIANT_ESP32C3,
-                VARIANT_ESP32C3,
+            VARIANT_ESP32C6,
-                VARIANT_ESP32C6,
+        ):
-            ):
+            cg.add_build_flag("-DARDUINO_USB_MODE=1")
-                cg.add_build_flag("-DARDUINO_USB_MODE=1")
 
     if CORE.using_esp_idf:
         if config[CONF_HARDWARE_UART] == USB_CDC:

esphome/components/lvgl/__init__.py

@@ -201,9 +201,8 @@ def final_validation(configs):
         multi_conf_validate(configs)
     global_config = full_config.get()
     for config in configs:
-        if pages := config.get(CONF_PAGES):
+        if (pages := config.get(CONF_PAGES)) and all(p[df.CONF_SKIP] for p in pages):
-            if all(p[df.CONF_SKIP] for p in pages):
+            raise cv.Invalid("At least one page must not be skipped")
-                raise cv.Invalid("At least one page must not be skipped")
         for display_id in config[df.CONF_DISPLAYS]:
             path = global_config.get_path_for_id(display_id)[:-1]
             display = global_config.get_config_for_path(path)

esphome/components/matrix_keypad/__init__.py

@@ -28,9 +28,10 @@ CONF_HAS_PULLDOWNS = "has_pulldowns"
 
 
 def check_keys(obj):
-    if CONF_KEYS in obj:
+    if CONF_KEYS in obj and len(obj[CONF_KEYS]) != len(obj[CONF_ROWS]) * len(
-        if len(obj[CONF_KEYS]) != len(obj[CONF_ROWS]) * len(obj[CONF_COLUMNS]):
+        obj[CONF_COLUMNS]
-            raise cv.Invalid("The number of key codes must equal the number of buttons")
+    ):
+        raise cv.Invalid("The number of key codes must equal the number of buttons")
     return obj
 
 

esphome/components/mixer/speaker/__init__.py

@@ -124,11 +124,10 @@ async def to_code(config):
 
     if task_stack_in_psram := config.get(CONF_TASK_STACK_IN_PSRAM):
         cg.add(var.set_task_stack_in_psram(task_stack_in_psram))
-        if task_stack_in_psram:
+        if task_stack_in_psram and config[CONF_TASK_STACK_IN_PSRAM]:
-            if config[CONF_TASK_STACK_IN_PSRAM]:
+            esp32.add_idf_sdkconfig_option(
-                esp32.add_idf_sdkconfig_option(
+                "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True
-                    "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True
+            )
-                )
 
     for speaker_config in config[CONF_SOURCE_SPEAKERS]:
         source_speaker = cg.new_Pvariable(speaker_config[CONF_ID])

esphome/components/mlx90393/sensor.py

@@ -63,11 +63,13 @@ def _validate(config):
                 raise cv.Invalid(
                     f"{axis}: {CONF_RESOLUTION} cannot be {res} with {CONF_TEMPERATURE_COMPENSATION} enabled"
                 )
-    if config[CONF_HALLCONF] == 0xC:
+    if config[CONF_HALLCONF] == 0xC and (
-        if (config[CONF_OVERSAMPLING], config[CONF_FILTER]) in [(0, 0), (1, 0), (0, 1)]:
+        config[CONF_OVERSAMPLING],
-            raise cv.Invalid(
+        config[CONF_FILTER],
-                f"{CONF_OVERSAMPLING}=={config[CONF_OVERSAMPLING]} and {CONF_FILTER}=={config[CONF_FILTER]} not allowed with {CONF_HALLCONF}=={config[CONF_HALLCONF]:#02x}"
+    ) in [(0, 0), (1, 0), (0, 1)]:
-            )
+        raise cv.Invalid(
+            f"{CONF_OVERSAMPLING}=={config[CONF_OVERSAMPLING]} and {CONF_FILTER}=={config[CONF_FILTER]} not allowed with {CONF_HALLCONF}=={config[CONF_HALLCONF]:#02x}"
+        )
     return config
 
 

esphome/components/mpr121/__init__.py

@@ -56,12 +56,13 @@ def _final_validate(config):
         for binary_sensor in binary_sensors:
             if binary_sensor.get(CONF_MPR121_ID) == config[CONF_ID]:
                 max_touch_channel = max(max_touch_channel, binary_sensor[CONF_CHANNEL])
-    if max_touch_channel_in_config := config.get(CONF_MAX_TOUCH_CHANNEL):
+    if (
-        if max_touch_channel != max_touch_channel_in_config:
+        max_touch_channel_in_config := config.get(CONF_MAX_TOUCH_CHANNEL)
-            raise cv.Invalid(
+    ) and max_touch_channel != max_touch_channel_in_config:
-                "Max touch channel must equal the highest binary sensor channel or be removed for auto calculation",
+        raise cv.Invalid(
-                path=[CONF_MAX_TOUCH_CHANNEL],
+            "Max touch channel must equal the highest binary sensor channel or be removed for auto calculation",
-            )
+            path=[CONF_MAX_TOUCH_CHANNEL],
+        )
     path = fconf.get_path_for_id(config[CONF_ID])[:-1]
     this_config = fconf.get_config_for_path(path)
     this_config[CONF_MAX_TOUCH_CHANNEL] = max_touch_channel

esphome/components/opentherm/number/__init__.py

@@ -25,9 +25,9 @@ async def new_openthermnumber(config: dict[str, Any]) -> cg.Pvariable:
     await cg.register_component(var, config)
     input.generate_setters(var, config)
 
-    if (initial_value := config.get(CONF_INITIAL_VALUE, None)) is not None:
+    if (initial_value := config.get(CONF_INITIAL_VALUE)) is not None:
         cg.add(var.set_initial_value(initial_value))
-    if (restore_value := config.get(CONF_RESTORE_VALUE, None)) is not None:
+    if (restore_value := config.get(CONF_RESTORE_VALUE)) is not None:
         cg.add(var.set_restore_value(restore_value))
 
     return var

esphome/components/openthread/__init__.py

@@ -79,9 +79,8 @@ def set_sdkconfig_options(config):
                 "CONFIG_OPENTHREAD_NETWORK_PSKC", f"{pskc:X}".lower()
             )
 
-    if force_dataset := config.get(CONF_FORCE_DATASET):
+    if config.get(CONF_FORCE_DATASET):
-        if force_dataset:
+        cg.add_define("USE_OPENTHREAD_FORCE_DATASET")
-            cg.add_define("USE_OPENTHREAD_FORCE_DATASET")
 
     add_idf_sdkconfig_option("CONFIG_OPENTHREAD_DNS64_CLIENT", True)
     add_idf_sdkconfig_option("CONFIG_OPENTHREAD_SRP_CLIENT", True)

esphome/components/packet_transport/__init__.py

@@ -89,9 +89,10 @@ def validate_(config):
             raise cv.Invalid("No sensors or binary sensors to encrypt")
     elif config[CONF_ROLLING_CODE_ENABLE]:
         raise cv.Invalid("Rolling code requires an encryption key")
-    if config[CONF_PING_PONG_ENABLE]:
+    if config[CONF_PING_PONG_ENABLE] and not any(
-        if not any(CONF_ENCRYPTION in p for p in config.get(CONF_PROVIDERS) or ()):
+        CONF_ENCRYPTION in p for p in config.get(CONF_PROVIDERS) or ()
-            raise cv.Invalid("Ping-pong requires at least one encrypted provider")
+    ):
+        raise cv.Invalid("Ping-pong requires at least one encrypted provider")
     return config
 
 

esphome/components/pulse_counter/sensor.py

@@ -49,12 +49,15 @@ def validate_internal_filter(value):
             [CONF_USE_PCNT],
         )
 
-    if CORE.is_esp32 and use_pcnt:
+    if (
-        if value.get(CONF_INTERNAL_FILTER).total_microseconds > 13:
+        CORE.is_esp32
-            raise cv.Invalid(
+        and use_pcnt
-                "Maximum internal filter value when using ESP32 hardware PCNT is 13us",
+        and value.get(CONF_INTERNAL_FILTER).total_microseconds > 13
-                [CONF_INTERNAL_FILTER],
+    ):
-            )
+        raise cv.Invalid(
+            "Maximum internal filter value when using ESP32 hardware PCNT is 13us",
+            [CONF_INTERNAL_FILTER],
+        )
 
     return value
 

esphome/components/qspi_dbi/display.py

@@ -73,9 +73,8 @@ def map_sequence(value):
 
 def _validate(config):
     chip = DriverChip.chips[config[CONF_MODEL]]
-    if not chip.initsequence:
+    if not chip.initsequence and CONF_INIT_SEQUENCE not in config:
-        if CONF_INIT_SEQUENCE not in config:
+        raise cv.Invalid(f"{chip.name} model requires init_sequence")
-            raise cv.Invalid(f"{chip.name} model requires init_sequence")
     return config
 
 

esphome/components/qwiic_pir/binary_sensor.py

@@ -24,9 +24,8 @@ QwiicPIRComponent = qwiic_pir_ns.class_(
 
 
 def validate_no_debounce_unless_native(config):
-    if CONF_DEBOUNCE in config:
+    if CONF_DEBOUNCE in config and config[CONF_DEBOUNCE_MODE] != "NATIVE":
-        if config[CONF_DEBOUNCE_MODE] != "NATIVE":
+        raise cv.Invalid("debounce can only be set if debounce_mode is NATIVE")
-            raise cv.Invalid("debounce can only be set if debounce_mode is NATIVE")
     return config
 
 

esphome/components/remote_base/__init__.py

@@ -1062,12 +1062,11 @@ def validate_raw_alternating(value):
     last_negative = None
     for i, val in enumerate(value):
         this_negative = val < 0
-        if i != 0:
+        if i != 0 and this_negative == last_negative:
-            if this_negative == last_negative:
+            raise cv.Invalid(
-                raise cv.Invalid(
+                f"Values must alternate between being positive and negative, please see index {i} and {i + 1}",
-                    f"Values must alternate between being positive and negative, please see index {i} and {i + 1}",
+                [i],
-                    [i],
+            )
-                )
         last_negative = this_negative
     return value
 

esphome/components/resampler/speaker/__init__.py

@@ -90,11 +90,10 @@ async def to_code(config):
 
     if task_stack_in_psram := config.get(CONF_TASK_STACK_IN_PSRAM):
         cg.add(var.set_task_stack_in_psram(task_stack_in_psram))
-        if task_stack_in_psram:
+        if task_stack_in_psram and config[CONF_TASK_STACK_IN_PSRAM]:
-            if config[CONF_TASK_STACK_IN_PSRAM]:
+            esp32.add_idf_sdkconfig_option(
-                esp32.add_idf_sdkconfig_option(
+                "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True
-                    "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True
+            )
-                )
 
     cg.add(var.set_target_bits_per_sample(config[CONF_BITS_PER_SAMPLE]))
     cg.add(var.set_target_sample_rate(config[CONF_SAMPLE_RATE]))

esphome/components/rpi_dpi_rgb/display.py

@@ -140,7 +140,6 @@ async def to_code(config):
     cg.add(var.set_vsync_front_porch(config[CONF_VSYNC_FRONT_PORCH]))
     cg.add(var.set_pclk_inverted(config[CONF_PCLK_INVERTED]))
     cg.add(var.set_pclk_frequency(config[CONF_PCLK_FREQUENCY]))
-    index = 0
     dpins = []
     if CONF_RED in config[CONF_DATA_PINS]:
         red_pins = config[CONF_DATA_PINS][CONF_RED]
@@ -158,10 +157,9 @@ async def to_code(config):
         dpins = dpins[8:16] + dpins[0:8]
     else:
         dpins = config[CONF_DATA_PINS]
-    for pin in dpins:
+    for index, pin in enumerate(dpins):
         data_pin = await cg.gpio_pin_expression(pin)
         cg.add(var.add_data_pin(data_pin, index))
-        index += 1
 
     if enable_pin := config.get(CONF_ENABLE_PIN):
         enable = await cg.gpio_pin_expression(enable_pin)

esphome/components/speaker/media_player/__init__.py

@@ -204,13 +204,14 @@ def _validate_pipeline(config):
 
 
 def _validate_repeated_speaker(config):
-    if (announcement_config := config.get(CONF_ANNOUNCEMENT_PIPELINE)) and (
+    if (
-        media_config := config.get(CONF_MEDIA_PIPELINE)
+        (announcement_config := config.get(CONF_ANNOUNCEMENT_PIPELINE))
+        and (media_config := config.get(CONF_MEDIA_PIPELINE))
+        and announcement_config[CONF_SPEAKER] == media_config[CONF_SPEAKER]
     ):
-        if announcement_config[CONF_SPEAKER] == media_config[CONF_SPEAKER]:
+        raise cv.Invalid(
-            raise cv.Invalid(
+            "The announcement and media pipelines cannot use the same speaker. Use the `mixer` speaker component to create two source speakers."
-                "The announcement and media pipelines cannot use the same speaker. Use the `mixer` speaker component to create two source speakers."
+        )
-            )
 
     return config
 

esphome/components/spi/__init__.py

@@ -115,9 +115,7 @@ def get_target_platform():
 
 
 def get_target_variant():
-    return (
+    return CORE.data[KEY_ESP32].get(KEY_VARIANT, "")
-        CORE.data[KEY_ESP32][KEY_VARIANT] if KEY_VARIANT in CORE.data[KEY_ESP32] else ""
-    )
 
 
 # Get a list of available hardware interfaces based on target and variant.
@@ -213,9 +211,7 @@ def validate_hw_pins(spi, index=-1):
             return False
         if sdo_pin_no not in pin_set[CONF_MOSI_PIN]:
             return False
-        if sdi_pin_no not in pin_set[CONF_MISO_PIN]:
+        return sdi_pin_no in pin_set[CONF_MISO_PIN]
-            return False
-        return True
     return False
 
 

esphome/components/sprinkler/__init__.py

@@ -130,11 +130,11 @@ def validate_sprinkler(config):
         if (
             CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY in sprinkler_controller
             and CONF_VALVE_OPEN_DELAY not in sprinkler_controller
+            and sprinkler_controller[CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY]
         ):
-            if sprinkler_controller[CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY]:
+            raise cv.Invalid(
-                raise cv.Invalid(
+                f"{CONF_VALVE_OPEN_DELAY} must be defined when {CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY} is enabled"
-                    f"{CONF_VALVE_OPEN_DELAY} must be defined when {CONF_PUMP_SWITCH_OFF_DURING_VALVE_OPEN_DELAY} is enabled"
+            )
-                )
 
         if (
             CONF_REPEAT in sprinkler_controller

esphome/components/ssd1306_base/__init__.py

@@ -42,14 +42,15 @@ SSD1306_MODEL = cv.enum(MODELS, upper=True, space="_")
 
 def _validate(value):
     model = value[CONF_MODEL]
-    if model not in ("SSD1305_128X32", "SSD1305_128X64"):
+    if (
-        # Contrast is default value (1.0) while brightness is not
+        model not in ("SSD1305_128X32", "SSD1305_128X64")
-        # Indicates user is using old `brightness` option
+        and value[CONF_BRIGHTNESS] != 1.0
-        if value[CONF_BRIGHTNESS] != 1.0 and value[CONF_CONTRAST] == 1.0:
+        and value[CONF_CONTRAST] == 1.0
-            raise cv.Invalid(
+    ):
-                "SSD1306/SH1106 no longer accepts brightness option, "
+        raise cv.Invalid(
-                'please use "contrast" instead.'
+            "SSD1306/SH1106 no longer accepts brightness option, "
-            )
+            'please use "contrast" instead.'
+        )
 
     return value
 

esphome/components/st7701s/display.py

@@ -189,7 +189,6 @@ async def to_code(config):
     cg.add(var.set_vsync_front_porch(config[CONF_VSYNC_FRONT_PORCH]))
     cg.add(var.set_pclk_inverted(config[CONF_PCLK_INVERTED]))
     cg.add(var.set_pclk_frequency(config[CONF_PCLK_FREQUENCY]))
-    index = 0
     dpins = []
     if CONF_RED in config[CONF_DATA_PINS]:
         red_pins = config[CONF_DATA_PINS][CONF_RED]
@@ -207,10 +206,9 @@ async def to_code(config):
         dpins = dpins[8:16] + dpins[0:8]
     else:
         dpins = config[CONF_DATA_PINS]
-    for pin in dpins:
+    for index, pin in enumerate(dpins):
         data_pin = await cg.gpio_pin_expression(pin)
         cg.add(var.add_data_pin(data_pin, index))
-        index += 1
 
     if dc_pin := config.get(CONF_DC_PIN):
         dc = await cg.gpio_pin_expression(dc_pin)

esphome/components/substitutions/__init__.py

@@ -49,15 +49,14 @@ def _expand_jinja(value, orig_value, path, jinja, ignore_missing):
         try:
             # Invoke the jinja engine to evaluate the expression.
             value, err = jinja.expand(value)
-            if err is not None:
+            if err is not None and not ignore_missing and "password" not in path:
-                if not ignore_missing and "password" not in path:
+                _LOGGER.warning(
-                    _LOGGER.warning(
+                    "Found '%s' (see %s) which looks like an expression,"
-                        "Found '%s' (see %s) which looks like an expression,"
+                    " but could not resolve all the variables: %s",
-                        " but could not resolve all the variables: %s",
+                    value,
-                        value,
+                    "->".join(str(x) for x in path),
-                        "->".join(str(x) for x in path),
+                    err.message,
-                        err.message,
+                )
-                    )
         except (
             TemplateError,
             TemplateRuntimeError,

esphome/components/sun/__init__.py

@@ -1,3 +1,4 @@
+import contextlib
 import re
 
 from esphome import automation
@@ -41,12 +42,10 @@ ELEVATION_MAP = {
 
 def elevation(value):
     if isinstance(value, str):
-        try:
+        with contextlib.suppress(cv.Invalid):
             value = ELEVATION_MAP[
                 cv.one_of(*ELEVATION_MAP, lower=True, space="_")(value)
             ]
-        except cv.Invalid:
-            pass
     value = cv.angle(value)
     return cv.float_range(min=-180, max=180)(value)
 

esphome/components/sx1509/__init__.py

@@ -41,11 +41,13 @@ SX1509KeyTrigger = sx1509_ns.class_(
 
 
 def check_keys(config):
-    if CONF_KEYS in config:
+    if (
-        if len(config[CONF_KEYS]) != config[CONF_KEY_ROWS] * config[CONF_KEY_COLUMNS]:
+        CONF_KEYS in config
-            raise cv.Invalid(
+        and len(config[CONF_KEYS]) != config[CONF_KEY_ROWS] * config[CONF_KEY_COLUMNS]
-                "The number of key codes must equal the number of rows * columns"
+    ):
-            )
+        raise cv.Invalid(
+            "The number of key codes must equal the number of rows * columns"
+        )
     return config
 
 

esphome/components/thermostat/climate.py

@@ -477,11 +477,11 @@ def validate_thermostat(config):
     if (
         CONF_ON_BOOT_RESTORE_FROM in config
         and config[CONF_ON_BOOT_RESTORE_FROM] is OnBootRestoreFrom.DEFAULT_PRESET
+        and CONF_DEFAULT_PRESET not in config
     ):
-        if CONF_DEFAULT_PRESET not in config:
+        raise cv.Invalid(
-            raise cv.Invalid(
+            f"{CONF_DEFAULT_PRESET} must be defined to use {CONF_ON_BOOT_RESTORE_FROM} in DEFAULT_PRESET mode"
-                f"{CONF_DEFAULT_PRESET} must be defined to use {CONF_ON_BOOT_RESTORE_FROM} in DEFAULT_PRESET mode"
+        )
-            )
 
     if config[CONF_FAN_WITH_COOLING] is True and CONF_FAN_ONLY_ACTION not in config:
         raise cv.Invalid(

esphome/components/time/__init__.py

@@ -236,7 +236,7 @@ def validate_time_at(value):
 
 def validate_cron_keys(value):
     if CONF_CRON in value:
-        for key in value.keys():
+        for key in value:
             if key in CRON_KEYS:
                 raise cv.Invalid(f"Cannot use option {key} when cron: is specified.")
         if CONF_AT in value:
@@ -246,7 +246,7 @@ def validate_cron_keys(value):
         value.update(cron_)
         return value
     if CONF_AT in value:
-        for key in value.keys():
+        for key in value:
             if key in CRON_KEYS:
                 raise cv.Invalid(f"Cannot use option {key} when at: is specified.")
         at_ = value[CONF_AT]

esphome/components/tuya/climate/__init__.py

@@ -46,16 +46,15 @@ TuyaClimate = tuya_ns.class_("TuyaClimate", climate.Climate, cg.Component)
 
 
 def validate_temperature_multipliers(value):
-    if CONF_TEMPERATURE_MULTIPLIER in value:
+    if CONF_TEMPERATURE_MULTIPLIER in value and (
-        if (
+        CONF_CURRENT_TEMPERATURE_MULTIPLIER in value
-            CONF_CURRENT_TEMPERATURE_MULTIPLIER in value
+        or CONF_TARGET_TEMPERATURE_MULTIPLIER in value
-            or CONF_TARGET_TEMPERATURE_MULTIPLIER in value
+    ):
-        ):
+        raise cv.Invalid(
-            raise cv.Invalid(
+            f"Cannot have {CONF_TEMPERATURE_MULTIPLIER} at the same time as "
-                f"Cannot have {CONF_TEMPERATURE_MULTIPLIER} at the same time as "
+            f"{CONF_CURRENT_TEMPERATURE_MULTIPLIER} and "
-                f"{CONF_CURRENT_TEMPERATURE_MULTIPLIER} and "
+            f"{CONF_TARGET_TEMPERATURE_MULTIPLIER}"
-                f"{CONF_TARGET_TEMPERATURE_MULTIPLIER}"
+        )
-            )
     if (
         CONF_CURRENT_TEMPERATURE_MULTIPLIER in value
         and CONF_TARGET_TEMPERATURE_MULTIPLIER not in value

esphome/components/tuya/number/__init__.py

@@ -34,12 +34,14 @@ def validate_min_max(config):
     min_value = config[CONF_MIN_VALUE]
     if max_value <= min_value:
         raise cv.Invalid("max_value must be greater than min_value")
-    if hidden_config := config.get(CONF_DATAPOINT_HIDDEN):
+    if (
-        if (initial_value := hidden_config.get(CONF_INITIAL_VALUE, None)) is not None:
+        (hidden_config := config.get(CONF_DATAPOINT_HIDDEN))
-            if (initial_value > max_value) or (initial_value < min_value):
+        and (initial_value := hidden_config.get(CONF_INITIAL_VALUE, None)) is not None
-                raise cv.Invalid(
+        and ((initial_value > max_value) or (initial_value < min_value))
-                    f"{CONF_INITIAL_VALUE} must be a value between {CONF_MAX_VALUE} and {CONF_MIN_VALUE}"
+    ):
-                )
+        raise cv.Invalid(
+            f"{CONF_INITIAL_VALUE} must be a value between {CONF_MAX_VALUE} and {CONF_MIN_VALUE}"
+        )
     return config
 
 

esphome/components/wifi/__init__.py

@@ -442,9 +442,7 @@ async def to_code(config):
 
     if CORE.is_esp8266:
         cg.add_library("ESP8266WiFi", None)
-    elif CORE.is_esp32 and CORE.using_arduino:
+    elif (CORE.is_esp32 and CORE.using_arduino) or CORE.is_rp2040:
-        cg.add_library("WiFi", None)
-    elif CORE.is_rp2040:
         cg.add_library("WiFi", None)
 
     if CORE.is_esp32 and CORE.using_esp_idf:

esphome/config.py

@@ -198,10 +198,7 @@ class Config(OrderedDict, fv.FinalValidateConfig):
         self.output_paths.remove((path, domain))
 
     def is_in_error_path(self, path: ConfigPath) -> bool:
-        for err in self.errors:
+        return any(_path_begins_with(err.path, path) for err in self.errors)
-            if _path_begins_with(err.path, path):
-                return True
-        return False
 
     def set_by_path(self, path, value):
         conf = self
@@ -224,7 +221,7 @@ class Config(OrderedDict, fv.FinalValidateConfig):
         for index, path_item in enumerate(path):
             try:
                 if path_item in data:
-                    key_data = [x for x in data.keys() if x == path_item][0]
+                    key_data = [x for x in data if x == path_item][0]
                     if isinstance(key_data, ESPHomeDataBase):
                         doc_range = key_data.esp_range
                         if get_key and index == len(path) - 1:
@@ -1081,7 +1078,7 @@ def dump_dict(
             ret += "{}"
             multiline = False
 
-        for k in conf.keys():
+        for k in conf:
             path_ = path + [k]
             error = config.get_error_for_path(path_)
             if error is not None:
@@ -1097,10 +1094,7 @@ def dump_dict(
                 msg = f"\n{indent(msg)}"
 
             if inf is not None:
-                if m:
+                msg = f" {inf}{msg}" if m else f"{msg} {inf}"
-                    msg = f" {inf}{msg}"
-                else:
-                    msg = f"{msg} {inf}"
             ret += f"{st + msg}\n"
     elif isinstance(conf, str):
         if is_secret(conf):

esphome/config_validation.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from contextlib import contextmanager
+from contextlib import contextmanager, suppress
 from dataclasses import dataclass
 from datetime import datetime
 from ipaddress import (
@@ -2113,10 +2113,8 @@ def require_esphome_version(year, month, patch):
 
 @contextmanager
 def suppress_invalid():
-    try:
+    with suppress(vol.Invalid):
         yield
-    except vol.Invalid:
-        pass
 
 
 GIT_SCHEMA = Schema(