esphome 2025.3.2__py3-none-any.whl → 2025.4.0__py3-none-any.whl

esphome/yaml_util.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import fnmatch
 import functools
 import inspect
-from io import TextIOWrapper
+from io import BytesIO, TextIOBase, TextIOWrapper
 from ipaddress import _BaseAddress
 import logging
 import math
 import os
-from typing import Any
+from typing import Any, Callable
 import uuid
 
 import yaml
@@ -69,7 +69,10 @@ class ESPForceValue:
     pass
 
 
-def make_data_base(value, from_database: ESPHomeDataBase = None):
+def make_data_base(
+    value, from_database: ESPHomeDataBase = None
+) -> ESPHomeDataBase | Any:
+    """Wrap a value in a ESPHomeDataBase object."""
     try:
         value = add_class_to_obj(value, ESPHomeDataBase)
         if from_database is not None:
@@ -102,6 +105,11 @@ def _add_data_ref(fn):
 class ESPHomeLoaderMixin:
     """Loader class that keeps track of line numbers."""
 
+    def __init__(self, name: str, yaml_loader: Callable[[str], dict[str, Any]]) -> None:
+        """Initialize the loader."""
+        self.name = name
+        self.yaml_loader = yaml_loader
+
     @_add_data_ref
     def construct_yaml_int(self, node):
         return super().construct_yaml_int(node)
@@ -127,7 +135,7 @@ class ESPHomeLoaderMixin:
         return super().construct_yaml_seq(node)
 
     @_add_data_ref
-    def construct_yaml_map(self, node):
+    def construct_yaml_map(self, node: yaml.MappingNode) -> OrderedDict[str, Any]:
         """Traverses the given mapping node and returns a list of constructed key-value pairs."""
         assert isinstance(node, yaml.MappingNode)
         # A list of key-value pairs we find in the current mapping
@@ -231,7 +239,7 @@ class ESPHomeLoaderMixin:
         return OrderedDict(pairs)
 
     @_add_data_ref
-    def construct_env_var(self, node):
+    def construct_env_var(self, node: yaml.Node) -> str:
         args = node.value.split()
         # Check for a default value
         if len(args) > 1:
@@ -243,23 +251,23 @@ class ESPHomeLoaderMixin:
         )
 
     @property
-    def _directory(self):
+    def _directory(self) -> str:
         return os.path.dirname(self.name)
 
-    def _rel_path(self, *args):
+    def _rel_path(self, *args: str) -> str:
         return os.path.join(self._directory, *args)
 
     @_add_data_ref
-    def construct_secret(self, node):
+    def construct_secret(self, node: yaml.Node) -> str:
         try:
-            secrets = _load_yaml_internal(self._rel_path(SECRET_YAML))
+            secrets = self.yaml_loader(self._rel_path(SECRET_YAML))
         except EsphomeError as e:
             if self.name == CORE.config_path:
                 raise e
             try:
                 main_config_dir = os.path.dirname(CORE.config_path)
                 main_secret_yml = os.path.join(main_config_dir, SECRET_YAML)
-                secrets = _load_yaml_internal(main_secret_yml)
+                secrets = self.yaml_loader(main_secret_yml)
             except EsphomeError as er:
                 raise EsphomeError(f"{e}\n{er}") from er
 
@@ -272,7 +280,9 @@ class ESPHomeLoaderMixin:
         return val
 
     @_add_data_ref
-    def construct_include(self, node):
+    def construct_include(
+        self, node: yaml.Node
+    ) -> dict[str, Any] | OrderedDict[str, Any]:
         from esphome.const import CONF_VARS
 
         def extract_file_vars(node):
@@ -290,71 +300,93 @@ class ESPHomeLoaderMixin:
         else:
             file, vars = node.value, None
 
-        result = _load_yaml_internal(self._rel_path(file))
+        result = self.yaml_loader(self._rel_path(file))
         if not vars:
             vars = {}
         result = substitute_vars(result, vars)
         return result
 
     @_add_data_ref
-    def construct_include_dir_list(self, node):
+    def construct_include_dir_list(self, node: yaml.Node) -> list[dict[str, Any]]:
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
-        return [_load_yaml_internal(f) for f in files]
+        return [self.yaml_loader(f) for f in files]
 
     @_add_data_ref
-    def construct_include_dir_merge_list(self, node):
+    def construct_include_dir_merge_list(self, node: yaml.Node) -> list[dict[str, Any]]:
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
         merged_list = []
         for fname in files:
-            loaded_yaml = _load_yaml_internal(fname)
+            loaded_yaml = self.yaml_loader(fname)
             if isinstance(loaded_yaml, list):
                 merged_list.extend(loaded_yaml)
         return merged_list
 
     @_add_data_ref
-    def construct_include_dir_named(self, node):
+    def construct_include_dir_named(
+        self, node: yaml.Node
+    ) -> OrderedDict[str, dict[str, Any]]:
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
         mapping = OrderedDict()
         for fname in files:
             filename = os.path.splitext(os.path.basename(fname))[0]
