esphome 2025.5.2__py3-none-any.whl → 2025.6.0b2__py3-none-any.whl

esphome/components/wifi/wifi_component_esp32_arduino.cpp

@@ -91,7 +91,7 @@ bool WiFiComponent::wifi_mode_(optional<bool> sta, optional<bool> ap) {
   bool ret = WiFiClass::mode(set_mode);
 
   if (!ret) {
-    ESP_LOGW(TAG, "Setting WiFi mode failed!");
+    ESP_LOGW(TAG, "Setting mode failed");
     return false;
   }
 
@@ -590,7 +590,7 @@ void WiFiComponent::wifi_event_callback_(esphome_wifi_event_id_t event, esphome_
       // Mitigate CVE-2020-12638
       // https://lbsfilm.at/blog/wpa2-authenticationmode-downgrade-in-espressif-microprocessors
       if (it.old_mode != WIFI_AUTH_OPEN && it.new_mode == WIFI_AUTH_OPEN) {
-        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting...");
+        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting");
         // we can't call retry_connect() from this context, so disconnect immediately
         // and notify main thread with error_from_callback_
         err_t err = esp_wifi_disconnect();

esphome/components/wifi/wifi_component_esp8266.cpp

@@ -32,11 +32,11 @@ extern "C" {
 #endif
 }
 
+#include "esphome/core/application.h"
+#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/util.h"
-#include "esphome/core/application.h"
 
 namespace esphome {
 namespace wifi {
@@ -525,7 +525,7 @@ void WiFiComponent::wifi_event_callback(System_Event_t *event) {
       // Mitigate CVE-2020-12638
       // https://lbsfilm.at/blog/wpa2-authenticationmode-downgrade-in-espressif-microprocessors
       if (it.old_mode != AUTH_OPEN && it.new_mode == AUTH_OPEN) {
-        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting...");
+        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting");
         // we can't call retry_connect() from this context, so disconnect immediately
         // and notify main thread with error_from_callback_
         wifi_station_disconnect();

esphome/components/wifi/wifi_component_libretiny.cpp

@@ -9,10 +9,10 @@
 #include "lwip/err.h"
 #include "lwip/dns.h"
 
+#include "esphome/core/application.h"
+#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/application.h"
 #include "esphome/core/util.h"
 
 namespace esphome {
@@ -50,7 +50,7 @@ bool WiFiComponent::wifi_mode_(optional<bool> sta, optional<bool> ap) {
   bool ret = WiFi.mode(static_cast<wifi_mode_t>(mode));
 
   if (!ret) {
-    ESP_LOGW(TAG, "Setting WiFi mode failed!");
+    ESP_LOGW(TAG, "Setting mode failed");
   }
 
   return ret;
@@ -315,7 +315,7 @@ void WiFiComponent::wifi_event_callback_(esphome_wifi_event_id_t event, esphome_
       // Mitigate CVE-2020-12638
       // https://lbsfilm.at/blog/wpa2-authenticationmode-downgrade-in-espressif-microprocessors
       if (it.old_mode != WIFI_AUTH_OPEN && it.new_mode == WIFI_AUTH_OPEN) {
-        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting...");
+        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting");
         // we can't call retry_connect() from this context, so disconnect immediately
         // and notify main thread with error_from_callback_
         WiFi.disconnect();

esphome/components/wireguard/wireguard.cpp

@@ -21,13 +21,13 @@ static const char *const TAG = "wireguard";
  * Cannot use `static const char*` for LOGMSG_PEER_STATUS on esp8266 platform
  * because log messages in `Wireguard::update()` method fail.
  */
-#define LOGMSG_PEER_STATUS "WireGuard remote peer is %s (latest handshake %s)"
+#define LOGMSG_PEER_STATUS "Remote peer is %s (latest handshake %s)"
 
 static const char *const LOGMSG_ONLINE = "online";
 static const char *const LOGMSG_OFFLINE = "offline";
 
 void Wireguard::setup() {
-  ESP_LOGD(TAG, "initializing WireGuard...");
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   this->wg_config_.address = this->address_.c_str();
   this->wg_config_.private_key = this->private_key_.c_str();
@@ -45,7 +45,7 @@ void Wireguard::setup() {
   this->wg_initialized_ = esp_wireguard_init(&(this->wg_config_), &(this->wg_ctx_));
 
   if (this->wg_initialized_ == ESP_OK) {
-    ESP_LOGI(TAG, "WireGuard initialized");
+    ESP_LOGI(TAG, "Initialized");
     this->wg_peer_offline_time_ = millis();
     this->srctime_->add_on_time_sync_callback(std::bind(&Wireguard::start_connection_, this));
     this->defer(std::bind(&Wireguard::start_connection_, this));  // defer to avoid blocking setup
@@ -56,7 +56,7 @@ void Wireguard::setup() {
     }
 #endif
   } else {
-    ESP_LOGE(TAG, "cannot initialize WireGuard, error code %d", this->wg_initialized_);
+    ESP_LOGE(TAG, "Cannot initialize: error code %d", this->wg_initialized_);
     this->mark_failed();
   }
 }
@@ -67,7 +67,7 @@ void Wireguard::loop() {
   }
 
   if ((this->wg_initialized_ == ESP_OK) && (this->wg_connected_ == ESP_OK) && (!network::is_connected())) {
-    ESP_LOGV(TAG, "local network connection has been lost, stopping WireGuard...");
+    ESP_LOGV(TAG, "Local network connection has been lost, stopping");
     this->stop_connection_();
   }
 }
@@ -109,7 +109,7 @@ void Wireguard::update() {
     // check reboot timeout every time the peer is down
     if (this->enabled_ && this->reboot_timeout_ > 0) {
       if (millis() - this->wg_peer_offline_time_ > this->reboot_timeout_) {
-        ESP_LOGE(TAG, "WireGuard remote peer is unreachable, rebooting...");
+        ESP_LOGE(TAG, "Remote peer is unreachable; rebooting");
         App.reboot();
       }
     }
@@ -201,14 +201,14 @@ void Wireguard::disable_auto_proceed() { this->proceed_allowed_ = false; }
 
 void Wireguard::enable() {
   this->enabled_ = true;
-  ESP_LOGI(TAG, "WireGuard enabled");
+  ESP_LOGI(TAG, "Enabled");
   this->publish_enabled_state();
 }
 
 void Wireguard::disable() {
   this->enabled_ = false;
   this->defer(std::bind(&Wireguard::stop_connection_, this));  // defer to avoid blocking running loop
-  ESP_LOGI(TAG, "WireGuard disabled");
+  ESP_LOGI(TAG, "Disabled");
   this->publish_enabled_state();
 }
 
@@ -224,44 +224,44 @@ bool Wireguard::is_enabled() { return this->enabled_; }
 
 void Wireguard::start_connection_() {
   if (!this->enabled_) {
-    ESP_LOGV(TAG, "WireGuard is disabled, cannot start connection");
+    ESP_LOGV(TAG, "Disabled, cannot start connection");
     return;
   }
 
   if (this->wg_initialized_ != ESP_OK) {
-    ESP_LOGE(TAG, "cannot start WireGuard, initialization in error with code %d", this->wg_initialized_);
+    ESP_LOGE(TAG, "Cannot start: error code %d", this->wg_initialized_);
     return;
   }
 
   if (!network::is_connected()) {
-    ESP_LOGD(TAG, "WireGuard is waiting for local network connection to be available");
+    ESP_LOGD(TAG, "Waiting for local network connection to be available");
     return;
   }
 
   if (!this->srctime_->now().is_valid()) {
-    ESP_LOGD(TAG, "WireGuard is waiting for system time to be synchronized");
+    ESP_LOGD(TAG, "Waiting for system time to be synchronized");
     return;
   }
 
   if (this->wg_connected_ == ESP_OK) {
-    ESP_LOGV(TAG, "WireGuard connection already started");
+    ESP_LOGV(TAG, "Connection already started");
     return;
   }
 
-  ESP_LOGD(TAG, "starting WireGuard connection...");
+  ESP_LOGD(TAG, "Starting connection");
   this->wg_connected_ = esp_wireguard_connect(&(this->wg_ctx_));
 
   if (this->wg_connected_ == ESP_OK) {
-    ESP_LOGI(TAG, "WireGuard connection started");
+    ESP_LOGI(TAG, "Connection started");
   } else if (this->wg_connected_ == ESP_ERR_RETRY) {
-    ESP_LOGD(TAG, "WireGuard is waiting for endpoint IP address to be available");
+    ESP_LOGD(TAG, "Waiting for endpoint IP address to be available");
     return;
   } else {
-    ESP_LOGW(TAG, "cannot start WireGuard connection, error code %d", this->wg_connected_);
+    ESP_LOGW(TAG, "Cannot start connection, error code %d", this->wg_connected_);
     return;
   }
 
-  ESP_LOGD(TAG, "configuring WireGuard allowed IPs list...");
+  ESP_LOGD(TAG, "Configuring allowed IPs list");
   bool allowed_ips_ok = true;
   for (std::tuple<std::string, std::string> ip : this->allowed_ips_) {
     allowed_ips_ok &=
@@ -269,9 +269,9 @@ void Wireguard::start_connection_() {
   }
 
   if (allowed_ips_ok) {
-    ESP_LOGD(TAG, "allowed IPs list configured correctly");
+    ESP_LOGD(TAG, "Allowed IPs list configured correctly");
   } else {
-    ESP_LOGE(TAG, "cannot configure WireGuard allowed IPs list, aborting...");
+    ESP_LOGE(TAG, "Cannot configure allowed IPs list, aborting");
     this->stop_connection_();
     this->mark_failed();
   }
@@ -279,7 +279,7 @@ void Wireguard::start_connection_() {
 
 void Wireguard::stop_connection_() {
   if (this->wg_initialized_ == ESP_OK && this->wg_connected_ == ESP_OK) {
-    ESP_LOGD(TAG, "stopping WireGuard connection...");
+    ESP_LOGD(TAG, "Stopping connection");
     esp_wireguard_disconnect(&(this->wg_ctx_));
     this->wg_connected_ = ESP_FAIL;
   }

esphome/components/wl_134/text_sensor.py

@@ -1,11 +1,10 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor, uart
 import esphome.config_validation as cv
-from esphome.const import ICON_FINGERPRINT
+from esphome.const import CONF_RESET, ICON_FINGERPRINT
 
 CODEOWNERS = ["@hobbypunk90"]
 DEPENDENCIES = ["uart"]
-CONF_RESET = "reset"
 
 wl134_ns = cg.esphome_ns.namespace("wl_134")
 Wl134Component = wl134_ns.class_(

esphome/components/wled/wled_light_effect.cpp

@@ -1,8 +1,8 @@
 #ifdef USE_ARDUINO
 
 #include "wled_light_effect.h"
-#include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 #include <WiFi.h>

esphome/components/x9c/x9c.cpp

@@ -34,7 +34,7 @@ void X9cOutput::trim_value(int change_amount) {
 }
 
 void X9cOutput::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up X9C Potentiometer with initial value of %f", this->initial_value_);
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   this->inc_pin_->get_pin();
   this->inc_pin_->setup();
@@ -68,8 +68,10 @@ void X9cOutput::dump_config() {
   LOG_PIN("  Chip Select Pin: ", this->cs_pin_);
   LOG_PIN("  Increment Pin: ", this->inc_pin_);
   LOG_PIN("  Up/Down Pin: ", this->ud_pin_);
-  ESP_LOGCONFIG(TAG, "  Initial Value: %f", this->initial_value_);
-  ESP_LOGCONFIG(TAG, "  Step Delay: %d", this->step_delay_);
+  ESP_LOGCONFIG(TAG,
+                "  Initial Value: %f\n"
+                "  Step Delay: %d",
+                this->initial_value_, this->step_delay_);
   LOG_FLOAT_OUTPUT(this);
 }
 

esphome/components/xgzp68xx/xgzp68xx.cpp

@@ -1,7 +1,7 @@
 #include "xgzp68xx.h"
-#include "esphome/core/log.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 #include "esphome/components/i2c/i2c.h"
 
 #include <cinttypes>
@@ -69,22 +69,24 @@ void XGZP68XXComponent::update() {
 }
 
 void XGZP68XXComponent::setup() {
-  ESP_LOGD(TAG, "Setting up XGZP68xx...");
+  ESP_LOGCONFIG(TAG, "Running setup");
   uint8_t config;
 
   // Display some sample bits to confirm we are talking to the sensor
   this->read_register(SYSCONFIG_ADDRESS, &config, 1);
-  ESP_LOGCONFIG(TAG, "Gain value is %d", (config >> 3) & 0b111);
-  ESP_LOGCONFIG(TAG, "XGZP68xx started!");
+  ESP_LOGCONFIG(TAG,
+                "Gain value is %d\n"
+                "XGZP68xx started!",
+                (config >> 3) & 0b111);
 }
 
 void XGZP68XXComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "XGZP68xx");
+  ESP_LOGCONFIG(TAG, "XGZP68xx:");
   LOG_SENSOR("  ", "Temperature: ", this->temperature_sensor_);
   LOG_SENSOR("  ", "Pressure: ", this->pressure_sensor_);
   LOG_I2C_DEVICE(this);
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "  Connection with XGZP68xx failed!");
+    ESP_LOGE(TAG, "  Connection failed");
   }
   LOG_UPDATE_INTERVAL(this);
 }

esphome/components/xiaomi_cgd1/xiaomi_cgd1.cpp

@@ -9,8 +9,10 @@ namespace xiaomi_cgd1 {
 static const char *const TAG = "xiaomi_cgd1";
 
 void XiaomiCGD1::dump_config() {
-  ESP_LOGCONFIG(TAG, "Xiaomi CGD1");
-  ESP_LOGCONFIG(TAG, "  Bindkey: %s", format_hex_pretty(this->bindkey_, 16).c_str());
+  ESP_LOGCONFIG(TAG,
+                "Xiaomi CGD1\n"
+                "  Bindkey: %s",
+                format_hex_pretty(this->bindkey_, 16).c_str());
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Humidity", this->humidity_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);

esphome/components/xiaomi_cgdk2/xiaomi_cgdk2.cpp

@@ -9,8 +9,10 @@ namespace xiaomi_cgdk2 {
 static const char *const TAG = "xiaomi_cgdk2";
 
 void XiaomiCGDK2::dump_config() {
-  ESP_LOGCONFIG(TAG, "Xiaomi CGDK2");
-  ESP_LOGCONFIG(TAG, "  Bindkey: %s", format_hex_pretty(this->bindkey_, 16).c_str());
+  ESP_LOGCONFIG(TAG,
+                "Xiaomi CGDK2\n"
+                "  Bindkey: %s",
+                format_hex_pretty(this->bindkey_, 16).c_str());
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Humidity", this->humidity_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);

esphome/components/xiaomi_cgg1/xiaomi_cgg1.cpp

@@ -9,8 +9,10 @@ namespace xiaomi_cgg1 {
 static const char *const TAG = "xiaomi_cgg1";
 
 void XiaomiCGG1::dump_config() {
-  ESP_LOGCONFIG(TAG, "Xiaomi CGG1");
-  ESP_LOGCONFIG(TAG, "  Bindkey: %s", format_hex_pretty(this->bindkey_, 16).c_str());
+  ESP_LOGCONFIG(TAG,
+                "Xiaomi CGG1\n"
+                "  Bindkey: %s",
+                format_hex_pretty(this->bindkey_, 16).c_str());
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Humidity", this->humidity_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);

esphome/components/xiaomi_hhccjcy10/xiaomi_hhccjcy10.cpp

@@ -1,6 +1,6 @@
 #include "xiaomi_hhccjcy10.h"
-#include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 

esphome/components/xiaomi_lywsd02mmc/xiaomi_lywsd02mmc.cpp

@@ -9,8 +9,10 @@ namespace xiaomi_lywsd02mmc {
 static const char *const TAG = "xiaomi_lywsd02mmc";
 
 void XiaomiLYWSD02MMC::dump_config() {
-  ESP_LOGCONFIG(TAG, "Xiaomi LYWSD02MMC");
-  ESP_LOGCONFIG(TAG, "  Bindkey: %s", format_hex_pretty(this->bindkey_, 16).c_str());
+  ESP_LOGCONFIG(TAG,
+                "Xiaomi LYWSD02MMC\n"
+                "  Bindkey: %s",
+                format_hex_pretty(this->bindkey_, 16).c_str());
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Humidity", this->humidity_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);

esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.cpp

@@ -9,8 +9,10 @@ namespace xiaomi_lywsd03mmc {
 static const char *const TAG = "xiaomi_lywsd03mmc";
 
 void XiaomiLYWSD03MMC::dump_config() {
-  ESP_LOGCONFIG(TAG, "Xiaomi LYWSD03MMC");
-  ESP_LOGCONFIG(TAG, "  Bindkey: %s", format_hex_pretty(this->bindkey_, 16).c_str());
+  ESP_LOGCONFIG(TAG,
+                "Xiaomi LYWSD03MMC\n"
+                "  Bindkey: %s",
+                format_hex_pretty(this->bindkey_, 16).c_str());
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Humidity", this->humidity_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);

esphome/components/xiaomi_mhoc401/xiaomi_mhoc401.cpp

@@ -9,8 +9,10 @@ namespace xiaomi_mhoc401 {
 static const char *const TAG = "xiaomi_mhoc401";
 
 void XiaomiMHOC401::dump_config() {
-  ESP_LOGCONFIG(TAG, "Xiaomi MHOC401");
-  ESP_LOGCONFIG(TAG, "  Bindkey: %s", format_hex_pretty(this->bindkey_, 16).c_str());
+  ESP_LOGCONFIG(TAG,
+                "Xiaomi MHOC401\n"
+                "  Bindkey: %s",
+                format_hex_pretty(this->bindkey_, 16).c_str());
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Humidity", this->humidity_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);

esphome/components/xl9535/xl9535.cpp

@@ -7,7 +7,7 @@ namespace xl9535 {
 static const char *const TAG = "xl9535";
 
 void XL9535Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up XL9535...");
+  ESP_LOGCONFIG(TAG, "Running setup");
 
   // Check to see if the device can read from the register
   uint8_t port = 0;
@@ -22,7 +22,7 @@ void XL9535Component::dump_config() {
   LOG_I2C_DEVICE(this);
 
   if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with XL9535 failed!");
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
 }
 

esphome/components/xpt2046/touchscreen/xpt2046.cpp

@@ -1,6 +1,6 @@
 #include "xpt2046.h"
-#include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 #include <algorithm>
 
@@ -62,16 +62,17 @@ void XPT2046Component::dump_config() {
   ESP_LOGCONFIG(TAG, "XPT2046:");
 
   LOG_PIN("  IRQ Pin: ", this->irq_pin_);
-  ESP_LOGCONFIG(TAG, "  X min: %d", this->x_raw_min_);
-  ESP_LOGCONFIG(TAG, "  X max: %d", this->x_raw_max_);
-  ESP_LOGCONFIG(TAG, "  Y min: %d", this->y_raw_min_);
-  ESP_LOGCONFIG(TAG, "  Y max: %d", this->y_raw_max_);
-
-  ESP_LOGCONFIG(TAG, "  Swap X/Y: %s", YESNO(this->swap_x_y_));
-  ESP_LOGCONFIG(TAG, "  Invert X: %s", YESNO(this->invert_x_));
-  ESP_LOGCONFIG(TAG, "  Invert Y: %s", YESNO(this->invert_y_));
-
-  ESP_LOGCONFIG(TAG, "  threshold: %d", this->threshold_);
+  ESP_LOGCONFIG(TAG,
+                "  X min: %d\n"
+                "  X max: %d\n"
+                "  Y min: %d\n"
+                "  Y max: %d\n"
+                "  Swap X/Y: %s\n"
+                "  Invert X: %s\n"
+                "  Invert Y: %s\n"
+                "  threshold: %d",
+                this->x_raw_min_, this->x_raw_max_, this->y_raw_min_, this->y_raw_max_, YESNO(this->swap_x_y_),
+                YESNO(this->invert_x_), YESNO(this->invert_y_), this->threshold_);
 
   LOG_UPDATE_INTERVAL(this);
 }

esphome/components/xpt2046/touchscreen/xpt2046.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/core/automation.h"
 #include "esphome/components/spi/spi.h"
 #include "esphome/components/touchscreen/touchscreen.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 

esphome/config.py

@@ -7,7 +7,7 @@ import functools
 import heapq
 import logging
 import re
-from typing import Any, Union
+from typing import Any
 
 import voluptuous as vol
 
@@ -63,7 +63,7 @@ def iter_component_configs(config):
                 yield p_name, platform, p_config
 
 
-ConfigPath = list[Union[str, int]]
+ConfigPath = list[str | int]
 path_context = contextvars.ContextVar("Config path")
 
 
@@ -389,6 +389,7 @@ class LoadValidationStep(ConfigValidationStep):
                 result.add_str_error(f"Platform not found: '{p_domain}'", path)
                 continue
             CORE.loaded_integrations.add(p_name)
+            CORE.loaded_platforms.add(f"{self.domain}/{p_name}")
 
             # Process AUTO_LOAD
             for load in platform.auto_load:

esphome/config_validation.py

@@ -982,23 +982,32 @@ def uuid(value):
 
 
 METRIC_SUFFIXES = {
-    "E": 1e18,
-    "P": 1e15,
-    "T": 1e12,
-    "G": 1e9,
-    "M": 1e6,
-    "k": 1e3,
-    "da": 10,
-    "d": 1e-1,
-    "c": 1e-2,
-    "m": 0.001,
-    "µ": 1e-6,
-    "u": 1e-6,
-    "n": 1e-9,
-    "p": 1e-12,
-    "f": 1e-15,
-    "a": 1e-18,
-    "": 1,
+    "Q": 1e30,  # Quetta
+    "R": 1e27,  # Ronna
+    "Y": 1e24,  # Yotta
+    "Z": 1e21,  # Zetta
+    "E": 1e18,  # Exa
+    "P": 1e15,  # Peta
+    "T": 1e12,  # Tera
+    "G": 1e9,  # Giga
+    "M": 1e6,  # Mega
+    "k": 1e3,  # Kilo
+    "h": 1e2,  # Hecto
+    "da": 1e1,  # Deca
+    "": 1e0,  # No prefix
+    "d": 1e-1,  # Deci
+    "c": 1e-2,  # Centi
+    "m": 1e-3,  # Milli
+    "µ": 1e-6,  # Micro
+    "u": 1e-6,  # Micro (same as µ)
+    "n": 1e-9,  # Nano
+    "p": 1e-12,  # Pico
+    "f": 1e-15,  # Femto
+    "a": 1e-18,  # Atto
+    "z": 1e-21,  # Zepto
+    "y": 1e-24,  # Yocto
+    "r": 1e-27,  # Ronto
+    "q": 1e-30,  # Quecto
 }
 
 
@@ -1658,6 +1667,26 @@ class OnlyWith(Optional):
         pass
 
 
+class OnlyWithout(Optional):
+    """Set the default value only if the given component is NOT loaded."""
+
+    def __init__(self, key, component, default=None):
+        super().__init__(key)
+        self._component = component
+        self._default = vol.default_factory(default)
+
+    @property
+    def default(self):
+        if self._component not in CORE.loaded_integrations:
+            return self._default
+        return vol.UNDEFINED
+
+    @default.setter
+    def default(self, value):
+        # Ignore default set from vol.Optional
+        pass
+
+
 def _entity_base_validator(config):
     if CONF_NAME not in config and CONF_ID not in config:
         raise Invalid("At least one of 'id:' or 'name:' is required!")

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2025.5.2"
+__version__ = "2025.6.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (
@@ -735,6 +735,7 @@ CONF_REFRESH = "refresh"
 CONF_RELABEL = "relabel"
 CONF_REPEAT = "repeat"
 CONF_REPOSITORY = "repository"
+CONF_RESET = "reset"
 CONF_RESET_DURATION = "reset_duration"
 CONF_RESET_PIN = "reset_pin"
 CONF_RESIZE = "resize"
@@ -962,6 +963,7 @@ CONF_WAND_ID = "wand_id"
 CONF_WARM_WHITE = "warm_white"
 CONF_WARM_WHITE_COLOR_TEMPERATURE = "warm_white_color_temperature"
 CONF_WATCHDOG_THRESHOLD = "watchdog_threshold"
+CONF_WATCHDOG_TIMEOUT = "watchdog_timeout"
 CONF_WEB_SERVER = "web_server"
 CONF_WEB_SERVER_ID = "web_server_id"
 CONF_WEIGHT = "weight"
@@ -974,7 +976,9 @@ CONF_WIND_DIRECTION_DEGREES = "wind_direction_degrees"
 CONF_WIND_SPEED = "wind_speed"
 CONF_WINDOW_SIZE = "window_size"
 CONF_WRITE_PIN = "write_pin"
+CONF_X = "x"
 CONF_X_GRID = "x_grid"
+CONF_Y = "y"
 CONF_Y_GRID = "y_grid"
 CONF_YEAR = "year"
 CONF_ZERO = "zero"
@@ -1130,11 +1134,13 @@ UNIT_WATT_HOURS = "Wh"
 # device classes
 DEVICE_CLASS_APPARENT_POWER = "apparent_power"
 DEVICE_CLASS_AQI = "aqi"
+DEVICE_CLASS_AREA = "area"
 DEVICE_CLASS_ATMOSPHERIC_PRESSURE = "atmospheric_pressure"
 DEVICE_CLASS_AWNING = "awning"
 DEVICE_CLASS_BATTERY = "battery"
 DEVICE_CLASS_BATTERY_CHARGING = "battery_charging"
 DEVICE_CLASS_BLIND = "blind"
+DEVICE_CLASS_BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
 DEVICE_CLASS_BUTTON = "button"
 DEVICE_CLASS_CARBON_DIOXIDE = "carbon_dioxide"
 DEVICE_CLASS_CARBON_MONOXIDE = "carbon_monoxide"
@@ -1153,6 +1159,7 @@ DEVICE_CLASS_DOORBELL = "doorbell"
 DEVICE_CLASS_DURATION = "duration"
 DEVICE_CLASS_EMPTY = ""
 DEVICE_CLASS_ENERGY = "energy"
+DEVICE_CLASS_ENERGY_DISTANCE = "energy_distance"
 DEVICE_CLASS_ENERGY_STORAGE = "energy_storage"
 DEVICE_CLASS_FIRMWARE = "firmware"
 DEVICE_CLASS_FREQUENCY = "frequency"
@@ -1190,6 +1197,7 @@ DEVICE_CLASS_PRECIPITATION_INTENSITY = "precipitation_intensity"
 DEVICE_CLASS_PRESENCE = "presence"
 DEVICE_CLASS_PRESSURE = "pressure"
 DEVICE_CLASS_PROBLEM = "problem"
+DEVICE_CLASS_REACTIVE_ENERGY = "reactive_energy"
 DEVICE_CLASS_REACTIVE_POWER = "reactive_power"
 DEVICE_CLASS_RESTART = "restart"
 DEVICE_CLASS_RUNNING = "running"
@@ -1217,6 +1225,7 @@ DEVICE_CLASS_VOLUME_STORAGE = "volume_storage"
 DEVICE_CLASS_WATER = "water"
 DEVICE_CLASS_WEIGHT = "weight"
 DEVICE_CLASS_WINDOW = "window"
+DEVICE_CLASS_WIND_DIRECTION = "wind_direction"
 DEVICE_CLASS_WIND_SPEED = "wind_speed"
 
 # state classes