esphome 2025.2.2__py3-none-any.whl → 2025.3.0__py3-none-any.whl

esphome/wizard.py

@@ -144,17 +144,17 @@ def wizard_file(**kwargs):
 
     # Configure API
     if "password" in kwargs:
-        config += f"  password: \"{kwargs['password']}\"\n"
+        config += f'  password: "{kwargs["password"]}"\n'
     if "api_encryption_key" in kwargs:
-        config += f"  encryption:\n    key: \"{kwargs['api_encryption_key']}\"\n"
+        config += f'  encryption:\n    key: "{kwargs["api_encryption_key"]}"\n'
 
     # Configure OTA
     config += "\nota:\n"
     config += "  - platform: esphome\n"
     if "ota_password" in kwargs:
-        config += f"    password: \"{kwargs['ota_password']}\""
+        config += f'    password: "{kwargs["ota_password"]}"'
     elif "password" in kwargs:
-        config += f"    password: \"{kwargs['password']}\""
+        config += f'    password: "{kwargs["password"]}"'
 
     # Configuring wifi
     config += "\n\nwifi:\n"
@@ -181,18 +181,14 @@ def wizard_file(**kwargs):
     password: "{fallback_psk}"
 
 captive_portal:
-    """.format(
-            **kwargs
-        )
+    """.format(**kwargs)
     else:
         config += """
   # Enable fallback hotspot in case wifi connection fails
   ap:
     ssid: "{fallback_name}"
     password: "{fallback_psk}"
-    """.format(
-            **kwargs
-        )
+    """.format(**kwargs)
 
     return config
 
@@ -388,19 +384,19 @@ def wizard(path):
     safe_print()
     # Don't sleep because user needs to copy link
     if platform == "ESP32":
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'nodemcu-32s')}\".")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "nodemcu-32s")}".')
         boards_list = esp32_boards.BOARDS.items()
     elif platform == "ESP8266":
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'nodemcuv2')}\".")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "nodemcuv2")}".')
         boards_list = esp8266_boards.BOARDS.items()
     elif platform == "BK72XX":
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'cb2s')}\".")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "cb2s")}".')
         boards_list = bk72xx_boards.BOARDS.items()
     elif platform == "RTL87XX":
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'wr3')}\".")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "wr3")}".')
         boards_list = rtl87xx_boards.BOARDS.items()
     elif platform == "RP2040":
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'rpipicow')}\".")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "rpipicow")}".')
         boards_list = rp2040_boards.BOARDS.items()
 
     else:
@@ -439,7 +435,7 @@ def wizard(path):
             f"First, what's the {color(Fore.GREEN, 'SSID')} (the name) of the WiFi network {name} should connect to?"
         )
         sleep(1.5)
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'Abraham Linksys')}\".")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "Abraham Linksys")}".')
         while True:
             ssid = safe_input(color(Fore.BOLD_WHITE, "(ssid): "))
             try:
@@ -465,7 +461,7 @@ def wizard(path):
             f"Now please state the {color(Fore.GREEN, 'password')} of the WiFi network so that I can connect to it (Leave empty for no password)"
         )
         safe_print()
-        safe_print(f"For example \"{color(Fore.BOLD_WHITE, 'PASSWORD42')}\"")
+        safe_print(f'For example "{color(Fore.BOLD_WHITE, "PASSWORD42")}"')
         sleep(0.5)
         psk = safe_input(color(Fore.BOLD_WHITE, "(PSK): "))
         safe_print(

esphome/writer.py

@@ -212,9 +212,7 @@ def write_platformio_project():
     write_platformio_ini(content)
 
 
-DEFINES_H_FORMAT = (
-    ESPHOME_H_FORMAT
-) = """\
+DEFINES_H_FORMAT = ESPHOME_H_FORMAT = """\
 #pragma once
 #include "esphome/core/macros.h"
 {}

esphome/yaml_util.py

@@ -273,48 +273,18 @@ class ESPHomeLoaderMixin:
 
     @_add_data_ref
     def construct_include(self, node):
+        from esphome.const import CONF_VARS
+
         def extract_file_vars(node):
             fields = self.construct_yaml_map(node)
             file = fields.get("file")
             if file is None:
                 raise yaml.MarkedYAMLError("Must include 'file'", node.start_mark)
-            vars = fields.get("vars")
+            vars = fields.get(CONF_VARS)
             if vars:
                 vars = {k: str(v) for k, v in vars.items()}
             return file, vars
 
-        def substitute_vars(config, vars):
-            from esphome.components import substitutions
-            from esphome.const import CONF_DEFAULTS, CONF_SUBSTITUTIONS
-
-            org_subs = None
-            result = config
-            if not isinstance(config, dict):
-                # when the included yaml contains a list or a scalar
-                # wrap it into an OrderedDict because do_substitution_pass expects it
-                result = OrderedDict([("yaml", config)])
-            elif CONF_SUBSTITUTIONS in result:
-                org_subs = result.pop(CONF_SUBSTITUTIONS)
-
-            defaults = {}
-            if CONF_DEFAULTS in result:
-                defaults = result.pop(CONF_DEFAULTS)
-
-            result[CONF_SUBSTITUTIONS] = vars
-            for k, v in defaults.items():
-                if k not in result[CONF_SUBSTITUTIONS]:
-                    result[CONF_SUBSTITUTIONS][k] = v
-
-            # Ignore missing vars that refer to the top level substitutions
-            substitutions.do_substitution_pass(result, None, ignore_missing=True)
-            result.pop(CONF_SUBSTITUTIONS)
-
-            if not isinstance(config, dict):
-                result = result["yaml"]  # unwrap the result
-            elif org_subs:
-                result[CONF_SUBSTITUTIONS] = org_subs
-            return result
-
         if isinstance(node, yaml.nodes.MappingNode):
             file, vars = extract_file_vars(node)
         else:
@@ -432,6 +402,39 @@ def parse_yaml(file_name: str, file_handle: TextIOWrapper) -> Any:
         )
 
 
+def substitute_vars(config, vars):
+    from esphome.components import substitutions
+    from esphome.const import CONF_DEFAULTS, CONF_SUBSTITUTIONS
+
+    org_subs = None
+    result = config
+    if not isinstance(config, dict):
+        # when the included yaml contains a list or a scalar
+        # wrap it into an OrderedDict because do_substitution_pass expects it
+        result = OrderedDict([("yaml", config)])
+    elif CONF_SUBSTITUTIONS in result:
+        org_subs = result.pop(CONF_SUBSTITUTIONS)
+
+    defaults = {}
+    if CONF_DEFAULTS in result:
+        defaults = result.pop(CONF_DEFAULTS)
+
+    result[CONF_SUBSTITUTIONS] = vars
+    for k, v in defaults.items():
+        if k not in result[CONF_SUBSTITUTIONS]:
+            result[CONF_SUBSTITUTIONS][k] = v
+
+    # Ignore missing vars that refer to the top level substitutions
+    substitutions.do_substitution_pass(result, None, ignore_missing=True)
+    result.pop(CONF_SUBSTITUTIONS)
+
+    if not isinstance(config, dict):
+        result = result["yaml"]  # unwrap the result
+    elif org_subs:
+        result[CONF_SUBSTITUTIONS] = org_subs
+    return result
+
+
 def _load_yaml_internal(fname: str) -> Any:
     """Load a YAML file."""
     try:

esphome/zeroconf.py

@@ -5,7 +5,13 @@ from dataclasses import dataclass
 import logging
 from typing import Callable
 
-from zeroconf import IPVersion, ServiceInfo, ServiceStateChange, Zeroconf
+from zeroconf import (
+    AddressResolver,
+    IPVersion,
+    ServiceInfo,
+    ServiceStateChange,
+    Zeroconf,
+)
 from zeroconf.asyncio import AsyncServiceBrowser, AsyncServiceInfo, AsyncZeroconf
 
 from esphome.storage_json import StorageJSON, ext_storage_path
@@ -16,15 +22,6 @@ _LOGGER = logging.getLogger(__name__)
 _BACKGROUND_TASKS: set[asyncio.Task] = set()
 
 
-class HostResolver(ServiceInfo):
-    """Resolve a host name to an IP address."""
-
-    @property
-    def _is_complete(self) -> bool:
-        """The ServiceInfo has all expected properties."""
-        return bool(self._ipv4_addresses)
-
-
 class DashboardStatus:
     def __init__(self, on_update: Callable[[dict[str, bool | None], []]]) -> None:
         """Initialize the dashboard status."""
@@ -166,19 +163,10 @@ class DashboardImportDiscovery:
                 )
 
 
-def _make_host_resolver(host: str) -> HostResolver:
-    """Create a new HostResolver for the given host name."""
-    name = host.partition(".")[0]
-    info = HostResolver(
-        ESPHOME_SERVICE_TYPE, f"{name}.{ESPHOME_SERVICE_TYPE}", server=f"{name}.local."
-    )
-    return info
-
-
 class EsphomeZeroconf(Zeroconf):
     def resolve_host(self, host: str, timeout: float = 3.0) -> list[str] | None:
         """Resolve a host name to an IP address."""
-        info = _make_host_resolver(host)
+        info = AddressResolver(f"{host.partition('.')[0]}.local.")
         if (
             info.load_from_cache(self)
             or (timeout and info.request(self, timeout * 1000))
@@ -192,7 +180,7 @@ class AsyncEsphomeZeroconf(AsyncZeroconf):
         self, host: str, timeout: float = 3.0
     ) -> list[str] | None:
         """Resolve a host name to an IP address."""
-        info = _make_host_resolver(host)
+        info = AddressResolver(f"{host.partition('.')[0]}.local.")
         if (
             info.load_from_cache(self.zeroconf)
             or (timeout and await info.async_request(self.zeroconf, timeout * 1000))

{esphome-2025.2.2.dist-info → esphome-2025.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esphome
-Version: 2025.2.2
+Version: 2025.3.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>
 License: MIT
@@ -23,22 +23,22 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: cryptography ==43.0.0
+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
+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.7.0
+Requires-Dist: esptool ==4.8.1
 Requires-Dist: click ==8.1.7
 Requires-Dist: esphome-dashboard ==20250212.0
-Requires-Dist: aioesphomeapi ==29.3.2
-Requires-Dist: zeroconf ==0.145.1
+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
@@ -57,7 +57,7 @@ Requires-Dist: cairosvg ==2.7.1 ; extra == 'displays'
 Provides-Extra: test
 Requires-Dist: pylint ==3.2.7 ; extra == 'test'
 Requires-Dist: flake8 ==7.0.0 ; extra == 'test'
-Requires-Dist: black ==24.4.2 ; 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'