Merge branch 'esp8266-native-ninja-emission' into esp8266-arduino-toolchain

esphome/components/dashboard_import/__init__.py

@@ -4,7 +4,6 @@ import re
 import secrets
 from typing import Any
 
-import requests
 from ruamel.yaml import YAML
 
 from esphome import git
@@ -13,7 +12,7 @@ from esphome.components.packages import validate_source_shorthand
 import esphome.config_validation as cv
 from esphome.const import CONF_ESPHOME, CONF_PROJECT, CONF_REF, CONF_WIFI
 import esphome.final_validate as fv
-from esphome.happy_eyeballs import ensure_happy_eyeballs
+from esphome.net_retry import fetch_with_retry, http_request
 from esphome.types import ConfigType
 from esphome.yaml_util import dump
 
@@ -111,14 +110,20 @@ def import_config(
 
     if git_file.query and "full_config" in git_file.query:
         url = git_file.raw_url
-        try:
-            ensure_happy_eyeballs()
-            req = requests.get(url, timeout=30)
+
+        # Deferred so config-time imports of this component stay light;
+        # http_request does the lazy import for the request itself.
+        import requests
+
+        def _fetch() -> str:
+            req = http_request("GET", url, timeout=30)
             req.raise_for_status()
+            return req.text
+
+        try:
+            contents = fetch_with_retry(url, _fetch, what="Import")
         except requests.exceptions.RequestException as e:
             raise ValueError(f"Error while fetching {url}: {e}") from e
-
-        contents = req.text
         yaml = YAML()
         loaded_yaml = yaml.load(contents)
         if (

esphome/components/nrf52/framework.py

@@ -5,16 +5,14 @@ from pathlib import Path
 import platform
 import shutil
 import sys
-import tempfile
 
 from esphome.build_helpers.tools_cache import SDK_NRF_TOOLS_CACHE, tools_cache_path
 import esphome.config_validation as cv
 from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION
 from esphome.core import CORE, EsphomeError
 from esphome.framework_helpers import (
-    archive_extract_all,
     create_venv,
-    download_from_mirrors,
+    download_and_extract,
     get_python_env_executable_path,
     rmdir,
     run_command_ok,
@@ -338,34 +336,37 @@ def check_and_install() -> None:
     if not sentinel.exists():
         rmdir(toolchains_dir, msg=f"Clean up {TOOLCHAIN_VERSION} toolchain environment")
         sysname, machine, extension = _get_toolchain_platform_info()
-        with tempfile.NamedTemporaryFile() as tmp:
-            _LOGGER.info("Downloading Zephyr SDK %s minimal ...", TOOLCHAIN_VERSION)
-            download_from_mirrors(
-                SDK_NG_MINIMAL_MIRRORS,
-                {
-                    "VERSION": TOOLCHAIN_VERSION,
-                    "sysname": sysname,
-                    "machine": machine,
-                    "extension": extension,
-                },
-                tmp.file,
-            )
-            archive_extract_all(tmp.file, toolchains_dir, progress_header="Extracting")
-        with tempfile.NamedTemporaryFile() as tmp:
-            _LOGGER.info("Downloading %s toolchain ...", TOOLCHAIN_VERSION)
-            download_from_mirrors(
+        substitutions = {
+            "VERSION": TOOLCHAIN_VERSION,
+            "sysname": sysname,
+            "machine": machine,
+            "extension": extension,
+        }
+        # Downloaded next to the destination (not a temp file) so an
+        # interrupted download's .part file resumes on the next run.
+        for mirrors, extract_dir, what, slug in (
+            (SDK_NG_MINIMAL_MIRRORS, toolchains_dir, "Zephyr SDK minimal", "minimal"),
+            (
                 SDK_NG_TOOLCHAIN_MIRRORS,
-                {
-                    "VERSION": TOOLCHAIN_VERSION,
-                    "sysname": sysname,
-                    "machine": machine,
-                    "extension": extension,
-                },
-                tmp.file,
-            )
-            archive_extract_all(
-                tmp.file,
                 toolchains_dir / "arm-zephyr-eabi",
+                "toolchain",
+                "toolchain",
+            ),
+        ):
+            _LOGGER.info("Downloading %s %s ...", TOOLCHAIN_VERSION, what)
+            download_and_extract(
+                mirrors,
+                substitutions,
+                toolchains_dir.with_name(f"{toolchains_dir.name}.{slug}.archive"),
+                extract_dir,
                 progress_header="Extracting",
             )
+        # Best-effort prune of resume leftovers, including a previous
+        # TOOLCHAIN_VERSION's orphans; the SDK archives are hundreds of MB.
+        # A locked file must not discard the just-completed install.
+        for leftover in toolchains_dir.parent.glob("*.archive.part*"):
+            try:
+                leftover.unlink()
+            except OSError as err:
+                _LOGGER.debug("Could not remove %s: %s", leftover, err)
         sentinel.touch()