-            mapping[filename] = _load_yaml_internal(fname)
+            mapping[filename] = self.yaml_loader(fname)
         return mapping
 
     @_add_data_ref
-    def construct_include_dir_merge_named(self, node):
+    def construct_include_dir_merge_named(
+        self, node: yaml.Node
+    ) -> OrderedDict[str, dict[str, Any]]:
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
         mapping = OrderedDict()
         for fname in files:
-            loaded_yaml = _load_yaml_internal(fname)
+            loaded_yaml = self.yaml_loader(fname)
             if isinstance(loaded_yaml, dict):
                 mapping.update(loaded_yaml)
         return mapping
 
     @_add_data_ref
-    def construct_lambda(self, node):
+    def construct_lambda(self, node: yaml.Node) -> Lambda:
         return Lambda(str(node.value))
 
     @_add_data_ref
-    def construct_force(self, node):
+    def construct_force(self, node: yaml.Node) -> ESPForceValue:
         obj = self.construct_scalar(node)
         return add_class_to_obj(obj, ESPForceValue)
 
     @_add_data_ref
-    def construct_extend(self, node):
+    def construct_extend(self, node: yaml.Node) -> Extend:
         return Extend(str(node.value))
 
     @_add_data_ref
-    def construct_remove(self, node):
+    def construct_remove(self, node: yaml.Node) -> Remove:
         return Remove(str(node.value))
 
 
 class ESPHomeLoader(ESPHomeLoaderMixin, FastestAvailableSafeLoader):
     """Loader class that keeps track of line numbers."""
 
+    def __init__(
+        self,
+        stream: TextIOBase | BytesIO,
+        name: str,
+        yaml_loader: Callable[[str], dict[str, Any]],
+    ) -> None:
+        FastestAvailableSafeLoader.__init__(self, stream)
+        ESPHomeLoaderMixin.__init__(self, name, yaml_loader)
+
 
 class ESPHomePurePythonLoader(ESPHomeLoaderMixin, PurePythonLoader):
     """Loader class that keeps track of line numbers."""
 
+    def __init__(
+        self,
+        stream: TextIOBase | BytesIO,
+        name: str,
+        yaml_loader: Callable[[str], dict[str, Any]],
+    ) -> None:
+        PurePythonLoader.__init__(self, stream)
+        ESPHomeLoaderMixin.__init__(self, name, yaml_loader)
+
 
 for _loader in (ESPHomeLoader, ESPHomePurePythonLoader):
     _loader.add_constructor("tag:yaml.org,2002:int", _loader.construct_yaml_int)
@@ -388,17 +420,30 @@ def load_yaml(fname: str, clear_secrets: bool = True) -> Any:
     return _load_yaml_internal(fname)
 
 
-def parse_yaml(file_name: str, file_handle: TextIOWrapper) -> Any:
+def _load_yaml_internal(fname: str) -> Any:
+    """Load a YAML file."""
+    try:
+        with open(fname, encoding="utf-8") as f_handle:
+            return parse_yaml(fname, f_handle)
+    except (UnicodeDecodeError, OSError) as err:
+        raise EsphomeError(f"Error reading file {fname}: {err}") from err
+
+
+def parse_yaml(
+    file_name: str, file_handle: TextIOWrapper, yaml_loader=_load_yaml_internal
+) -> Any:
     """Parse a YAML file."""
     try:
-        return _load_yaml_internal_with_type(ESPHomeLoader, file_name, file_handle)
+        return _load_yaml_internal_with_type(
+            ESPHomeLoader, file_name, file_handle, yaml_loader
+        )
     except EsphomeError:
         # Loading failed, so we now load with the Python loader which has more
         # readable exceptions
         # Rewind the stream so we can try again
         file_handle.seek(0, 0)
         return _load_yaml_internal_with_type(
-            ESPHomePurePythonLoader, file_name, file_handle
+            ESPHomePurePythonLoader, file_name, file_handle, yaml_loader
         )
 
 
@@ -435,23 +480,14 @@ def substitute_vars(config, vars):
     return result
 
 
-def _load_yaml_internal(fname: str) -> Any:
-    """Load a YAML file."""
-    try:
-        with open(fname, encoding="utf-8") as f_handle:
-            return parse_yaml(fname, f_handle)
-    except (UnicodeDecodeError, OSError) as err:
-        raise EsphomeError(f"Error reading file {fname}: {err}") from err
-
-
 def _load_yaml_internal_with_type(
     loader_type: type[ESPHomeLoader] | type[ESPHomePurePythonLoader],
     fname: str,
     content: TextIOWrapper,
+    yaml_loader: Any,
 ) -> Any:
     """Load a YAML file."""
-    loader = loader_type(content)
-    loader.name = fname
+    loader = loader_type(content, fname, yaml_loader)
     try:
         return loader.get_single_data() or OrderedDict()
     except yaml.YAMLError as exc:
@@ -470,7 +506,7 @@ def dump(dict_, show_secrets=False):
     )
 
 
