Merge remote-tracking branch 'origin/bq25186-switch-tests' into bq25186-apply-switch

AGENTS.md

@@ -443,7 +443,8 @@ file does, and it is the authority when they disagree. The most useful starting
         - **Hub forwarding entities need no C++ class:** a button, switch, number or select that only calls its hub
           uses `button.ApplyButton` (`switch.ApplySwitch`, `number.ApplyNumber`, `select.ApplySelect`) in its schema
           and `apply=` on the `sub_*` call. The body is a call on the hub with `entity` and `state`, `value` or
-          `index`/`option` in scope; on a switch, number or select `publish="before"` or `"after"` publishes the state.
+          `index`/`option` in scope; on a switch, number or select `publish="before"` or `"after"` publishes the state,
+          and `publish="on_success"` publishes only when the hub call returns true (a write the device can refuse).
           `publish="momentary"` is only for legacy action switches (restart, factory reset): it publishes off and runs
           the body only when turned on. Never use it for a new entity; an action is a button.
           ```python

esphome/components/bq25186/bq25186_switch.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#ifdef USE_BQ25186_PG_GPO
-
-#include "bq25186.h"
-#include "esphome/components/switch/switch.h"
-
-namespace esphome::bq25186 {
-
-class BQ25186PgGpoSwitch final : public switch_::Switch, public Parented<BQ25186Component> {
- protected:
-  void write_state(bool state) override {
-    if (this->parent_->write_pg_gpo_level(state))
-      this->publish_state(state);
-  }
-};
-
-}  // namespace esphome::bq25186
-
-#endif  // USE_BQ25186_PG_GPO

esphome/components/bq25186/switch.py

@@ -3,18 +3,16 @@ from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.types import ConfigType
 
-from . import BQ25186_CHILD_SCHEMA, CONF_BQ25186_ID, bq25186_ns
+from . import BQ25186_CHILD_SCHEMA, CONF_BQ25186_ID
 
 DEPENDENCIES = ["bq25186"]
 
 CONF_PG_GPO = "pg_gpo"
 
-BQ25186PgGpoSwitch = bq25186_ns.class_("BQ25186PgGpoSwitch", switch.Switch)
-
 CONFIG_SCHEMA = BQ25186_CHILD_SCHEMA.extend(
     {
         cv.Required(CONF_PG_GPO): switch.switch_schema(
-            BQ25186PgGpoSwitch, default_restore_mode="DISABLED"
+            switch.ApplySwitch, default_restore_mode="DISABLED"
         ),
     }
 )
@@ -24,4 +22,9 @@ async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_BQ25186_PG_GPO")
     hub = await cg.get_variable(config[CONF_BQ25186_ID])
     switches = switch.sub_switches(config, parent=hub)
-    await switches(CONF_PG_GPO, hub.set_pg_gpo_switch)
+    await switches(
+        CONF_PG_GPO,
+        hub.set_pg_gpo_switch,
+        apply="write_pg_gpo_level(state)",
+        publish="on_success",
+    )

esphome/components/dlms_meter/__init__.py

@@ -22,7 +22,7 @@ CONF_CUSTOM_PATTERNS = "custom_patterns"
 CONF_SKIP_CRC = "skip_crc"
 CONF_DEFAULT_OBIS = "default_obis"
 
-DLMS_PARSER_VERSION = "2.2.2"
+DLMS_PARSER_VERSION = "2.2.0"
 
 dlms_meter_component_ns = cg.esphome_ns.namespace("dlms_meter")
 DlmsMeterComponent = dlms_meter_component_ns.class_(

esphome/components/esp32/__init__.py

@@ -2389,9 +2389,7 @@ FRAMEWORK_SCHEMA = cv.Schema(
                     cv.Schema(
                         {
                             cv.Required(CONF_NAME): cv.string_strict,
-                            cv.Optional(CONF_SOURCE): cv.All(
-                                cv.string_strict, cv.Length(min=1)
-                            ),
+                            cv.Optional(CONF_SOURCE): cv.git_ref,
                             cv.Optional(CONF_REF): cv.string,
                             cv.Optional(CONF_PATH): cv.string,
                         }

esphome/components/ld2420/ld2420.cpp

@@ -138,11 +138,6 @@ static uint8_t calc_checksum(const void *data, size_t size) {
   return xor_bytes(static_cast<const uint8_t *>(data), size);
 }
 
-// Simple mode needs simple reporting from the module; Normal and Calibrate read energy frames
-static uint16_t system_mode_for(uint8_t mode) {
-  return mode == OP_SIMPLE_MODE ? CMD_SYSTEM_MODE_SIMPLE : CMD_SYSTEM_MODE_ENERGY;
-}
-
 static int32_t get_firmware_int(const char *version_string) {
   // Convert "v1.5.4" -> 154 by skipping 'v' and '.', accumulating digits
   const char *p = (*version_string == 'v') ? version_string + 1 : version_string;
@@ -212,10 +207,13 @@ void LD2420Component::setup() {
 
   memcpy(&this->new_config, &this->current_config, sizeof(this->current_config));
   if (ld2420::get_firmware_int(this->firmware_ver_) < CALIBRATE_VERSION_MIN) {
+    this->set_operating_mode(OP_SIMPLE_MODE);
+    this->set_mode_(CMD_SYSTEM_MODE_SIMPLE);
     ESP_LOGW(TAG, "Firmware version %s and older supports Simple Mode only", this->firmware_ver_);
+  } else {
+    this->set_operating_mode(OP_NORMAL_MODE);
+    this->set_mode_(CMD_SYSTEM_MODE_ENERGY);
   }
-  this->set_operating_mode(OP_NORMAL_MODE);  // older firmware is held in Simple
-  this->set_mode_(system_mode_for(this->current_operating_mode));
 #ifdef USE_NUMBER
   this->init_gate_config_numbers();
 #endif
@@ -246,9 +244,7 @@ void LD2420Component::apply_config_action() {
 #endif
   this->set_system_mode(this->system_mode_);
   this->set_config_mode(false);  // Disable config mode to save new values in LD2420 nvm
-  // Applying the calibrated thresholds ends calibration; Normal and Simple stay as they are
-  if (this->current_operating_mode == OP_CALIBRATE_MODE)
-    this->set_operating_mode(OP_NORMAL_MODE);
+  this->set_operating_mode(OP_NORMAL_MODE);
 }
 
 void LD2420Component::factory_reset_action() {
@@ -360,22 +356,6 @@ void LD2420Component::set_operating_mode(const char *state) {
   }
 }
 
-void LD2420Component::change_operating_mode(OpMode mode) {
-  this->set_operating_mode(mode);
-  const uint16_t system_mode = system_mode_for(this->current_operating_mode);
-  if (system_mode == this->get_mode_())
-    return;
-  if (this->set_config_mode(true) != LD2420_ERROR_TIMEOUT) {
-    this->set_system_mode(system_mode);
-    this->set_config_mode(false);
-  }
-  if (this->get_mode_() != system_mode) {
-    // The module kept its reporting mode; show the mode that matches it
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-    this->set_operating_mode(this->get_mode_() == CMD_SYSTEM_MODE_SIMPLE ? OP_SIMPLE_MODE : OP_NORMAL_MODE);
-  }
-}
-
 void LD2420Component::set_operating_mode(OpMode mode) {
   // Older firmware only supports simple mode
   if (ld2420::get_firmware_int(this->firmware_ver_) < CALIBRATE_VERSION_MIN) {

esphome/components/ld2420/ld2420.h

@@ -119,7 +119,6 @@ class LD2420Component final : public Component, public uart::UARTDevice {
   void handle_cmd_error(uint16_t error);
   void set_operating_mode(const char *state);
   void set_operating_mode(OpMode mode);
-  void change_operating_mode(OpMode mode);
   void auto_calibrate_sensitivity();
   void update_radar_data(uint16_t const *gate_energy, uint8_t sample_number);
   uint8_t set_config_mode(bool enable);

esphome/components/ld2420/select/__init__.py

@@ -30,5 +30,6 @@ async def to_code(config: ConfigType) -> None:
         CONF_OPERATING_MODE,
         hub.set_operating_mode_select,
         options=CONF_SELECTS,
-        apply="change_operating_mode(static_cast<ld2420::OpMode>(index + 1))",
+        apply="set_operating_mode(static_cast<ld2420::OpMode>(index + 1))",
+        publish="before",
     )

esphome/components/microphone/microphone.h

@@ -4,7 +4,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <cstring>
 #include <span>
 #include <type_traits>
 #include <utility>
@@ -54,25 +53,16 @@ using DataCallbackManagerBase = CallbackManager<void(const AudioCapture &)>;
 
 class DataCallbackManager : public DataCallbackManagerBase {
  public:
-  DataCallbackManager(const audio::AudioStreamInfo *stream_info, const bool *mute_state)
-      : stream_info_(stream_info), mute_state_(mute_state) {}
+  explicit DataCallbackManager(const audio::AudioStreamInfo *stream_info) : stream_info_(stream_info) {}
 
   using DataCallbackManagerBase::call;
 
   // Remove before 2027.5.0, along with this class (use a plain CallbackManager)
   ESPDEPRECATED("Use Microphone::publish_audio_() instead. Removed in 2027.5.0", "2026.11.0")
-  void call(const std::vector<uint8_t> &data) {
-    if (*this->mute_state_) {
-      const std::vector<uint8_t> zeros(data.size(), 0);
-      this->call(AudioCapture{zeros, *this->stream_info_, 0});
-    } else {
-      this->call(AudioCapture{data, *this->stream_info_, 0});
-    }
-  }
+  void call(const std::vector<uint8_t> &data) { this->call(AudioCapture{data, *this->stream_info_, 0}); }
 
  protected:
   const audio::AudioStreamInfo *stream_info_;
-  const bool *mute_state_;
 };
 
 class Microphone {
@@ -82,7 +72,15 @@ class Microphone {
 
   /// Callbacks take (const AudioCapture &) and run on the microphone's task.
   template<typename F> void add_data_callback(F &&data_callback) {
-    this->data_callbacks_.add(as_capture_callback(std::forward<F>(data_callback)));
+    this->data_callbacks_.add(
+        [this, callback = as_capture_callback(std::forward<F>(data_callback))](const AudioCapture &capture) {
+          if (this->mute_state_) {
+            const std::vector<uint8_t> zeros(capture.data.size(), 0);
+            callback(AudioCapture{zeros, capture.stream_info, capture.capture_time_us});
+          } else {
+            callback(capture);
+          }
+        });
   }
 
   bool is_running() const { return this->state_ == STATE_RUNNING; }
@@ -94,11 +92,8 @@ class Microphone {
   audio::AudioStreamInfo get_audio_stream_info() { return this->audio_stream_info_; }
 
  protected:
-  /// While muted, data is zeroed first, so it must be a buffer the platform owns.
-  void publish_audio_(std::span<uint8_t> data, const audio::AudioStreamInfo &stream_info, int64_t capture_time_us = 0) {
-    if (this->mute_state_) {
-      std::memset(data.data(), 0, data.size());
-    }
+  void publish_audio_(std::span<const uint8_t> data, const audio::AudioStreamInfo &stream_info,
+                      int64_t capture_time_us = 0) {
     this->data_callbacks_.call(AudioCapture{data, stream_info, capture_time_us});
   }
 
@@ -110,7 +105,7 @@ class Microphone {
   audio::AudioStreamInfo audio_stream_info_;
 
   // Make private when the deprecated call(data) is removed in 2027.5.0
-  DataCallbackManager data_callbacks_{&this->audio_stream_info_, &this->mute_state_};
+  DataCallbackManager data_callbacks_{&this->audio_stream_info_};
 };
 
 }  // namespace esphome::microphone

esphome/components/pipsolar/output/pipsolar_output.cpp

@@ -12,7 +12,7 @@ void PipsolarOutput::write_state(float state) {
 
   if (std::find(this->possible_values_.begin(), this->possible_values_.end(), state) != this->possible_values_.end()) {
     ESP_LOGD(TAG, "Will write: %s out of value %f / %02.0f", tmp, state, state);
-    this->parent_->queue_command(tmp);
+    this->parent_->queue_command(std::string(tmp));
   } else {
     ESP_LOGD(TAG, "Will not write: %s as it is not in list of allowed values", tmp);
   }

esphome/components/pipsolar/pipsolar.cpp

@@ -224,23 +224,17 @@ bool Pipsolar::send_next_poll_() {
   return false;
 }
 
-void Pipsolar::write_switch(bool state, const char *on, const char *off) {
-  const char *command = state ? on : off;
-  if (command != nullptr)
-    this->queue_command(command);
-}
-
-void Pipsolar::queue_command(const char *command) {
+void Pipsolar::queue_command(const std::string &command) {
   uint8_t next_position = command_queue_position_;
   for (uint8_t i = 0; i < COMMAND_QUEUE_LENGTH; i++) {
     uint8_t testposition = (next_position + i) % COMMAND_QUEUE_LENGTH;
     if (command_queue_[testposition].empty()) {
       command_queue_[testposition] = command;
-      ESP_LOGD(TAG, "Command queued successfully: %s at position %d", command, testposition);
+      ESP_LOGD(TAG, "Command queued successfully: %s at position %d", command.c_str(), testposition);
       return;
     }
   }
-  ESP_LOGD(TAG, "Command queue full dropping command: %s", command);
+  ESP_LOGD(TAG, "Command queue full dropping command: %s", command.c_str());
 }
 
 void Pipsolar::handle_poll_response_(ENUMPollingCommand polling_command, const char *message) {

esphome/components/pipsolar/pipsolar.h

@@ -194,10 +194,7 @@ class Pipsolar final : public uart::UARTDevice, public PollingComponent {
   PIPSOLAR_SWITCH(pv_ok_condition_for_parallel_switch, QPIRI)
   PIPSOLAR_SWITCH(pv_power_balance_switch, QPIRI)
 
-  void queue_command(const char *command);
-  void queue_command(const std::string &command) { this->queue_command(command.c_str()); }
-  // A switch write; off is nullptr when the inverter has no off command
-  void write_switch(bool state, const char *on, const char *off);
+  void queue_command(const std::string &command);
   void setup() override;
   void loop() override;
   void dump_config() override;

esphome/components/pipsolar/switch/__init__.py

@@ -1,14 +1,10 @@
-from collections.abc import Callable
-from typing import NamedTuple
-
 import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import ICON_POWER
-from esphome.cpp_generator import MockObj
 from esphome.types import ConfigType
 
-from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA
+from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA, pipsolar_ns
 
 DEPENDENCIES = ["uart"]
 
@@ -20,55 +16,21 @@ CONF_INPUT_VOLTAGE_RANGE = "input_voltage_range"
 CONF_PV_OK_CONDITION_FOR_PARALLEL = "pv_ok_condition_for_parallel"
 CONF_PV_POWER_BALANCE = "pv_power_balance"
 
-
-class _PipSwitch(NamedTuple):
-    setter: Callable[[MockObj], MockObj]
-    on: str
-    off: str | None  # None when the inverter has no off command
-
-
-# Each switch's hub setter and its on and off commands
 TYPES = {
-    CONF_OUTPUT_SOURCE_PRIORITY_UTILITY: _PipSwitch(
-        lambda hub: hub.set_output_source_priority_utility_switch,
-        "POP00",
-        None,
-    ),
-    CONF_OUTPUT_SOURCE_PRIORITY_SOLAR: _PipSwitch(
-        lambda hub: hub.set_output_source_priority_solar_switch,
-        "POP01",
-        None,
-    ),
-    CONF_OUTPUT_SOURCE_PRIORITY_BATTERY: _PipSwitch(
-        lambda hub: hub.set_output_source_priority_battery_switch,
-        "POP02",
-        None,
-    ),
-    CONF_OUTPUT_SOURCE_PRIORITY_HYBRID: _PipSwitch(
-        lambda hub: hub.set_output_source_priority_hybrid_switch,
-        "POP03",
-        None,
-    ),
-    CONF_INPUT_VOLTAGE_RANGE: _PipSwitch(
-        lambda hub: hub.set_input_voltage_range_switch,
-        "PGR01",
-        "PGR00",
-    ),
-    CONF_PV_OK_CONDITION_FOR_PARALLEL: _PipSwitch(
-        lambda hub: hub.set_pv_ok_condition_for_parallel_switch,
-        "PPVOKC1",
-        "PPVOKC0",
-    ),
-    CONF_PV_POWER_BALANCE: _PipSwitch(
-        lambda hub: hub.set_pv_power_balance_switch,
-        "PSPB1",
-        "PSPB0",
-    ),
+    CONF_OUTPUT_SOURCE_PRIORITY_UTILITY: ("POP00", None),
+    CONF_OUTPUT_SOURCE_PRIORITY_SOLAR: ("POP01", None),
+    CONF_OUTPUT_SOURCE_PRIORITY_BATTERY: ("POP02", None),
+    CONF_OUTPUT_SOURCE_PRIORITY_HYBRID: ("POP03", None),
+    CONF_INPUT_VOLTAGE_RANGE: ("PGR01", "PGR00"),
+    CONF_PV_OK_CONDITION_FOR_PARALLEL: ("PPVOKC1", "PPVOKC0"),
+    CONF_PV_POWER_BALANCE: ("PSPB1", "PSPB0"),
 }
 
+PipsolarSwitch = pipsolar_ns.class_("PipsolarSwitch", switch.Switch, cg.Component)
+
 PIPSWITCH_SCHEMA = switch.switch_schema(
-    switch.ApplySwitch, icon=ICON_POWER, block_inverted=True
-)
+    PipsolarSwitch, icon=ICON_POWER, block_inverted=True
+).extend(cv.COMPONENT_SCHEMA)
 
 CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
     {cv.Optional(type): PIPSWITCH_SCHEMA for type in TYPES}
@@ -76,11 +38,15 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 
 
 async def to_code(config: ConfigType) -> None:
-    hub = await cg.get_variable(config[CONF_PIPSOLAR_ID])
-    switches = switch.sub_switches(config, parent=hub)
-    # The hub polls the inverter and publishes each switch's state
-    for key, sw in TYPES.items():
-        off_arg = "nullptr" if sw.off is None else f'"{sw.off}"'
-        await switches(
-            key, sw.setter(hub), apply=f'write_switch(state, "{sw.on}", {off_arg})'
-        )
+    paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
+
+    for type, (on, off) in TYPES.items():
+        if type in config:
+            conf = config[type]
+            var = await switch.new_switch(conf)
+            await cg.register_component(var, conf)
+            cg.add(getattr(paren, f"set_{type}_switch")(var))
+            cg.add(var.set_parent(paren))
+            cg.add(var.set_on_command(on))
+            if off is not None:
+                cg.add(var.set_off_command(off))

esphome/components/pipsolar/switch/pipsolar_switch.cpp

@@ -0,0 +1,17 @@
+#include "pipsolar_switch.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome::pipsolar {
+
+ESPHOME_LOG_TAG(TAG, "pipsolar.switch");
+
+void PipsolarSwitch::dump_config() { LOG_SWITCH("", "Pipsolar Switch", this); }
+void PipsolarSwitch::write_state(bool state) {
+  const char *command = state ? this->on_command_ : this->off_command_;
+  if (command != nullptr) {
+    this->parent_->queue_command(command);
+  }
+}
+
+}  // namespace esphome::pipsolar

esphome/components/pipsolar/switch/pipsolar_switch.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "../pipsolar.h"
+#include "esphome/components/switch/switch.h"
+#include "esphome/core/component.h"
+
+namespace esphome::pipsolar {
+class Pipsolar;
+class PipsolarSwitch final : public switch_::Switch, public Component {
+ public:
+  void set_parent(Pipsolar *parent) { this->parent_ = parent; }
+  void set_on_command(const char *command) { this->on_command_ = command; }
+  void set_off_command(const char *command) { this->off_command_ = command; }
+  /// Prevent accidental use of std::string which would dangle
+  void set_on_command(const std::string &command) = delete;
+  void set_off_command(const std::string &command) = delete;
+  void dump_config() override;
+
+ protected:
+  void write_state(bool state) override;
+  const char *on_command_{nullptr};
+  const char *off_command_{nullptr};
+  Pipsolar *parent_;
+};
+
+}  // namespace esphome::pipsolar

esphome/components/resampler/microphone/resampler_microphone.cpp

@@ -90,7 +90,6 @@ bool ResamplerMicrophone::init_resampler_(const audio::AudioStreamInfo &input_st
 
   if (input_stream_info.get_sample_rate() == this->target_sample_rate_) {
     // The source already delivers the target sample rate, so its audio is passed through unchanged
-    this->output_buffer_.reserve(input_stream_info.ms_to_bytes(BUFFER_DURATION_MS));
     this->input_stream_info_ = input_stream_info;
     this->resampler_ready_ = true;
     return true;
@@ -138,23 +137,7 @@ void ResamplerMicrophone::process_audio_(const microphone::AudioCapture &capture
   }
 
   if (this->resampler_ == nullptr) {
-    if (this->mute_state_) {
-      // The source's buffer is shared with its other consumers, so publish zeros from our own buffer, in pieces that
-      // fit its reserved size so muting never allocates
-      const uint32_t max_frames = input_stream_info.ms_to_frames(BUFFER_DURATION_MS);
-      const uint32_t total_frames = input_stream_info.bytes_to_frames(capture.data.size());
-      for (uint32_t done = 0; done < total_frames;) {
-        const uint32_t frames = std::min(total_frames - done, max_frames);
-        this->output_buffer_.assign(input_stream_info.frames_to_bytes(frames), 0);
-        const int64_t time_us =
-            capture.capture_time_us == 0 ? 0 : capture.capture_time_us + input_stream_info.frames_to_microseconds(done);
-        this->publish_audio_(this->output_buffer_, input_stream_info, time_us);
-        done += frames;
-      }
-    } else {
-      // Needs a protected forwarding method once data_callbacks_ is made private in 2027.5.0
-      this->data_callbacks_.call(microphone::AudioCapture{capture.data, input_stream_info, capture.capture_time_us});
-    }
+    this->publish_audio_(capture.data, input_stream_info, capture.capture_time_us);
     return;
   }
 

esphome/config_validation.py

@@ -2744,13 +2744,8 @@ def url(value):
     raise Invalid("Expected a file scheme or a URL scheme with host")
 
 
-# Characters git never allows in a branch or tag name (git check-ref-format)
-GIT_REF_PATTERN = r"[^\s~^:?*\[\\]+"
-
-
-def git_ref(value: typing.Any) -> str:
-    value = string_strict(value)
-    if re.fullmatch(GIT_REF_PATTERN, value) is None:
+def git_ref(value):
+    if re.match(r"[a-zA-Z0-9_./-]+", value) is None:
         raise Invalid("Not a valid git ref")
     return value
 
@@ -3005,8 +3000,9 @@ def validate_source_shorthand(value):
     except Invalid:
         pass
     # Regex for GitHub repo name with optional branch/tag
-    m = re.fullmatch(
-        rf"github://(?:([a-zA-Z0-9\-]+)/([a-zA-Z0-9\-\._]+)(?:@({GIT_REF_PATTERN}))?|pr#([0-9]+))",
+    # Note: git allows other branch/tag names as well, but never seen them used before
+    m = re.match(
+        r"github://(?:([a-zA-Z0-9\-]+)/([a-zA-Z0-9\-\._]+)(?:@([a-zA-Z0-9\-_.\./]+))?|pr#([0-9]+))",
         value,
     )
     if m is None:

esphome/core/entity_helpers.py

@@ -5,7 +5,7 @@ from importlib import import_module
 from importlib.util import find_spec
 import logging
 import re
-from typing import Any, Literal
+from typing import Any, Literal, get_args
 
 from esphome.automation import apply_static_function, parent_ref
 import esphome.codegen as cg
@@ -503,7 +503,8 @@ async def _setup_entity_impl(var: MockObj, config: ConfigType, platform: str) ->
     config[_KEY_ICON_IDX] = icon_idx
 
 
-ApplyPublish = Literal["before", "after", "momentary"] | None
+ApplyPublishMode = Literal["before", "after", "momentary", "on_success"]
+ApplyPublish = ApplyPublishMode | None
 
 
 @dataclass(frozen=True, slots=True)
@@ -577,7 +578,8 @@ class SubEntities:
 
         With ``apply`` the entity is the domain's ``Apply*`` class and its control runs
         ``parent->apply``, or ``apply`` as a namespaced free statement when no parent is bound, with
-        ``publish`` ("before"/"after") placing the domain's publish. ``publish="momentary"`` instead
+        ``publish`` ("before"/"after") placing the domain's publish; ``"on_success"`` publishes only when
+        ``apply`` returns true. ``publish="momentary"`` instead
         acknowledges first (a switch publishes off) and runs ``apply`` only when turned on. It is only for
         legacy action switches; a new action entity is a button.
         """
@@ -600,10 +602,8 @@ class SubEntities:
             )
         if publish is not None and (apply is None or self.apply_entity.publish is None):
             raise ValueError(f"{entity_id}: publish= needs apply= on a stateful domain")
-        if publish not in (None, "before", "after", "momentary"):
-            raise ValueError(
-                f'{entity_id}: publish= must be "before", "after" or "momentary"'
-            )
+        if publish is not None and publish not in (modes := get_args(ApplyPublishMode)):
+            raise ValueError(f"{entity_id}: publish= must be one of {', '.join(modes)}")
         if publish == "momentary" and self.apply_entity.momentary is None:
             raise ValueError(f'{entity_id}: publish="momentary" is not supported here')
 
@@ -626,11 +626,14 @@ class SubEntities:
         if isinstance(parent, ID):
             parent = await get_variable(parent)
         apply_entity = self.apply_entity
-        call = f"{apply};" if parent is None else f"{parent_ref(parent)}->{apply};"
+        expr = apply if parent is None else f"{parent_ref(parent)}->{apply}"
+        call = f"{expr};"
         if publish == "before":
             body = [apply_entity.publish, call]
         elif publish == "after":
             body = [call, apply_entity.publish]
+        elif publish == "on_success":
+            body = [f"if ({expr}) {{ {apply_entity.publish} }}"]
         elif publish == "momentary":
             acknowledge, condition = apply_entity.momentary
             body = [acknowledge, f"if ({condition}) {{ {call} }}"]

esphome/git.py

@@ -1051,8 +1051,8 @@ class GitFile:
         """Parse a git shorthand URL into its components."""
         if not isinstance(shorthand, str):
             raise ValueError("Git shorthand must be a string")
-        m = re.fullmatch(
-            rf"(?P<domain>[a-zA-Z0-9\-]+)://(?P<owner>[a-zA-Z0-9\-]+)/(?P<repo>[a-zA-Z0-9\-\._]+)/(?P<filename>[a-zA-Z0-9\-_.\./]+)(?:@(?P<ref>{cv.GIT_REF_PATTERN}))?(?:\?(?P<query>[a-zA-Z0-9\-_.\./]+))?",
+        m = re.match(
+            r"(?P<domain>[a-zA-Z0-9\-]+)://(?P<owner>[a-zA-Z0-9\-]+)/(?P<repo>[a-zA-Z0-9\-\._]+)/(?P<filename>[a-zA-Z0-9\-_.\./]+)(?:@(?P<ref>[a-zA-Z0-9\-_.\./]+))?(?:\?(?P<query>[a-zA-Z0-9\-_.\./]+))?",
             shorthand,
         )
         if m is None:

esphome/idf_component.yml

@@ -2,7 +2,7 @@ dependencies:
   bblanchon/arduinojson:
     version: "7.4.3"
   esphome/dlms_parser:
-    version: 2.2.2
+    version: 2.2.0
   esphome/esp-audio-libs:
     version: 4.1.0
   esphome/esp-micro-speech-features:

esphome/loader.py

@@ -284,17 +284,12 @@ def _lookup_module(domain: str, exception: bool) -> ComponentManifest | None:
             _COMPONENT_CACHE[domain] = manif
         return manif
 
-    module_name = f"esphome.components.{domain}"
     try:
-        module = importlib.import_module(module_name)
+        module = importlib.import_module(f"esphome.components.{domain}")
     except ImportError as e:
         if exception:
             raise
-        if (
-            isinstance(e, ModuleNotFoundError)
-            and e.name is not None
-            and f"{module_name}.".startswith(f"{e.name}.")
-        ):
+        if "No module named" in str(e):
             _LOGGER.info(
                 "Unable to import component %s: %s", domain, str(e), exc_info=False
             )

platformio.ini

@@ -106,7 +106,7 @@ build_unflags =
 ; esp32 envs (which would double-include them).
 [common:idf-component-libs]
 lib_deps =
-    esphome/dlms_parser@2.2.2             ; dlms_meter
+    esphome/dlms_parser@2.2.0             ; dlms_meter
     bblanchon/ArduinoJson@7.4.3           ; json
     lvgl/lvgl@9.6.0                       ; lvgl
 

tests/components/bq25186/__init__.py

@@ -0,0 +1,14 @@
+import esphome.codegen as cg
+from esphome.types import ConfigType
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # One empty config entry so to_code runs and compiles the PG/GPO switch path.
+    manifest.multi_conf = False
+    manifest.dependencies = manifest.dependencies + ["i2c", "switch"]
+
+    async def to_code(config: ConfigType) -> None:
+        cg.add_define("USE_BQ25186_PG_GPO")
+
+    manifest.to_code = to_code

tests/components/bq25186/test_bq25186_pg_gpo.cpp

@@ -0,0 +1,143 @@
+#include <gtest/gtest.h>
+
+#include <array>
+
+#include "esphome/components/bq25186/bq25186.h"
+#include "esphome/components/switch/switch.h"
+
+namespace esphome::bq25186::testing {
+
+static constexpr uint8_t ADDRESS = 0x6A;
+static constexpr uint8_t SYS_REG_OTHER_BITS = 0x0F;
+
+// The chip's registers behind an address pointer that moves on after every byte; writes can be made to fail.
+class RegisterBus final : public i2c::I2CBus {
+ public:
+  i2c::ErrorCode write_readv(uint8_t address, const uint8_t *data, size_t size, uint8_t *out,
+                             size_t out_size) override {
+    EXPECT_EQ(address, ADDRESS);
+    if (size > 1 && this->fail_writes)
+      return i2c::ERROR_NOT_ACKNOWLEDGED;
+    if (size != 0) {
+      this->pointer_ = data[0];
+      for (size_t i = 1; i < size; i++)
+        this->registers[this->next_()] = data[i];
+    }
+    for (size_t i = 0; i < out_size; i++)
+      out[i] = this->registers[this->next_()];
+    return i2c::ERROR_OK;
+  }
+
+  std::array<uint8_t, BQ25186_STATUS_REGISTER_COUNT> registers{};
+  bool fail_writes{false};
+
+ protected:
+  size_t next_() { return this->pointer_++ % this->registers.size(); }
+
+  uint8_t pointer_{0};
+};
+
+// The body code generation emits for apply= with publish="on_success"
+static BQ25186Component *hub_under_test = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+static void apply_pg_gpo(switch_::Switch *entity, bool state) {
+  if (hub_under_test->write_pg_gpo_level(state))
+    entity->publish_state(state);
+}
+
+class BQ25186PgGpoTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    this->bus_.registers[BQ25186_REG_MASK_ID] = 0x01;  // the BQ25186 device id
+    this->bus_.registers[BQ25186_REG_SYS_REG] = SYS_REG_OTHER_BITS;
+    this->hub_.set_i2c_bus(&this->bus_);
+    this->hub_.set_i2c_address(ADDRESS);
+    hub_under_test = &this->hub_;
+    this->switch_.set_restore_mode(switch_::SWITCH_RESTORE_DISABLED);
+    this->hub_.set_pg_gpo_switch(&this->switch_);
+  }
+
+  bool level_() const { return (this->bus_.registers[BQ25186_REG_SYS_REG] & BQ25186_SYS_REG_PG_GPO_LEVEL) != 0; }
+  uint8_t other_bits_() const { return this->bus_.registers[BQ25186_REG_SYS_REG] & ~BQ25186_SYS_REG_PG_GPO_LEVEL; }
+
+  RegisterBus bus_;
+  BQ25186Component hub_;
+  switch_::ApplySwitch<apply_pg_gpo> switch_;
+};
+
+TEST_F(BQ25186PgGpoTest, TurnOnSetsTheLevelAndPublishes) {
+  this->switch_.turn_on();
+  EXPECT_TRUE(this->level_());
+  EXPECT_EQ(this->other_bits_(), SYS_REG_OTHER_BITS);
+  EXPECT_TRUE(this->switch_.has_state());
+  EXPECT_TRUE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, TurnOffClearsTheLevelAndPublishes) {
+  this->bus_.registers[BQ25186_REG_SYS_REG] |= BQ25186_SYS_REG_PG_GPO_LEVEL;
+  this->switch_.publish_state(true);
+  this->switch_.turn_off();
+  EXPECT_FALSE(this->level_());
+  EXPECT_EQ(this->other_bits_(), SYS_REG_OTHER_BITS);
+  EXPECT_FALSE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, FailedWriteLeavesTheStateUnpublished) {
+  this->bus_.fail_writes = true;
+  this->switch_.turn_on();
+  EXPECT_FALSE(this->level_());
+  EXPECT_FALSE(this->switch_.has_state());
+}
+
+TEST_F(BQ25186PgGpoTest, FailedWriteKeepsThePreviousState) {
+  // Start from on, so a reset to the default off state would show
+  this->bus_.registers[BQ25186_REG_SYS_REG] |= BQ25186_SYS_REG_PG_GPO_LEVEL;
+  this->switch_.publish_state(true);
+  this->bus_.fail_writes = true;
+  this->switch_.turn_off();
+  EXPECT_TRUE(this->level_());
+  EXPECT_TRUE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, InvertedSwitchDrivesTheOppositeLevel) {
+  this->switch_.set_inverted(true);
+  this->switch_.turn_on();
+  EXPECT_FALSE(this->level_());
+  EXPECT_TRUE(this->switch_.state);
+  this->switch_.turn_off();
+  EXPECT_TRUE(this->level_());
+  EXPECT_FALSE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, SetupWritesTheRestoredLevel) {
+  this->switch_.set_restore_mode(switch_::SWITCH_ALWAYS_ON);
+  this->hub_.setup();
+  EXPECT_TRUE(this->level_());
+  EXPECT_NE(this->bus_.registers[BQ25186_REG_VBAT_CTRL] & BQ25186_VBAT_CTRL_PG_MODE, 0);
+  EXPECT_TRUE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, SetupWritesTheRestoredLevelInverted) {
+  this->bus_.registers[BQ25186_REG_SYS_REG] |= BQ25186_SYS_REG_PG_GPO_LEVEL;
+  this->switch_.set_restore_mode(switch_::SWITCH_ALWAYS_ON);
+  this->switch_.set_inverted(true);
+  this->hub_.setup();
+  EXPECT_FALSE(this->level_());
+  EXPECT_TRUE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, SetupWithoutRestoreTakesTheChipLevel) {
+  this->bus_.registers[BQ25186_REG_SYS_REG] |= BQ25186_SYS_REG_PG_GPO_LEVEL;
+  this->hub_.setup();
+  EXPECT_TRUE(this->level_());
+  EXPECT_TRUE(this->switch_.state);
+}
+
+TEST_F(BQ25186PgGpoTest, SetupWithoutRestoreTakesTheChipLevelInverted) {
+  this->bus_.registers[BQ25186_REG_SYS_REG] |= BQ25186_SYS_REG_PG_GPO_LEVEL;
+  this->switch_.set_inverted(true);
+  this->hub_.setup();
+  EXPECT_TRUE(this->level_());
+  EXPECT_FALSE(this->switch_.state);
+}
+
+}  // namespace esphome::bq25186::testing

tests/components/microphone/test_data_callbacks.cpp

@@ -17,7 +17,7 @@ class TestMicrophone : public Microphone {
   void start() override {}
   void stop() override {}
 
-  void publish(std::span<uint8_t> data, const audio::AudioStreamInfo &stream_info, int64_t capture_time_us) {
+  void publish(std::span<const uint8_t> data, const audio::AudioStreamInfo &stream_info, int64_t capture_time_us) {
     this->publish_audio_(data, stream_info, capture_time_us);
   }
   bool has_callbacks() const { return this->has_data_callbacks_(); }
@@ -56,24 +56,20 @@ TEST(MicrophoneDataCallbacks, CallbackGetsDataFormatAndCaptureTime) {
   });
   EXPECT_TRUE(mic.has_callbacks());
 
-  std::vector<uint8_t> buffer = SAMPLES;
-  mic.publish(buffer, STEREO_48K, 123456);
+  mic.publish(SAMPLES, STEREO_48K, 123456);
   EXPECT_EQ(data, SAMPLES);
   EXPECT_EQ(stream_info, STEREO_48K);
   EXPECT_EQ(capture_time_us, 123456);
 }
 
-TEST(MicrophoneDataCallbacks, MuteZeroesTheBufferInPlace) {
+TEST(MicrophoneDataCallbacks, MutedCallbackGetsZeros) {
   TestMicrophone mic;
   std::vector<uint8_t> data;
   mic.add_data_callback([&](const AudioCapture &capture) { data.assign(capture.data.begin(), capture.data.end()); });
 
   mic.set_mute_state(true);
-  std::vector<uint8_t> buffer = SAMPLES;
-  mic.publish(buffer, STEREO_48K, 0);
-  const std::vector<uint8_t> zeros(SAMPLES.size(), 0);
-  EXPECT_EQ(data, zeros);
-  EXPECT_EQ(buffer, zeros);
+  mic.publish(SAMPLES, STEREO_48K, 0);
+  EXPECT_EQ(data, std::vector<uint8_t>(SAMPLES.size(), 0));
 }
 
 TEST(MicrophoneDataCallbacks, DataTriggerPassesACopy) {
@@ -119,17 +115,4 @@ TEST(MicrophoneDataCallbacks, DeprecatedCallUsesMicrophoneFormat) {
   EXPECT_EQ(capture_time_us, 0);
 }
 
-// Remove in 2027.5.0 with the deprecated DataCallbackManager::call(data)
-TEST(MicrophoneDataCallbacks, DeprecatedCallDeliversZerosWhileMuted) {
-  TestMicrophone mic;
-  std::vector<uint8_t> data;
-  mic.add_data_callback([&](const AudioCapture &capture) { data.assign(capture.data.begin(), capture.data.end()); });
-
-  mic.set_mute_state(true);
-  const std::vector<uint8_t> buffer = SAMPLES;
-  mic.publish_deprecated(buffer);
-  EXPECT_EQ(data, std::vector<uint8_t>(SAMPLES.size(), 0));
-  EXPECT_EQ(buffer, SAMPLES);
-}
-
 }  // namespace esphome::microphone::testing

tests/integration/fixtures/uart_mock_ld2420_select_mode.yaml

@@ -1,96 +0,0 @@
-esphome:
-  name: uart-mock-ld2420-select-mode
-
-host:
-api:
-  batch_delay: 0ms  # Disable batching to receive all state updates
-logger:
-  level: VERBOSE
-
-external_components:
-  - source:
-      type: local
-      path: EXTERNAL_COMPONENT_PATH
-
-# Dummy uart entry to satisfy ld2420's DEPENDENCIES = ["uart"]
-# The actual UART bus used is the uart_mock component below
-uart:
-  baud_rate: 115200
-  port: /dev/null
-
-uart_mock:
-  id: mock_uart
-  baud_rate: 115200
-  auto_start: false
-  responses:
-    # Firmware v2.0.0 (1.5.4 or newer), so setup picks energy reporting
-    - expect_tx:
-        [0xFD, 0xFC, 0xFB, 0xFA, 0x02, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x01]
-      inject_rx:
-        [
-          0xFD, 0xFC, 0xFB, 0xFA,
-          0x0C, 0x00,
-          0x00, 0x01,
-          0x00, 0x00,
-          0x06, 0x00,
-          0x76, 0x32, 0x2E, 0x30, 0x2E, 0x30,
-          0x04, 0x03, 0x02, 0x01,
-        ]
-
-    # Generic ACK for every other command
-    - expect_tx: [0x04, 0x03, 0x02, 0x01]
-      inject_rx:
-        [
-          0xFD, 0xFC, 0xFB, 0xFA,
-          0x04, 0x00,
-          0xFF, 0x01,
-          0x00, 0x00,
-          0x04, 0x03, 0x02, 0x01,
-        ]
-
-  injections:
-    # Sent after the select switched the module to Simple: "ON Range 0035\r\n" is only
-    # parsed while the component expects simple frames.
-    - delay: 100ms
-      inject_rx:
-        [
-          0x4F, 0x4E, 0x20, 0x52, 0x61, 0x6E, 0x67, 0x65, 0x20,
-          0x30, 0x30, 0x33, 0x35,
-          0x0D, 0x0A,
-        ]
-
-button:
-  - platform: template
-    name: "Start Scenario"
-    on_press:
-      - lambda: 'id(mock_uart).start_scenario();'
-  # A changed timeout gets apply_config_action() past its no-change check
-  - platform: template
-    name: "Apply Changed Config"
-    on_press:
-      - lambda: |-
-          id(ld2420_dev).new_config.timeout++;
-          id(ld2420_dev).apply_config_action();
-  - platform: template
-    name: "Inject Simple Frame"
-    on_press:
-      - lambda: |-
-          // "ON Range 0040\r\n"
-          id(mock_uart).inject_to_rx_buffer(std::vector<uint8_t>{
-              0x4F, 0x4E, 0x20, 0x52, 0x61, 0x6E, 0x67, 0x65, 0x20, 0x30, 0x30, 0x34, 0x30, 0x0D, 0x0A});
-
-ld2420:
-  id: ld2420_dev
-  uart_id: mock_uart
-
-sensor:
-  - platform: ld2420
-    ld2420_id: ld2420_dev
-    moving_distance:
-      name: "Moving Distance"
-
-select:
-  - platform: ld2420
-    ld2420_id: ld2420_dev
-    operating_mode:
-      name: "Operating Mode"

tests/integration/fixtures/uart_mock_ld2420_select_mode_nack.yaml

@@ -1,73 +0,0 @@
-esphome:
-  name: uart-mock-ld2420-mode-nack
-
-host:
-api:
-  batch_delay: 0ms  # Disable batching to receive all state updates
-logger:
-  level: VERBOSE
-
-external_components:
-  - source:
-      type: local
-      path: EXTERNAL_COMPONENT_PATH
-
-# Dummy uart entry to satisfy ld2420's DEPENDENCIES = ["uart"]
-# The actual UART bus used is the uart_mock component below
-uart:
-  baud_rate: 115200
-  port: /dev/null
-
-uart_mock:
-  id: mock_uart
-  baud_rate: 115200
-  responses:
-    # Firmware v2.0.0 (1.5.4 or newer), so setup picks energy reporting
-    - expect_tx:
-        [0xFD, 0xFC, 0xFB, 0xFA, 0x02, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x01]
-      inject_rx:
-        [
-          0xFD, 0xFC, 0xFB, 0xFA,
-          0x0C, 0x00,
-          0x00, 0x01,
-          0x00, 0x00,
-          0x06, 0x00,
-          0x76, 0x32, 0x2E, 0x30, 0x2E, 0x30,
-          0x04, 0x03, 0x02, 0x01,
-        ]
-
-    # The simple system mode write is refused (error word 1)
-    - expect_tx:
-        [
-          0xFD, 0xFC, 0xFB, 0xFA, 0x08, 0x00, 0x12, 0x00,
-          0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x01,
-        ]
-      inject_rx:
-        [
-          0xFD, 0xFC, 0xFB, 0xFA,
-          0x04, 0x00,
-          0x12, 0x01,
-          0x01, 0x00,
-          0x04, 0x03, 0x02, 0x01,
-        ]
-
-    # Generic ACK for every other command
-    - expect_tx: [0x04, 0x03, 0x02, 0x01]
-      inject_rx:
-        [
-          0xFD, 0xFC, 0xFB, 0xFA,
-          0x04, 0x00,
-          0xFF, 0x01,
-          0x00, 0x00,
-          0x04, 0x03, 0x02, 0x01,
-        ]
-
-ld2420:
-  id: ld2420_dev
-  uart_id: mock_uart
-
-select:
-  - platform: ld2420
-    ld2420_id: ld2420_dev
-    operating_mode:
-      name: "Operating Mode"

tests/integration/fixtures/uart_mock_pipsolar_switches.yaml

@@ -1,41 +0,0 @@
-esphome:
-  name: uart-mock-pipsolar-switches
-
-host:
-api:
-  batch_delay: 0ms
-logger:
-  level: DEBUG
-
-external_components:
-  - source:
-      type: local
-      path: EXTERNAL_COMPONENT_PATH
-
-# Dummy uart entry to satisfy pipsolar's DEPENDENCIES = ["uart"]
-# The actual UART bus used is the uart_mock component below
-uart:
-  baud_rate: 2400
-  port: /dev/null
-
-uart_mock:
-  id: mock_uart
-  baud_rate: 2400
-  auto_start: false
-
-# No polling, so only the switch writes reach the command queue and no
-# polled status publishes the switch states
-pipsolar:
-  id: inverter0
-  uart_id: mock_uart
-  update_interval: never
-
-switch:
-  - platform: pipsolar
-    pipsolar_id: inverter0
-    output_source_priority_utility:
-      name: Priority Utility
-    input_voltage_range:
-      name: Input Voltage Range
-    pv_power_balance:
-      name: PV Power Balance

tests/integration/test_uart_mock_ld2420_select_mode.py

@@ -1,128 +0,0 @@
-"""Integration test for the LD2420 operating mode select with a mock UART.
-
-The module runs firmware v2.0.0, so it starts in energy reporting. Choosing Simple
-must write the simple system mode to the module and parse simple frames afterwards;
-choosing Normal again must write the energy system mode back.
-"""
-
-from __future__ import annotations
-
-import asyncio
-
-from aioesphomeapi import ButtonInfo, EntityState, SelectInfo, SelectState
-import pytest
-
-from .log_utils import LineWaiter
-from .state_utils import (
-    SensorStateCollector,
-    require_entity,
-    subscribe_after_initial_states,
-)
-from .types import APIClientConnectedFactory, RunCompiledFunction
-from .wait_utils import wait_or_fail
-
-# CMD_WRITE_SYS_PARAM (0x0012), parameter 0x0000 (system mode), then the mode and 0x0000
-WRITE_SIMPLE = "FD:FC:FB:FA:08:00:12:00:00:00:64:00:00:00:04:03:02:01"
-WRITE_ENERGY = "FD:FC:FB:FA:08:00:12:00:00:00:04:00:00:00:04:03:02:01"
-
-
-@pytest.mark.asyncio
-async def test_uart_mock_ld2420_select_mode(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-) -> None:
-    """The select switches the module between energy and simple reporting."""
-    waiter = LineWaiter()
-    collector = SensorStateCollector(sensor_names=["moving_distance"])
-    simple_frame_parsed = collector.add_waiter(
-        lambda: pytest.approx(35.0) in collector.sensor_states["moving_distance"]
-    )
-    second_frame_parsed = collector.add_waiter(
-        lambda: pytest.approx(40.0) in collector.sensor_states["moving_distance"]
-    )
-    modes: list[str] = []
-    back_to_normal = asyncio.Event()
-
-    def on_state(state: EntityState) -> None:
-        collector.on_state(state)
-        if isinstance(state, SelectState):
-            modes.append(state.state)
-            if modes[-2:] == ["Calibrate", "Normal"]:
-                back_to_normal.set()
-
-    async with (
-        run_compiled(yaml_config, line_callback=waiter.callback),
-        api_client_connected() as client,
-    ):
-        entities, _ = await client.list_entities_services()
-        collector.build_key_mapping(entities)
-        await subscribe_after_initial_states(client, entities, on_state=on_state)
-        mode = require_entity(entities, "operating_mode", SelectInfo)
-        apply_changed = require_entity(entities, "apply_changed_config", ButtonInfo)
-        # Setup wrote energy mode for this firmware
-        await waiter.wait_for("TX", WRITE_ENERGY)
-        writes_before = waiter.count(WRITE_ENERGY)
-
-        client.select_command(mode.key, "Simple")
-        await waiter.wait_for("TX", WRITE_SIMPLE)
-
-        client.button_command(
-            require_entity(entities, "start_scenario", ButtonInfo).key
-        )
-        await wait_or_fail(simple_frame_parsed, 3.0, "Simple frame was not parsed")
-
-        # Applying a changed config in Simple keeps Simple
-        client.button_command(apply_changed.key)
-        await waiter.wait_for("Reconfiguring")
-        inject = require_entity(entities, "inject_simple_frame", ButtonInfo)
-
-        async def inject_until_parsed() -> None:
-            # Simple reports are rate limited, so keep sending until one is published
-            while not second_frame_parsed.done():
-                client.button_command(inject.key)
-                await asyncio.sleep(0.2)
-
-        await wait_or_fail(inject_until_parsed(), 5.0, "Simple stopped after apply")
-        assert modes[-1] == "Simple"
-
-        client.select_command(mode.key, "Normal")
-        await waiter.wait_count(
-            WRITE_ENERGY, writes_before + 1, 3.0, "Normal did not write energy mode"
-        )
-        assert waiter.count(WRITE_ENERGY) == writes_before + 1
-
-        # Applying a changed config ends calibration
-        client.select_command(mode.key, "Calibrate")
-        client.button_command(apply_changed.key)
-        await wait_or_fail(back_to_normal, 5.0, "Apply did not end calibration")
-
-
-@pytest.mark.asyncio
-async def test_uart_mock_ld2420_select_mode_nack(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-) -> None:
-    """A refused Simple write puts the select back on the mode the module reports."""
-    waiter = LineWaiter()
-    states: list[str] = []
-    back_to_normal = asyncio.Event()
-
-    def on_state(state: EntityState) -> None:
-        if isinstance(state, SelectState):
-            states.append(state.state)
-            if states[-2:] == ["Simple", "Normal"]:
-                back_to_normal.set()
-
-    async with (
-        run_compiled(yaml_config, line_callback=waiter.callback),
-        api_client_connected() as client,
-    ):
-        entities, _ = await client.list_entities_services()
-        await subscribe_after_initial_states(client, entities, on_state=on_state)
-        mode = require_entity(entities, "operating_mode", SelectInfo)
-        client.select_command(mode.key, "Simple")
-        # Three tries of about a second each before the write is given up
-        await wait_or_fail(back_to_normal, 6.0, "Select did not go back to Normal")
-        assert waiter.count(WRITE_SIMPLE) == 3

tests/integration/test_uart_mock_pipsolar_switches.py

@@ -1,94 +0,0 @@
-"""Integration test for the pipsolar switches with mock UART.
-
-Each write queues the switch's on or off command on the hub, a direction with
-no command queues nothing, nothing is written at boot, and the write itself
-does not publish the switch state (the hub's polled status does).
-"""
-
-from __future__ import annotations
-
-import asyncio
-from pathlib import Path
-import re
-
-from aioesphomeapi import EntityState, SwitchInfo
-import pytest
-
-from .log_utils import LineWaiter
-from .state_utils import require_entity
-from .types import APIClientConnectedFactory, RunCompiledFunction
-
-QUEUED = re.compile(r"Command queued successfully: (\w+) at position")
-
-
-@pytest.mark.asyncio
-async def test_uart_mock_pipsolar_switches(
-    yaml_config: str,
-    run_compiled: RunCompiledFunction,
-    api_client_connected: APIClientConnectedFactory,
-) -> None:
-    """Switch writes queue their commands and publish nothing themselves."""
-    external_components_path = str(
-        Path(__file__).parent / "fixtures" / "external_components"
-    )
-    yaml_config = yaml_config.replace(
-        "EXTERNAL_COMPONENT_PATH", external_components_path
-    )
-    waiter = LineWaiter()
-
-    async with (
-        run_compiled(yaml_config, line_callback=waiter.callback),
-        api_client_connected() as client,
-    ):
-        entities, _ = await client.list_entities_services()
-        utility = require_entity(entities, "priority_utility", SwitchInfo)
-        voltage_range = require_entity(entities, "input_voltage_range", SwitchInfo)
-        balance = require_entity(entities, "pv_power_balance", SwitchInfo)
-
-        states: list[EntityState] = []
-        initial = asyncio.get_running_loop().create_future()
-
-        def on_state(state: EntityState) -> None:
-            states.append(state)
-            if len(states) == 3 and not initial.done():
-                initial.set_result(None)
-
-        client.subscribe_states(on_state)
-        await asyncio.wait_for(initial, timeout=5.0)
-        assert all(state.missing_state for state in states)
-        # Nothing is restored or written at boot
-        assert waiter.count(QUEUED) == 0
-
-        async def queued_after(key: int, on: bool) -> str:
-            future = waiter.expect(QUEUED)
-            client.switch_command(key, on)
-            match = await waiter.wait(future)
-            return match.group(1)
-
-        sent = waiter.expect("Sending command from queue: POP00")
-        assert await queued_after(utility.key, True) == "POP00"
-        await waiter.wait(sent)
-
-        # The utility switch has no off command, so the next queued command
-        # is the one written after it
-        future = waiter.expect(QUEUED)
-        client.switch_command(utility.key, False)
-        client.switch_command(balance.key, True)
-        assert (await waiter.wait(future)).group(1) == "PSPB1"
-        assert await queued_after(balance.key, False) == "PSPB0"
-        assert await queued_after(voltage_range.key, True) == "PGR01"
-        assert await queued_after(voltage_range.key, False) == "PGR00"
-
-        # A fresh connection's snapshot shows the writes left every switch unpublished
-        async with api_client_connected() as fresh:
-            snapshot: list[EntityState] = []
-            done = asyncio.get_running_loop().create_future()
-
-            def on_snapshot(state: EntityState) -> None:
-                snapshot.append(state)
-                if len(snapshot) == 3 and not done.done():
-                    done.set_result(None)
-
-            fresh.subscribe_states(on_snapshot)
-            await asyncio.wait_for(done, timeout=5.0)
-        assert all(state.missing_state for state in snapshot), snapshot

tests/unit_tests/components/esp32/test_framework_components.py

@@ -1,28 +0,0 @@
-"""Tests for the esp32 framework ``components:`` schema."""
-
-import pytest
-
-from esphome.components import esp32
-import esphome.config_validation as cv
-
-
-@pytest.mark.parametrize(
-    "source",
-    [
-        "https://github.com/owner/component.git",
-        "git@github.com:owner/component.git",
-    ],
-)
-def test_component_source_accepts_repository_url(source: str) -> None:
-    config = esp32.FRAMEWORK_SCHEMA(
-        {"components": [{"name": "owner/component", "source": source}]}
-    )
-    assert config["components"][0]["source"] == source
-
-
-@pytest.mark.parametrize("source", [1.0, ""])
-def test_component_source_rejects_invalid(source: object) -> None:
-    with pytest.raises(cv.Invalid):
-        esp32.FRAMEWORK_SCHEMA(
-            {"components": [{"name": "owner/component", "source": source}]}
-        )

tests/unit_tests/core/test_entity_helpers.py

@@ -1711,6 +1711,14 @@ _SELECT_APPLY = entity_helpers.ApplyEntity(
             "after",
             "::hub->set_mode(index, options_);\nentity->publish_state(index);",
         ),
+        (
+            "set_mode(option)",
+            "on_success",
+            (
+                "const char *option = entity->option_at(index);\n"
+                "if (::hub->set_mode(option)) { entity->publish_state(index); }"
+            ),
+        ),
     ],
 )
 async def test_sub_entities_apply_locals(
@@ -1883,6 +1891,35 @@ async def test_sub_entities_apply_momentary(
     assert apply_functions[0][2] == body
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("parent", "apply", "body"),
+    [
+        (
+            _HUB,
+            "write_level(state)",
+            "if (::hub->write_level(state)) { entity->publish_state(state); }",
+        ),
+        (
+            None,
+            "chip::write_level(state)",
+            "if (chip::write_level(state)) { entity->publish_state(state); }",
+        ),
+    ],
+)
+async def test_sub_entities_apply_on_success(
+    setup_test_environment: list[str],
+    apply_functions: list[tuple[str, str, str]],
+    parent: MockObj | None,
+    apply: str,
+    body: str,
+) -> None:
+    """publish="on_success" publishes only when the hub call returns true."""
+    sub = _apply_sub([], {"k": _apply_conf("k_sw")}, parent=parent)
+    await sub("k", None, apply=apply, publish="on_success")
+    assert apply_functions[0][2] == body
+
+
 @pytest.mark.asyncio
 async def test_sub_entities_apply_without_parent_needs_namespaced_call(
     setup_test_environment: list[str],

tests/unit_tests/test_config_validation.py

@@ -3121,21 +3121,9 @@ def test_git_ref_valid() -> None:
     assert cv.git_ref("v1.2.3") == "v1.2.3"
 
 
-@pytest.mark.parametrize("ref", ["main", "release/v6.0", "feat+x", "a1b2c3d4"])
-def test_git_ref_valid_chars(ref: str) -> None:
-    assert cv.git_ref(ref) == ref
-
-
-@pytest.mark.parametrize("ref", ["main hi there", "a:b", "x~1", "", "main\n"])
-def test_git_ref_invalid(ref: str) -> None:
+def test_git_ref_invalid() -> None:
     with pytest.raises(Invalid, match="Not a valid git ref"):
-        cv.git_ref(ref)
-
-
-@pytest.mark.parametrize("ref", [1.0, 2025, None])
-def test_git_ref_not_string(ref: object) -> None:
-    with pytest.raises(Invalid, match="Must be string"):
-        cv.git_ref(ref)
+        cv.git_ref("!!!")
 
 
 def test_source_refresh_always() -> None:
@@ -3303,34 +3291,6 @@ def test_validate_source_shorthand_github_pr(setup_core: Path) -> None:
     assert result[CONF_REF] == "pull/1234/head"
 
 
-def test_validate_source_shorthand_github_ref_with_slash(setup_core: Path) -> None:
-    result = cv.validate_source_shorthand("github://user/repo@release/v1")
-    assert result[CONF_REF] == "release/v1"
-
-
-def test_validate_source_shorthand_github_ref_keeps_all_chars(
-    setup_core: Path,
-) -> None:
-    result = cv.validate_source_shorthand("github://user/repo@feat+x")
-    assert result[CONF_REF] == "feat+x"
-
-
-@pytest.mark.parametrize(
-    "value",
-    [
-        "github://esphome/esphome/esphome/components@dev",
-        "github://user/repo/",
-        "github://user/repo@main hi",
-        "github://pr#1234abc",
-    ],
-)
-def test_validate_source_shorthand_rejects_trailing_text(
-    setup_core: Path, value: str
-) -> None:
-    with pytest.raises(Invalid, match="not a file system path"):
-        cv.validate_source_shorthand(value)
-
-
 def test_validate_source_shorthand_invalid(setup_core: Path) -> None:
     with pytest.raises(Invalid, match="not a file system path"):
         cv.validate_source_shorthand("notvalid")

tests/unit_tests/test_git.py

@@ -3332,26 +3332,6 @@ def test_git_file_from_shorthand_without_ref_or_query() -> None:
     assert gf == git.GitFile("codeberg.org", "owner", "repo", "file.yaml")
 
 
-def test_git_file_from_shorthand_keeps_whole_ref() -> None:
-    gf = git.GitFile.from_shorthand("github://owner/repo/file.yaml@feat+x?full_config")
-
-    assert gf.ref == "feat+x"
-    assert gf.query == "full_config"
-
-
-@pytest.mark.parametrize(
-    "shorthand",
-    [
-        "github://owner/repo/file.yaml@main hi",
-        "github://owner/repo/my file.yaml",
-        "github://owner/repo/file.yaml?full config",
-    ],
-)
-def test_git_file_from_shorthand_rejects_trailing_text(shorthand: str) -> None:
-    with pytest.raises(ValueError, match="not in expected"):
-        git.GitFile.from_shorthand(shorthand)
-
-
 def test_git_file_from_shorthand_requires_string() -> None:
     with pytest.raises(ValueError, match="must be a string"):
         git.GitFile.from_shorthand(123)

tests/unit_tests/test_loader.py

@@ -26,7 +26,6 @@ from esphome.loader import (
     clear_component_meta_finders,
     get_alias_metadata,
     get_component,
-    get_platform,
     install_meta_finder,
 )
 from tests.testing_helpers import ComponentManifestOverride
@@ -810,44 +809,6 @@ def test_lookup_module_import_error_missing_module_returns_none(
     assert "definitely_missing_component_xyz" not in _COMPONENT_CACHE
 
 
-def test_lookup_module_missing_platform_returns_none(
-    caplog: pytest.LogCaptureFixture,
-) -> None:
-    """A platform file that does not exist is "not found", not an error."""
-    with caplog.at_level(logging.INFO, logger="esphome.loader"):
-        assert get_platform("definitely_missing_platform_xyz", "template") is None
-    assert "Unable to import component template.definitely_missing_platform_xyz" in (
-        caplog.text
-    )
-    assert not [r for r in caplog.records if r.levelno >= logging.ERROR]
-
-
-def test_lookup_module_missing_dependency_is_logged_as_error(
-    tmp_path: Path, caplog: pytest.LogCaptureFixture
-) -> None:
-    """A component that exists but imports a missing package reports that
-    package as an error, instead of looking like a missing component."""
-    comp = tmp_path / "depfailcomp"
-    comp.mkdir()
-    (comp / "__init__.py").write_text("import definitely_missing_package_xyz\n")
-    saved = list(sys.meta_path)
-    try:
-        install_meta_finder(tmp_path)
-        with caplog.at_level(logging.INFO, logger="esphome.loader"):
-            assert get_component("depfailcomp") is None
-    finally:
-        sys.meta_path[:] = saved
-        for name in [
-            m for m in sys.modules if m.startswith("esphome.components.depfailcomp")
-        ]:
-            del sys.modules[name]
-    errors = [r for r in caplog.records if r.levelno >= logging.ERROR]
-    assert len(errors) == 1
-    assert errors[0].getMessage() == "Unable to import component depfailcomp:"
-    assert errors[0].exc_info is not None
-    assert errors[0].exc_info[1].name == "definitely_missing_package_xyz"
-
-
 def test_lookup_module_missing_module_raises_when_requested() -> None:
     """With ``exception=True`` the ImportError propagates."""
     with pytest.raises(ImportError):