esphome 2025.5.1__py3-none-any.whl → 2025.6.0__py3-none-any.whl

esphome/dashboard/web_server.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import base64
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 import datetime
 import functools
 import gzip
@@ -17,7 +17,7 @@ import shutil
 import subprocess
 import threading
 import time
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
 from urllib.parse import urlparse
 
 import tornado

esphome/git.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime
 import hashlib
@@ -5,7 +6,6 @@ import logging
 from pathlib import Path
 import re
 import subprocess
-from typing import Callable, Optional
 import urllib.parse
 
 import esphome.config_validation as cv
@@ -45,12 +45,12 @@ def clone_or_update(
     *,
     url: str,
     ref: str = None,
-    refresh: Optional[TimePeriodSeconds],
+    refresh: TimePeriodSeconds | None,
     domain: str,
     username: str = None,
     password: str = None,
-    submodules: Optional[list[str]] = None,
-) -> tuple[Path, Optional[Callable[[], None]]]:
+    submodules: list[str] | None = None,
+) -> tuple[Path, Callable[[], None] | None]:
     key = f"{url}@{ref}"
 
     if username is not None and password is not None:

esphome/helpers.py

@@ -7,7 +7,6 @@ from pathlib import Path
 import platform
 import re
 import tempfile
-from typing import Union
 from urllib.parse import urlparse
 
 _LOGGER = logging.getLogger(__name__)
@@ -219,8 +218,8 @@ def sort_ip_addresses(address_list: list[str]) -> list[str]:
             int,
             int,
             int,
-            Union[str, None],
-            Union[tuple[str, int], tuple[str, int, int, int]],
+            str | None,
+            tuple[str, int] | tuple[str, int, int, int],
         ]
     ] = []
     for addr in address_list:
@@ -282,7 +281,7 @@ def read_file(path):
         raise EsphomeError(f"Error reading file {path}: {err}") from err
 
 
-def _write_file(path: Union[Path, str], text: Union[str, bytes]):
+def _write_file(path: Path | str, text: str | bytes):
     """Atomically writes `text` to the given path.
 
     Automatically creates all parent directories.
@@ -315,7 +314,7 @@ def _write_file(path: Union[Path, str], text: Union[str, bytes]):
                 _LOGGER.error("Write file cleanup failed: %s", err)
 
 
-def write_file(path: Union[Path, str], text: str):
+def write_file(path: Path | str, text: str):
     try:
         _write_file(path, text)
     except OSError as err:
@@ -324,7 +323,7 @@ def write_file(path: Union[Path, str], text: str):
         raise EsphomeError(f"Could not write file at {path}") from err
 
 
-def write_file_if_changed(path: Union[Path, str], text: str) -> bool:
+def write_file_if_changed(path: Path | str, text: str) -> bool:
     """Write text to the given path, but not if the contents match already.
 
     Returns true if the file was changed.

esphome/loader.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from contextlib import AbstractContextManager
 from dataclasses import dataclass
 import importlib
@@ -8,7 +9,7 @@ import logging
 from pathlib import Path
 import sys
 from types import ModuleType
-from typing import Any, Callable, Optional
+from typing import Any
 
 from esphome.const import SOURCE_FILE_EXTENSIONS
 from esphome.core import CORE
@@ -57,7 +58,7 @@ class ComponentManifest:
         return getattr(self.module, "IS_TARGET_PLATFORM", False)
 
     @property
-    def config_schema(self) -> Optional[Any]:
+    def config_schema(self) -> Any | None:
         return getattr(self.module, "CONFIG_SCHEMA", None)
 
     @property
@@ -69,7 +70,7 @@ class ComponentManifest:
         return getattr(self.module, "MULTI_CONF_NO_DEFAULT", False)
 
     @property
-    def to_code(self) -> Optional[Callable[[Any], None]]:
+    def to_code(self) -> Callable[[Any], None] | None:
         return getattr(self.module, "to_code", None)
 
     @property
@@ -96,7 +97,7 @@ class ComponentManifest:
         return getattr(self.module, "INSTANCE_TYPE", None)
 
     @property