-def _is_file_valid(name):
+def _is_file_valid(name: str) -> bool:
     """Decide if a file is valid."""
     return not name.startswith(".")
 

{esphome-2025.3.2.dist-info → esphome-2025.4.0.dist-info}/METADATA

@@ -1,8 +1,8 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: esphome
-Version: 2025.3.2
+Version: 2025.4.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@nabucasa.com>
+Author-email: The ESPHome Authors <esphome@openhomefoundation.org>
 License: MIT
 Project-URL: Documentation, https://esphome.io
 Project-URL: Source Code, https://github.com/esphome/esphome
@@ -23,49 +23,50 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cryptography ==44.0.2
-Requires-Dist: voluptuous ==0.14.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: tzlocal ==5.2
-Requires-Dist: tzdata >=2021.1
-Requires-Dist: pyserial ==3.5
-Requires-Dist: platformio ==6.1.16
-Requires-Dist: esptool ==4.8.1
-Requires-Dist: click ==8.1.7
-Requires-Dist: esphome-dashboard ==20250212.0
-Requires-Dist: aioesphomeapi ==29.6.0
-Requires-Dist: zeroconf ==0.146.1
-Requires-Dist: puremagic ==1.27
-Requires-Dist: ruamel.yaml ==0.18.6
-Requires-Dist: esphome-glyphsets ==0.1.0
-Requires-Dist: pillow ==10.4.0
-Requires-Dist: freetype-py ==2.5.1
-Requires-Dist: kconfiglib ==13.7.1
-Requires-Dist: pyparsing >=3.0
-Requires-Dist: argcomplete >=2.0.0
-Requires-Dist: async-timeout ==4.0.3 ; python_version <= "3.10"
+Requires-Dist: async_timeout==5.0.1; python_version <= "3.10"
+Requires-Dist: cryptography==44.0.2
+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: tzlocal==5.3.1
+Requires-Dist: tzdata>=2021.1
+Requires-Dist: pyserial==3.5
+Requires-Dist: platformio==6.1.18
+Requires-Dist: esptool==4.8.1
+Requires-Dist: click==8.1.7
+Requires-Dist: esphome-dashboard==20250415.0
+Requires-Dist: aioesphomeapi==29.10.0
+Requires-Dist: zeroconf==0.146.5
+Requires-Dist: puremagic==1.28
+Requires-Dist: ruamel.yaml==0.18.10
+Requires-Dist: esphome-glyphsets==0.2.0
+Requires-Dist: pillow==10.4.0
+Requires-Dist: freetype-py==2.5.1
+Requires-Dist: kconfiglib==13.7.1
+Requires-Dist: pyparsing>=3.0
+Requires-Dist: argcomplete>=2.0.0
 Provides-Extra: dev
-Requires-Dist: clang-format ==13.0.1 ; extra == 'dev'
-Requires-Dist: clang-tidy ==18.1.8 ; extra == 'dev'
-Requires-Dist: yamllint ==1.35.1 ; extra == 'dev'
-Provides-Extra: displays
-Requires-Dist: cairosvg ==2.7.1 ; extra == 'displays'
+Requires-Dist: clang-format==13.0.1; extra == "dev"
+Requires-Dist: clang-tidy==18.1.8; extra == "dev"
+Requires-Dist: yamllint==1.37.0; extra == "dev"
 Provides-Extra: test
-Requires-Dist: pylint ==3.2.7 ; extra == 'test'
-Requires-Dist: flake8 ==7.0.0 ; extra == 'test'
-Requires-Dist: ruff ==0.9.2 ; extra == 'test'
-Requires-Dist: pyupgrade ==3.15.2 ; extra == 'test'
-Requires-Dist: pre-commit ; extra == 'test'
-Requires-Dist: pytest ==8.2.0 ; extra == 'test'
-Requires-Dist: pytest-cov ==5.0.0 ; extra == 'test'
-Requires-Dist: pytest-mock ==3.14.0 ; extra == 'test'
-Requires-Dist: pytest-asyncio ==0.23.6 ; extra == 'test'
-Requires-Dist: asyncmock ==0.4.2 ; extra == 'test'
-Requires-Dist: hypothesis ==6.92.1 ; extra == 'test'
+Requires-Dist: pylint==3.3.6; extra == "test"
+Requires-Dist: flake8==7.2.0; extra == "test"
+Requires-Dist: ruff==0.11.2; extra == "test"
+Requires-Dist: pyupgrade==3.19.1; extra == "test"
+Requires-Dist: pre-commit; extra == "test"
+Requires-Dist: pytest==8.3.5; extra == "test"
+Requires-Dist: pytest-cov==6.0.0; extra == "test"
+Requires-Dist: pytest-mock==3.14.0; extra == "test"
+Requires-Dist: pytest-asyncio==0.26.0; extra == "test"
+Requires-Dist: asyncmock==0.4.2; extra == "test"
+Requires-Dist: hypothesis==6.92.1; extra == "test"
+Provides-Extra: displays
+Requires-Dist: cairosvg==2.7.1; extra == "displays"
+Dynamic: license-file
 
 # ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)