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

esphome/__main__.py

@@ -375,12 +375,10 @@ def upload_program(config, args, host):
     password = ota_conf.get(CONF_PASSWORD, "")
 
     if (
-        CONF_MQTT in config  # pylint: disable=too-many-boolean-expressions
+        not is_ip_address(CORE.address)  # pylint: disable=too-many-boolean-expressions
+        and (get_port_type(host) == "MQTT" or config[CONF_MDNS][CONF_DISABLED])
+        and CONF_MQTT in config
         and (not args.device or args.device in ("MQTT", "OTA"))
-        and (
-            ((config[CONF_MDNS][CONF_DISABLED]) and not is_ip_address(CORE.address))
-            or get_port_type(host) == "MQTT"
-        )
     ):
         from esphome import mqtt
 

esphome/components/am2315c/am2315c.cpp

@@ -128,7 +128,7 @@ void AM2315C::update() {
   data[2] = 0x00;
   if (this->write(data, 3) != i2c::ERROR_OK) {
     ESP_LOGE(TAG, "Write failed!");
-    this->status_set_warning();
+    this->mark_failed();
     return;
   }
 
@@ -138,12 +138,12 @@ void AM2315C::update() {
     uint8_t status = 0;
     if (this->read(&status, 1) != i2c::ERROR_OK) {
       ESP_LOGE(TAG, "Read failed!");
-      this->status_set_warning();
+      this->mark_failed();
       return;
     }
     if ((status & 0x80) == 0x80) {
       ESP_LOGE(TAG, "HW still busy!");
-      this->status_set_warning();
+      this->mark_failed();
       return;
     }
 
@@ -151,7 +151,7 @@ void AM2315C::update() {
     uint8_t data[7];
     if (this->read(data, 7) != i2c::ERROR_OK) {
       ESP_LOGE(TAG, "Read failed!");
-      this->status_set_warning();
+      this->mark_failed();
       return;
     }
 

esphome/components/sml/sml.cpp

@@ -52,8 +52,9 @@ void Sml::loop() {
             break;
 
           // remove start/end sequence
-          this->process_sml_file_(
-              BytesView(this->sml_data_).subview(START_SEQ.size(), this->sml_data_.size() - START_SEQ.size() - 8));
+          this->sml_data_.erase(this->sml_data_.begin(), this->sml_data_.begin() + START_SEQ.size());
+          this->sml_data_.resize(this->sml_data_.size() - 8);
+          this->process_sml_file_(this->sml_data_);
         }
         break;
       };
@@ -65,8 +66,8 @@ void Sml::add_on_data_callback(std::function<void(std::vector<uint8_t>, bool)> &
   this->data_callbacks_.add(std::move(callback));
 }
 
-void Sml::process_sml_file_(const BytesView &sml_data) {
-  SmlFile sml_file(sml_data);
+void Sml::process_sml_file_(const bytes &sml_data) {
+  SmlFile sml_file = SmlFile(sml_data);
   std::vector<ObisInfo> obis_info = sml_file.get_obis_info();
   this->publish_obis_info_(obis_info);
 
@@ -74,7 +75,6 @@ void Sml::process_sml_file_(const BytesView &sml_data) {
 }
 
 void Sml::log_obis_info_(const std::vector<ObisInfo> &obis_info_vec) {
-#ifdef ESPHOME_LOG_HAS_DEBUG
   ESP_LOGD(TAG, "OBIS info:");
   for (auto const &obis_info : obis_info_vec) {
     std::string info;
@@ -83,7 +83,6 @@ void Sml::log_obis_info_(const std::vector<ObisInfo> &obis_info_vec) {
     info += " [0x" + bytes_repr(obis_info.value) + "]";
     ESP_LOGD(TAG, "%s", info.c_str());
   }
-#endif
 }
 
 void Sml::publish_obis_info_(const std::vector<ObisInfo> &obis_info_vec) {
@@ -93,11 +92,10 @@ void Sml::publish_obis_info_(const std::vector<ObisInfo> &obis_info_vec) {
 }
 
 void Sml::publish_value_(const ObisInfo &obis_info) {
-  const auto obis_code = obis_info.code_repr();
   for (auto const &sml_listener : sml_listeners_) {
     if ((!sml_listener->server_id.empty()) && (bytes_repr(obis_info.server_id) != sml_listener->server_id))
       continue;
-    if (obis_code != sml_listener->obis_code)
+    if (obis_info.code_repr() != sml_listener->obis_code)
       continue;
     sml_listener->publish_val(obis_info);
   }

esphome/components/sml/sml.h

@@ -27,7 +27,7 @@ class Sml : public Component, public uart::UARTDevice {
   void add_on_data_callback(std::function<void(std::vector<uint8_t>, bool)> &&callback);
 
  protected:
-  void process_sml_file_(const BytesView &sml_data);
+  void process_sml_file_(const bytes &sml_data);
   void log_obis_info_(const std::vector<ObisInfo> &obis_info_vec);
   void publish_obis_info_(const std::vector<ObisInfo> &obis_info_vec);
   char check_start_end_bytes_(uint8_t byte);

esphome/components/sml/sml_parser.cpp

@@ -5,17 +5,17 @@
 namespace esphome {
 namespace sml {
 
-SmlFile::SmlFile(const BytesView &buffer) : buffer_(buffer) {
+SmlFile::SmlFile(bytes buffer) : buffer_(std::move(buffer)) {
   // extract messages
   this->pos_ = 0;
   while (this->pos_ < this->buffer_.size()) {
     if (this->buffer_[this->pos_] == 0x00)
       break;  // EndOfSmlMsg
 
-    SmlNode message;
+    SmlNode message = SmlNode();
     if (!this->setup_node(&message))
       break;
-    this->messages.emplace_back(std::move(message));
+    this->messages.emplace_back(message);
   }
 }
 
@@ -62,20 +62,22 @@ bool SmlFile::setup_node(SmlNode *node) {
     return false;
 
   node->type = type;
+  node->nodes.clear();
+  node->value_bytes.clear();
 
   if (type == SML_LIST) {
     node->nodes.reserve(length);
     for (size_t i = 0; i != length; i++) {
-      SmlNode child_node;
+      SmlNode child_node = SmlNode();
       if (!this->setup_node(&child_node))
         return false;
-      node->nodes.emplace_back(std::move(child_node));
+      node->nodes.emplace_back(child_node);
     }
   } else {
     // Value starts at the current position
     // Value ends "length" bytes later,
     // (since the TL field is counted but already subtracted from length)
-    node->value_bytes = buffer_.subview(this->pos_, length);
+    node->value_bytes = bytes(this->buffer_.begin() + this->pos_, this->buffer_.begin() + this->pos_ + length);
     // Increment the pointer past all consumed bytes
     this->pos_ += length;
   }
@@ -85,14 +87,14 @@ bool SmlFile::setup_node(SmlNode *node) {
 std::vector<ObisInfo> SmlFile::get_obis_info() {
   std::vector<ObisInfo> obis_info;
   for (auto const &message : messages) {
-    const auto &message_body = message.nodes[3];
+    SmlNode message_body = message.nodes[3];
     uint16_t message_type = bytes_to_uint(message_body.nodes[0].value_bytes);
     if (message_type != SML_GET_LIST_RES)
       continue;
 
-    const auto &get_list_response = message_body.nodes[1];
-    const auto &server_id = get_list_response.nodes[1].value_bytes;
-    const auto &val_list = get_list_response.nodes[4];
+    SmlNode get_list_response = message_body.nodes[1];
+    bytes server_id = get_list_response.nodes[1].value_bytes;
+    SmlNode val_list = get_list_response.nodes[4];
 
     for (auto const &val_list_entry : val_list.nodes) {
       obis_info.emplace_back(server_id, val_list_entry);
@@ -101,7 +103,7 @@ std::vector<ObisInfo> SmlFile::get_obis_info() {
   return obis_info;
 }
 
-std::string bytes_repr(const BytesView &buffer) {
+std::string bytes_repr(const bytes &buffer) {
   std::string repr;
   for (auto const value : buffer) {
     repr += str_sprintf("%02x", value & 0xff);
@@ -109,7 +111,7 @@ std::string bytes_repr(const BytesView &buffer) {
   return repr;
 }
 
-uint64_t bytes_to_uint(const BytesView &buffer) {
+uint64_t bytes_to_uint(const bytes &buffer) {
   uint64_t val = 0;
   for (auto const value : buffer) {
     val = (val << 8) + value;
@@ -117,7 +119,7 @@ uint64_t bytes_to_uint(const BytesView &buffer) {
   return val;
 }
 
-int64_t bytes_to_int(const BytesView &buffer) {
+int64_t bytes_to_int(const bytes &buffer) {
   uint64_t tmp = bytes_to_uint(buffer);
   int64_t val;
 
@@ -133,14 +135,14 @@ int64_t bytes_to_int(const BytesView &buffer) {
   return val;
 }
 
-std::string bytes_to_string(const BytesView &buffer) { return std::string(buffer.begin(), buffer.end()); }
+std::string bytes_to_string(const bytes &buffer) { return std::string(buffer.begin(), buffer.end()); }
 
-ObisInfo::ObisInfo(const BytesView &server_id, const SmlNode &val_list_entry) : server_id(server_id) {
+ObisInfo::ObisInfo(bytes server_id, SmlNode val_list_entry) : server_id(std::move(server_id)) {
   this->code = val_list_entry.nodes[0].value_bytes;
   this->status = val_list_entry.nodes[1].value_bytes;
   this->unit = bytes_to_uint(val_list_entry.nodes[3].value_bytes);
   this->scaler = bytes_to_int(val_list_entry.nodes[4].value_bytes);
-  const auto &value_node = val_list_entry.nodes[5];
+  SmlNode value_node = val_list_entry.nodes[5];
   this->value = value_node.value_bytes;
   this->value_type = value_node.type;
 }

esphome/components/sml/sml_parser.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <cassert>
 #include <cstdint>
 #include <cstdio>
 #include <string>
@@ -12,73 +11,44 @@ namespace sml {
 
 using bytes = std::vector<uint8_t>;
 
-class BytesView {
- public:
-  BytesView() noexcept = default;
-
-  explicit BytesView(const uint8_t *first, size_t count) noexcept : data_{first}, count_{count} {}
-
-  explicit BytesView(const bytes &bytes) noexcept : data_{bytes.data()}, count_{bytes.size()} {}
-
-  size_t size() const noexcept { return count_; }
-
-  uint8_t operator[](size_t index) const noexcept {
-    assert(index < count_);
-    return data_[index];
-  }
-
-  BytesView subview(size_t offset, size_t count) const noexcept {
-    assert(offset + count <= count_);
-    return BytesView{data_ + offset, count};
-  }
-
-  const uint8_t *begin() const noexcept { return data_; }
-
-  const uint8_t *end() const noexcept { return data_ + count_; }
-
- private:
-  const uint8_t *data_ = nullptr;
-  size_t count_ = 0;
-};
-
 class SmlNode {
  public:
   uint8_t type;
-  BytesView value_bytes;
+  bytes value_bytes;
   std::vector<SmlNode> nodes;
 };
 
 class ObisInfo {
  public:
-  ObisInfo(const BytesView &server_id, const SmlNode &val_list_entry);
-  BytesView server_id;
-  BytesView code;
-  BytesView status;
+  ObisInfo(bytes server_id, SmlNode val_list_entry);
+  bytes server_id;
+  bytes code;
+  bytes status;
   char unit;
   char scaler;
-  BytesView value;
+  bytes value;
   uint16_t value_type;
   std::string code_repr() const;
 };
 
 class SmlFile {
  public:
-  SmlFile(const BytesView &buffer);
+  SmlFile(bytes buffer);
   bool setup_node(SmlNode *node);
   std::vector<SmlNode> messages;
   std::vector<ObisInfo> get_obis_info();
 
  protected:
-  const BytesView buffer_;
+  const bytes buffer_;
   size_t pos_;
 };
 
-std::string bytes_repr(const BytesView &buffer);
+std::string bytes_repr(const bytes &buffer);
 
-uint64_t bytes_to_uint(const BytesView &buffer);
+uint64_t bytes_to_uint(const bytes &buffer);
 
-int64_t bytes_to_int(const BytesView &buffer);
+int64_t bytes_to_int(const bytes &buffer);
 
-std::string bytes_to_string(const BytesView &buffer);
+std::string bytes_to_string(const bytes &buffer);
 }  // namespace sml
 }  // namespace esphome

esphome/config_validation.py

@@ -1499,9 +1499,30 @@ def dimensions(value):
 
 
 def directory(value):
+    import json
+
     value = string(value)
     path = CORE.relative_config_path(value)
 
+    if CORE.vscode and (
+        not CORE.ace or os.path.abspath(path) == os.path.abspath(CORE.config_path)
+    ):
+        print(
+            json.dumps(
+                {
+                    "type": "check_directory_exists",
+                    "path": path,
+                }
+            )
+        )
+        data = json.loads(input())
+        assert data["type"] == "directory_exists_response"
+        if data["content"]:
+            return value
+        raise Invalid(
+            f"Could not find directory '{path}'. Please make sure it exists (full path: {os.path.abspath(path)})."
+        )
+
     if not os.path.exists(path):
         raise Invalid(
             f"Could not find directory '{path}'. Please make sure it exists (full path: {os.path.abspath(path)})."
@@ -1514,9 +1535,30 @@ def directory(value):
 
 
 def file_(value):
+    import json
+
     value = string(value)
     path = CORE.relative_config_path(value)
 
+    if CORE.vscode and (
+        not CORE.ace or os.path.abspath(path) == os.path.abspath(CORE.config_path)
+    ):
+        print(
+            json.dumps(
+                {
+                    "type": "check_file_exists",
+                    "path": path,
+                }
+            )
+        )
+        data = json.loads(input())
+        assert data["type"] == "file_exists_response"
+        if data["content"]:
+            return value
+        raise Invalid(
+            f"Could not find file '{path}'. Please make sure it exists (full path: {os.path.abspath(path)})."
+        )
+
     if not os.path.exists(path):
         raise Invalid(
             f"Could not find file '{path}'. Please make sure it exists (full path: {os.path.abspath(path)})."

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2025.4.0"
+__version__ = "2025.4.0b2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

esphome/core/__init__.py

@@ -475,6 +475,7 @@ class EsphomeCore:
         self.dashboard = False
         # True if command is run from vscode api
         self.vscode = False
+        self.ace = False
         # The name of the node
         self.name: Optional[str] = None
         # The friendly name of the node

esphome/vscode.py

@@ -78,47 +78,28 @@ def _print_file_read_event(path: str) -> None:
     )
 
 
-def _request_and_get_stream_on_stdin(fname: str) -> StringIO:
-    _print_file_read_event(fname)
-    raw_yaml_stream = StringIO(_read_file_content_from_json_on_stdin())
-    return raw_yaml_stream
-
-
-def _vscode_loader(fname: str) -> dict[str, Any]:
-    raw_yaml_stream = _request_and_get_stream_on_stdin(fname)
-    # it is required to set the name on StringIO so document on start_mark
-    # is set properly. Otherwise it is initialized with "<file>"
-    raw_yaml_stream.name = fname
-    return parse_yaml(fname, raw_yaml_stream, _vscode_loader)
-
-
-def _ace_loader(fname: str) -> dict[str, Any]:
-    raw_yaml_stream = _request_and_get_stream_on_stdin(fname)
-    return parse_yaml(fname, raw_yaml_stream)
-
-
 def read_config(args):
     while True:
         CORE.reset()
         data = json.loads(input())
-        assert data["type"] == "validate" or data["type"] == "exit"
-        if data["type"] == "exit":
-            return
+        assert data["type"] == "validate"
         CORE.vscode = True
-        if args.ace:  # Running from ESPHome Compiler dashboard, not vscode
-            CORE.config_path = os.path.join(args.configuration, data["file"])
-            loader = _ace_loader
+        CORE.ace = args.ace
+        f = data["file"]
+        if CORE.ace:
+            CORE.config_path = os.path.join(args.configuration, f)
         else:
             CORE.config_path = data["file"]
-            loader = _vscode_loader
 
         file_name = CORE.config_path
+        _print_file_read_event(file_name)
+        raw_yaml = _read_file_content_from_json_on_stdin()
         command_line_substitutions: dict[str, Any] = (
             dict(args.substitution) if args.substitution else {}
         )
         vs = VSCodeResult()
         try:
-            config = loader(file_name)
+            config = parse_yaml(file_name, StringIO(raw_yaml))
             res = validate_config(config, command_line_substitutions)
         except Exception as err:  # pylint: disable=broad-except
             vs.add_yaml_error(str(err))

esphome/yaml_util.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import fnmatch
 import functools
 import inspect
-from io import BytesIO, TextIOBase, TextIOWrapper
+from io import TextIOWrapper
 from ipaddress import _BaseAddress
 import logging
 import math
 import os
-from typing import Any, Callable
+from typing import Any
 import uuid
 
 import yaml
@@ -69,10 +69,7 @@ class ESPForceValue:
     pass
 
 
-def make_data_base(
-    value, from_database: ESPHomeDataBase = None
-) -> ESPHomeDataBase | Any:
-    """Wrap a value in a ESPHomeDataBase object."""
+def make_data_base(value, from_database: ESPHomeDataBase = None):
     try:
         value = add_class_to_obj(value, ESPHomeDataBase)
         if from_database is not None:
@@ -105,11 +102,6 @@ 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)
@@ -135,7 +127,7 @@ class ESPHomeLoaderMixin:
         return super().construct_yaml_seq(node)
 
     @_add_data_ref
-    def construct_yaml_map(self, node: yaml.MappingNode) -> OrderedDict[str, Any]:
+    def construct_yaml_map(self, node):
         """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
@@ -239,7 +231,7 @@ class ESPHomeLoaderMixin:
         return OrderedDict(pairs)
 
     @_add_data_ref
-    def construct_env_var(self, node: yaml.Node) -> str:
+    def construct_env_var(self, node):
         args = node.value.split()
         # Check for a default value
         if len(args) > 1:
@@ -251,23 +243,23 @@ class ESPHomeLoaderMixin:
         )
 
     @property
-    def _directory(self) -> str:
+    def _directory(self):
         return os.path.dirname(self.name)
 
-    def _rel_path(self, *args: str) -> str:
+    def _rel_path(self, *args):
         return os.path.join(self._directory, *args)
 
     @_add_data_ref
-    def construct_secret(self, node: yaml.Node) -> str:
+    def construct_secret(self, node):
         try:
-            secrets = self.yaml_loader(self._rel_path(SECRET_YAML))
+            secrets = _load_yaml_internal(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 = self.yaml_loader(main_secret_yml)
+                secrets = _load_yaml_internal(main_secret_yml)
             except EsphomeError as er:
                 raise EsphomeError(f"{e}\n{er}") from er
 
@@ -280,9 +272,7 @@ class ESPHomeLoaderMixin:
         return val
 
     @_add_data_ref
-    def construct_include(
-        self, node: yaml.Node
-    ) -> dict[str, Any] | OrderedDict[str, Any]:
+    def construct_include(self, node):
         from esphome.const import CONF_VARS
 
         def extract_file_vars(node):
@@ -300,93 +290,71 @@ class ESPHomeLoaderMixin:
         else:
             file, vars = node.value, None
 
-        result = self.yaml_loader(self._rel_path(file))
+        result = _load_yaml_internal(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: yaml.Node) -> list[dict[str, Any]]:
+    def construct_include_dir_list(self, node):
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
-        return [self.yaml_loader(f) for f in files]
+        return [_load_yaml_internal(f) for f in files]
 
     @_add_data_ref
-    def construct_include_dir_merge_list(self, node: yaml.Node) -> list[dict[str, Any]]:
+    def construct_include_dir_merge_list(self, node):
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
         merged_list = []
         for fname in files:
-            loaded_yaml = self.yaml_loader(fname)
+            loaded_yaml = _load_yaml_internal(fname)
             if isinstance(loaded_yaml, list):
                 merged_list.extend(loaded_yaml)
         return merged_list
 
     @_add_data_ref
-    def construct_include_dir_named(
-        self, node: yaml.Node
-    ) -> OrderedDict[str, dict[str, Any]]:
+    def construct_include_dir_named(self, node):
         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] = self.yaml_loader(fname)
+            mapping[filename] = _load_yaml_internal(fname)
         return mapping
 
     @_add_data_ref
-    def construct_include_dir_merge_named(
-        self, node: yaml.Node
-    ) -> OrderedDict[str, dict[str, Any]]:
+    def construct_include_dir_merge_named(self, node):
         files = filter_yaml_files(_find_files(self._rel_path(node.value), "*.yaml"))
         mapping = OrderedDict()
         for fname in files:
-            loaded_yaml = self.yaml_loader(fname)
+            loaded_yaml = _load_yaml_internal(fname)
             if isinstance(loaded_yaml, dict):
                 mapping.update(loaded_yaml)
         return mapping
 
     @_add_data_ref
-    def construct_lambda(self, node: yaml.Node) -> Lambda:
+    def construct_lambda(self, node):
         return Lambda(str(node.value))
 
     @_add_data_ref
-    def construct_force(self, node: yaml.Node) -> ESPForceValue:
+    def construct_force(self, node):
         obj = self.construct_scalar(node)
         return add_class_to_obj(obj, ESPForceValue)
 
     @_add_data_ref
-    def construct_extend(self, node: yaml.Node) -> Extend:
+    def construct_extend(self, node):
         return Extend(str(node.value))
 
     @_add_data_ref
-    def construct_remove(self, node: yaml.Node) -> Remove:
+    def construct_remove(self, node):
         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)
@@ -420,30 +388,17 @@ def load_yaml(fname: str, clear_secrets: bool = True) -> Any:
     return _load_yaml_internal(fname)
 
 
-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:
+def parse_yaml(file_name: str, file_handle: TextIOWrapper) -> Any:
     """Parse a YAML file."""
     try:
-        return _load_yaml_internal_with_type(
-            ESPHomeLoader, file_name, file_handle, yaml_loader
-        )
+        return _load_yaml_internal_with_type(ESPHomeLoader, file_name, file_handle)
     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, yaml_loader
+            ESPHomePurePythonLoader, file_name, file_handle
         )
 
 
@@ -480,14 +435,23 @@ 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, fname, yaml_loader)
+    loader = loader_type(content)
+    loader.name = fname
     try:
         return loader.get_single_data() or OrderedDict()
     except yaml.YAMLError as exc:
@@ -506,7 +470,7 @@ def dump(dict_, show_secrets=False):
     )
 
 
-def _is_file_valid(name: str) -> bool:
+def _is_file_valid(name):
     """Decide if a file is valid."""
     return not name.startswith(".")
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esphome
-Version: 2025.4.0
+Version: 2025.4.0b2
 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
@@ -39,7 +39,7 @@ 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: zeroconf==0.146.4
 Requires-Dist: puremagic==1.28
 Requires-Dist: ruamel.yaml==0.18.10
 Requires-Dist: esphome-glyphsets==0.2.0

{esphome-2025.4.0.dist-info → esphome-2025.4.0b2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 esphome/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-esphome/__main__.py,sha256=u8FUFrXqmO17I_HIFz_t8N-O7Cma7QiHzCnW4ARp_VQ,32617
+esphome/__main__.py,sha256=3PVf9SDEDgPHvXJdGE0dCboamTgRVEWhfmMcY8T3pLw,32587
 esphome/automation.py,sha256=9xmW3AmWDd2oKB7zF-UITYIiSci8ys8qiylK-rcU7Rg,15689
 esphome/codegen.py,sha256=GePHUM7xdXb_Pil59SHVsXg2F4VBPgkH-Fz2PDX8Z54,1873
 esphome/config.py,sha256=fFrDYbhWY1xn_onAl_0jwlg9D8NkK_FdKULTlnjZtxs,39832
 esphome/config_helpers.py,sha256=MKf_wzO35nn41FvigXE0iYKDslPgL2ruf8R-EPtTT2I,3256
-esphome/config_validation.py,sha256=cjOlphJs-ybsA2VlXXPY-lYq80Vm2uPJ8oIXtWhiPU4,62490
-esphome/const.py,sha256=j_x0WTM-Pa_FMcMHwoI23V2RXqeWj0suBDATPVBG9pg,40828
+esphome/config_validation.py,sha256=9KOhLHQXmDbahg6zHynXfXDfAL2bciu35_SHxHrzZ2M,63705
+esphome/const.py,sha256=U00foWVg7L2J3h7o4-5e48t8gl8y0deYApkPsFP3dFg,40830
 esphome/coroutine.py,sha256=j_14z8dIIzIBeuNO30D4c1RJvMMt1xZFZ58Evd-EvJA,9344
 esphome/cpp_generator.py,sha256=1g-y3fxWSrd5Kpbz6DrJXaQajjuwQiTIaTRIz9n7svI,31237
 esphome/cpp_helpers.py,sha256=6C2vNbOIhZKi43xRVlk5hp9GfshfBn-rc5D_ZFUEYaE,4801
@@ -25,10 +25,10 @@ esphome/storage_json.py,sha256=VyIQDo7hHTIYEeLJTO5cq6I_nOWTlvFVvxqvXd6cgg4,10124
 esphome/types.py,sha256=xJaCRRyYuJiRo32mns9v-YeYB6w12NAT8vMSk9ZmJl8,430
 esphome/util.py,sha256=sKW1kNMRle3bOGrw9Rga32ZfSDXYMbQeQeVKxFEumJs,9329
 esphome/voluptuous_schema.py,sha256=Z5nhm8lM4H4D-RB7hi4aCKgPiVLuIZ5EULkC0X4QUjY,9345
-esphome/vscode.py,sha256=NtCZkDwckoHrM9ZPmyMBE0q29nqd899VjvISkojsLMw,3991
+esphome/vscode.py,sha256=612-o7AVyoh1Fmg-ZXYxKVWUc5fcoumsnunpMv7MQuo,3251
 esphome/wizard.py,sha256=BO89_Y9Z6T8kvC5ZrQGPZzT5Rl9vXpte9L2hqr6CeOk,15349
 esphome/writer.py,sha256=nJSeC5kZesf9EL4nbsWwhMRq7wPnZPjhP0gLZbVTkvI,10999
-esphome/yaml_util.py,sha256=pHw9fJzU0sr180ntmdLZh7k7HQ5giSHkCJzdIgTi_jg,22919
+esphome/yaml_util.py,sha256=4lCUmBYsbdbxW4yjEAQGcYXhKI3KFkwSzT_N31UojFs,21523
 esphome/zeroconf.py,sha256=IuAKqtvDCi4uvLKCbLxrP-DFrXVm1I9icbryrCkenAA,6383
 esphome/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esphome/components/a01nyub/__init__.py,sha256=d_xNluCS0T63CxdXJGuw7raK7G9vAEwXNJpnA9GthzA,34
@@ -143,7 +143,7 @@ esphome/components/alpha3/alpha3.cpp,sha256=1zSC6RmxRxmLFFwRq-pY1BbUWqNiB6ZMOkzf
 esphome/components/alpha3/alpha3.h,sha256=tiCloEGqw9rHdIOocRskj50Z32DiWo6aVUjUk-tRAb8,3405
 esphome/components/alpha3/sensor.py,sha256=6qSx-_JzQ0wK8aml1LLHqm-u0L0ABX3o8dgqqwdpNvQ,2749
 esphome/components/am2315c/__init__.py,sha256=_LBsZwU4Hpwdgs3o5uioFVeClSE5fK8k_FZB2MWSADE,30
-esphome/components/am2315c/am2315c.cpp,sha256=azPE7NUg2saRKmzz5p7hpIu6eMcyglu4OqnV7BMLj4w,5529
+esphome/components/am2315c/am2315c.cpp,sha256=_fQDCMiy6OfTmnWFEz8RG78oygM2SKSvShkp3FLgKaA,5501
 esphome/components/am2315c/am2315c.h,sha256=xJyLj_vUnDACJ0LehomCzXKWnqWYUmmr9OvjpfdrteQ,2047
 esphome/components/am2315c/sensor.py,sha256=Y3tt7aOi12IsrfbS9fAHec9BkV0hz3PfmviT-nDyfX0,1702
 esphome/components/am2320/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -2655,10 +2655,10 @@ esphome/components/sm300d2/sm300d2.h,sha256=YDd_1VQ0Bq0KhWgtvsJLmuXdIRG8purGyxmU
 esphome/components/sml/__init__.py,sha256=ibRZmFRQFxOAJ9-YC_00_FYUGQSn2UcFy_9mAKfEg3g,1795
 esphome/components/sml/automation.h,sha256=lY2a8F41GCJB03oPWj4fBJ_3VlXgSc7HKwkVzVmPLqc,411
 esphome/components/sml/constants.h,sha256=bBhl2KSbp7c44Ah4qcVxGwVGMq5na8JgSLwu-Zk-uUE,639
-esphome/components/sml/sml.cpp,sha256=G0AYjyk8VvP1V_BEKgsXe_eH-P-MouyZENciorrUAHg,4210
-esphome/components/sml/sml.h,sha256=5xTtlwcoKVfvBN3IXoB6gKIvni85edLL6z_865SqNaE,1330
-esphome/components/sml/sml_parser.cpp,sha256=oNOcV2mPUzXNY0oYRfOxHM9i51ODw3vWNdxeyhH9N7M,5051
-esphome/components/sml/sml_parser.h,sha256=bZk5KCQnIjlRUEjnIR2SfpSCe835BqJAlTVGvFkJ3i0,1812
+esphome/components/sml/sml.cpp,sha256=Th5Q5VbkGt8RsNOCWFDRFFmTbTZj0NH6JRH1A2tSlNE,4209
+esphome/components/sml/sml.h,sha256=UWA0WZEwiMk2NWgCm9nUCQyJa6DUSxJwhV_W9EE3l1E,1326
+esphome/components/sml/sml_parser.cpp,sha256=Xb7habP5AXdpFn7yJ1tnFAkPxMBTgcDoAI-0FoHD5Fw,5111
+esphome/components/sml/sml_parser.h,sha256=9HlTT3dcbn8jnnvwIARwzBC7wasi2UUZrCj6tTXN--E,955
 esphome/components/sml/sensor/__init__.py,sha256=jlZBTGgveDgAtiLdpJzyumU4DiKyZgvTOY6m3q09arg,910
 esphome/components/sml/sensor/sml_sensor.cpp,sha256=onWh6gi584Qy8TaYgnRi5K4nMUkS39P8_liCTTKW5JM,1106
 esphome/components/sml/sensor/sml_sensor.h,sha256=QypjAdqlNPIVLP77YuxASVRJVwjITCuoc5q0MvzUjNY,420
@@ -3423,7 +3423,7 @@ esphome/components/zyaura/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 esphome/components/zyaura/sensor.py,sha256=cSmO4ozYdi4ZD7NK4lmYjswWVmJoDvEruU1HhGrZSE0,2476
 esphome/components/zyaura/zyaura.cpp,sha256=F7WM8XAZ5MYuCD3eERm2_IA-O7sP1i-A-yF5TV4PqX8,3679
 esphome/components/zyaura/zyaura.h,sha256=yWrcYj_CnLDyopkuIVySJy5dB-R5X9zwm5fWjBDTSts,2384
-esphome/core/__init__.py,sha256=RCYQQQLlJxABwGyhSQJ9-kCwMOZL-uSVhBEnHUfEeOU,26735
+esphome/core/__init__.py,sha256=L4pbrSzT5rq3ba3Xm1N5xiRx4m5a4pKN5wBwvUwWZLU,26760
 esphome/core/application.cpp,sha256=DOhq0rTYu_dNcUCavHYVYASQZ5QzVOXMWVTaO7YTdnM,4680
 esphome/core/application.h,sha256=jepd6I9BBa48ByAXoLnUE7ddtlHiUS5uuKaMaJOD0x0,17721
 esphome/core/automation.h,sha256=UQQD9De3eiaopvzYQG89SxkBfnL5QaiR6bvkk2RxV8k,7332
@@ -3481,9 +3481,9 @@ esphome/dashboard/util/itertools.py,sha256=8eLrWEWmICLtXNxkKdYPQV0c_N4GEz8m9Npnb
 esphome/dashboard/util/password.py,sha256=cQz3b9B-ijTe7zS6BeCW0hc3pWv6JjC78jmnycYYAh8,321
 esphome/dashboard/util/subprocess.py,sha256=T8EW6dbU4LPd2DG1dRrdh8li71tt6J1isn411poMhkk,1022
 esphome/dashboard/util/text.py,sha256=ENDnfN4O0NdA3CKVJjQYabFbwbrsIhVKrAMQe53qYu4,534
-esphome-2025.4.0.dist-info/licenses/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
-esphome-2025.4.0.dist-info/METADATA,sha256=w3xkxBsaU1Vmq0YL683PtmEoiTNVYToB-b4MvLJauhQ,3671
-esphome-2025.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-esphome-2025.4.0.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
-esphome-2025.4.0.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
-esphome-2025.4.0.dist-info/RECORD,,
+esphome-2025.4.0b2.dist-info/licenses/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
+esphome-2025.4.0b2.dist-info/METADATA,sha256=QDzQqlrluTWB6o0YzPZysWvsFSvlhigg7_zgG0ifL34,3673
+esphome-2025.4.0b2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+esphome-2025.4.0b2.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
+esphome-2025.4.0b2.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
+esphome-2025.4.0b2.dist-info/RECORD,,