-    def final_validate_schema(self) -> Optional[Callable[[ConfigType], None]]:
+    def final_validate_schema(self) -> Callable[[ConfigType], None] | None:
         """Components can declare a `FINAL_VALIDATE_SCHEMA` cv.Schema that gets called
         after the main validation. In that function checks across components can be made.
 
@@ -129,7 +130,7 @@ class ComponentManifest:
 
 class ComponentMetaFinder(importlib.abc.MetaPathFinder):
     def __init__(
-        self, components_path: Path, allowed_components: Optional[list[str]] = None
+        self, components_path: Path, allowed_components: list[str] | None = None
     ) -> None:
         self._allowed_components = allowed_components
         self._finders = []
@@ -140,7 +141,7 @@ class ComponentMetaFinder(importlib.abc.MetaPathFinder):
                 continue
             self._finders.append(finder)
 
-    def find_spec(self, fullname: str, path: Optional[list[str]], target=None):
+    def find_spec(self, fullname: str, path: list[str] | None, target=None):
         if not fullname.startswith("esphome.components."):
             return None
         parts = fullname.split(".")
@@ -167,7 +168,7 @@ def clear_component_meta_finders():
 
 
 def install_meta_finder(
-    components_path: Path, allowed_components: Optional[list[str]] = None
+    components_path: Path, allowed_components: list[str] | None = None
 ):
     sys.meta_path.insert(0, ComponentMetaFinder(components_path, allowed_components))
 

esphome/log.py

@@ -59,7 +59,13 @@ class ESPHomeLogFormatter(logging.Formatter):
             "ERROR": AnsiFore.RED.value,
             "CRITICAL": AnsiFore.RED.value,
         }.get(record.levelname, "")
-        return f"{prefix}{formatted}{AnsiStyle.RESET_ALL.value}"
+        message = f"{prefix}{formatted}{AnsiStyle.RESET_ALL.value}"
+        if CORE.dashboard:
+            try:
+                message = message.replace("\033", "\\033")
+            except UnicodeEncodeError:
+                pass
+        return message
 
 
 def setup_log(

esphome/platformio_api.py

@@ -5,7 +5,6 @@ import os
 from pathlib import Path
 import re
 import subprocess
-from typing import Union
 
 from esphome.const import CONF_COMPILE_PROCESS_LIMIT, CONF_ESPHOME, KEY_CORE
 from esphome.core import CORE, EsphomeError
@@ -73,7 +72,7 @@ FILTER_PLATFORMIO_LINES = [
 ]
 
 
-def run_platformio_cli(*args, **kwargs) -> Union[str, int]:
+def run_platformio_cli(*args, **kwargs) -> str | int:
     os.environ["PLATFORMIO_FORCE_COLOR"] = "true"
     os.environ["PLATFORMIO_BUILD_DIR"] = os.path.abspath(CORE.relative_pioenvs_path())
     os.environ.setdefault(
@@ -93,7 +92,7 @@ def run_platformio_cli(*args, **kwargs) -> Union[str, int]:
     return run_external_command(platformio.__main__.main, *cmd, **kwargs)
 
 
-def run_platformio_cli_run(config, verbose, *args, **kwargs) -> Union[str, int]:
+def run_platformio_cli_run(config, verbose, *args, **kwargs) -> str | int:
     command = ["run", "-d", CORE.build_path]
     if verbose:
         command += ["-v"]

esphome/storage_json.py

@@ -46,15 +46,16 @@ class StorageJSON:
         storage_version: int,
         name: str,
         friendly_name: str,
-        comment: str,
-        esphome_version: str,
+        comment: str | None,
+        esphome_version: str | None,
         src_version: int | None,
         address: str,
         web_port: int | None,
         target_platform: str,
-        build_path: str,
-        firmware_bin_path: str,
+        build_path: str | None,
+        firmware_bin_path: str | None,
         loaded_integrations: set[str],
+        loaded_platforms: set[str],
         no_mdns: bool,
         framework: str | None = None,
         core_platform: str | None = None,
@@ -86,6 +87,8 @@ class StorageJSON:
         self.firmware_bin_path = firmware_bin_path
         # A set of strings of names of loaded integrations
         self.loaded_integrations = loaded_integrations
+        # A set of strings for platform/integration combos
+        self.loaded_platforms = loaded_platforms
         # Is mDNS disabled
         self.no_mdns = no_mdns
         # The framework used to compile the firmware
@@ -107,6 +110,7 @@ class StorageJSON:
             "build_path": self.build_path,
             "firmware_bin_path": self.firmware_bin_path,
             "loaded_integrations": sorted(self.loaded_integrations),
+            "loaded_platforms": sorted(self.loaded_platforms),
             "no_mdns": self.no_mdns,
             "framework": self.framework,
             "core_platform": self.core_platform,
@@ -138,6 +142,7 @@ class StorageJSON:
             build_path=esph.build_path,
             firmware_bin_path=esph.firmware_bin,
             loaded_integrations=esph.loaded_integrations,
+            loaded_platforms=esph.loaded_platforms,
             no_mdns=(
                 CONF_MDNS in esph.config
                 and CONF_DISABLED in esph.config[CONF_MDNS]
@@ -164,6 +169,7 @@ class StorageJSON:
             build_path=None,
             firmware_bin_path=None,
             loaded_integrations=set(),
+            loaded_platforms=set(),
             no_mdns=False,
             framework=None,
             core_platform=platform.lower(),
@@ -187,6 +193,7 @@ class StorageJSON:
         build_path = storage.get("build_path")
         firmware_bin_path = storage.get("firmware_bin_path")
         loaded_integrations = set(storage.get("loaded_integrations", []))
+        loaded_platforms = set(storage.get("loaded_platforms", []))
         no_mdns = storage.get("no_mdns", False)
         framework = storage.get("framework")
         core_platform = storage.get("core_platform")
@@ -203,6 +210,7 @@ class StorageJSON:
             build_path,
             firmware_bin_path,
             loaded_integrations,
+            loaded_platforms,
             no_mdns,
             framework,
             core_platform,
@@ -252,7 +260,7 @@ class EsphomeStorageJSON:
     def last_update_check(self, new: datetime) -> None:
         self.last_update_check_str = new.strftime("%Y-%m-%dT%H:%M:%S")
 
-    def to_json(self) -> dict:
+    def to_json(self) -> str:
         return f"{json.dumps(self.as_dict(), indent=2)}\n"
 
     def save(self, path: str) -> None:

esphome/types.py

@@ -1,19 +1,18 @@
 """This helper module tracks commonly used types in the esphome python codebase."""
 
-from typing import Union
-
 from esphome.core import ID, EsphomeCore, Lambda
 
-ConfigFragmentType = Union[
-    str,
-    int,
-    float,
-    None,
-    dict[Union[str, int], "ConfigFragmentType"],
-    list["ConfigFragmentType"],
-    ID,
-    Lambda,
-]
+ConfigFragmentType = (
+    str
+    | int
+    | float
+    | None
+    | dict[str | int, "ConfigFragmentType"]
+    | list["ConfigFragmentType"]
+    | ID
+    | Lambda
+)
+
 ConfigType = dict[str, ConfigFragmentType]
 CoreType = EsphomeCore
-ConfigPathType = Union[str, int]
+ConfigPathType = str | int

esphome/util.py

@@ -6,7 +6,6 @@ from pathlib import Path
 import re
 import subprocess
 import sys
-from typing import Union
 
 from esphome import const
 
@@ -162,7 +161,7 @@ class RedirectText:
 
 def run_external_command(
     func, *cmd, capture_stdout: bool = False, filter_lines: str = None
-) -> Union[int, str]:
+) -> int | str:
     """
     Run a function from an external package that acts like a main method.
 

esphome/wizard.py

@@ -67,20 +67,6 @@ esp8266:
 """
 
 ESP32_CONFIG = """
-esp32:
-  board: {board}
-  framework:
-    type: arduino
-"""
-
-ESP32S2_CONFIG = """
-esp32:
-  board: {board}
-  framework:
-    type: esp-idf
-"""
-
-ESP32C3_CONFIG = """
 esp32:
   board: {board}
   framework:
@@ -105,8 +91,6 @@ rtl87xx:
 HARDWARE_BASE_CONFIGS = {
     "ESP8266": ESP8266_CONFIG,
     "ESP32": ESP32_CONFIG,
-    "ESP32S2": ESP32S2_CONFIG,
-    "ESP32C3": ESP32C3_CONFIG,
     "RP2040": RP2040_CONFIG,
     "BK72XX": BK72XX_CONFIG,
     "RTL87XX": RTL87XX_CONFIG,

esphome/writer.py

@@ -3,7 +3,6 @@ import logging
 import os
 from pathlib import Path
 import re
-from typing import Union
 
 from esphome import loader
 from esphome.config import iter_component_configs, iter_components
@@ -108,7 +107,10 @@ def storage_should_clean(old: StorageJSON, new: StorageJSON) -> bool:
         return True
     if old.build_path != new.build_path:
         return True
-    if old.loaded_integrations != new.loaded_integrations:
+    if (
+        old.loaded_integrations != new.loaded_integrations
+        or old.loaded_platforms != new.loaded_platforms
+    ):
         if new.core_platform == PLATFORM_ESP32:
             from esphome.components.esp32 import FRAMEWORK_ESP_IDF
 
@@ -132,7 +134,7 @@ def update_storage_json():
     new.save(path)
 
 
-def format_ini(data: dict[str, Union[str, list[str]]]) -> str:
+def format_ini(data: dict[str, str | list[str]]) -> str:
     content = ""
     for key, value in sorted(data.items()):
         if isinstance(value, list):

esphome/yaml_util.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 import fnmatch
 import functools
 import inspect
@@ -8,7 +9,7 @@ from ipaddress import _BaseAddress
 import logging
 import math
 import os
-from typing import Any, Callable
+from typing import Any
 import uuid
 
 import yaml
@@ -603,6 +604,10 @@ class ESPHomeDumper(yaml.SafeDumper):
             return self.represent_secret(value.id)
         return self.represent_stringify(value.id)
 
+    # The below override configures this dumper to indent output YAML properly:
+    def increase_indent(self, flow=False, indentless=False):
+        return super().increase_indent(flow, False)
+
 
 ESPHomeDumper.add_multi_representer(
     dict, lambda dumper, value: dumper.represent_mapping("tag:yaml.org,2002:map", value)

esphome/zeroconf.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 from dataclasses import dataclass
 import logging
-from typing import Callable
 
 from zeroconf import (
     AddressResolver,

{esphome-2025.5.1.dist-info → esphome-2025.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esphome
-Version: 2025.5.1
+Version: 2025.6.0
 Summary: ESPHome is a system to configure your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems.
 Author-email: The ESPHome Authors <esphome@openhomefoundation.org>
 License: MIT
@@ -20,17 +20,17 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: C++
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Home Automation
-Requires-Python: >=3.9.0
+Requires-Python: >=3.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: async_timeout==5.0.1; python_version <= "3.10"
-Requires-Dist: cryptography==44.0.2
+Requires-Dist: cryptography==45.0.1
 Requires-Dist: voluptuous==0.15.2
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: paho-mqtt==1.6.1
 Requires-Dist: colorama==0.4.6
 Requires-Dist: icmplib==3.0.4
-Requires-Dist: tornado==6.4.2
+Requires-Dist: tornado==6.5.1
 Requires-Dist: tzlocal==5.3.1
 Requires-Dist: tzdata>=2021.1
 Requires-Dist: pyserial==3.5
@@ -38,13 +38,13 @@ Requires-Dist: platformio==6.1.18
 Requires-Dist: esptool==4.8.1
 Requires-Dist: click==8.1.7
 Requires-Dist: esphome-dashboard==20250514.0
-Requires-Dist: aioesphomeapi==30.2.0
+Requires-Dist: aioesphomeapi==32.2.3
 Requires-Dist: zeroconf==0.147.0
 Requires-Dist: puremagic==1.29
-Requires-Dist: ruamel.yaml==0.18.10
+Requires-Dist: ruamel.yaml==0.18.14
 Requires-Dist: esphome-glyphsets==0.2.0
 Requires-Dist: pillow==10.4.0
-Requires-Dist: cairosvg==2.7.1
+Requires-Dist: cairosvg==2.8.2
 Requires-Dist: freetype-py==2.5.1
 Requires-Dist: kconfiglib==13.7.1
 Requires-Dist: pyparsing>=3.0
@@ -56,13 +56,14 @@ Requires-Dist: yamllint==1.37.1; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pylint==3.3.7; extra == "test"
 Requires-Dist: flake8==7.2.0; extra == "test"
-Requires-Dist: ruff==0.11.9; extra == "test"
-Requires-Dist: pyupgrade==3.19.1; extra == "test"
+Requires-Dist: ruff==0.11.13; extra == "test"
+Requires-Dist: pyupgrade==3.20.0; extra == "test"
 Requires-Dist: pre-commit; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
+Requires-Dist: pytest==8.4.0; extra == "test"
 Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest-mock==3.14.0; extra == "test"
+Requires-Dist: pytest-mock==3.14.1; extra == "test"
 Requires-Dist: pytest-asyncio==0.26.0; extra == "test"
+Requires-Dist: pytest-xdist==3.7.0; extra == "test"
 Requires-Dist: asyncmock==0.4.2; extra == "test"
 Requires-Dist: hypothesis==6.92.1; extra == "test"
 Dynamic: license-file