esphome 2024.9.0__py3-none-any.whl → 2024.9.0b1__py3-none-any.whl

esphome/components/api/api_connection.cpp

@@ -1032,7 +1032,6 @@ bool APIConnection::send_media_player_info(media_player::MediaPlayer *media_play
     media_format.sample_rate = supported_format.sample_rate;
     media_format.num_channels = supported_format.num_channels;
     media_format.purpose = static_cast<enums::MediaPlayerFormatPurpose>(supported_format.purpose);
-    media_format.sample_bytes = supported_format.sample_bytes;
     msg.supported_formats.push_back(media_format);
   }
 
@@ -1224,39 +1223,6 @@ void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnno
   }
 }
 
-VoiceAssistantConfigurationResponse APIConnection::voice_assistant_get_configuration(
-    const VoiceAssistantConfigurationRequest &msg) {
-  VoiceAssistantConfigurationResponse resp;
-  if (voice_assistant::global_voice_assistant != nullptr) {
-    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
-      return resp;
-    }
-
-    auto &config = voice_assistant::global_voice_assistant->get_configuration();
-    for (auto &wake_word : config.available_wake_words) {
-      VoiceAssistantWakeWord resp_wake_word;
-      resp_wake_word.id = wake_word.id;
-      resp_wake_word.wake_word = wake_word.wake_word;
-      for (const auto &lang : wake_word.trained_languages) {
-        resp_wake_word.trained_languages.push_back(lang);
-      }
-      resp.available_wake_words.push_back(std::move(resp_wake_word));
-    }
-    resp.max_active_wake_words = config.max_active_wake_words;
-  }
-  return resp;
-}
-
-void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
-  if (voice_assistant::global_voice_assistant != nullptr) {
-    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
-      return;
-    }
-
-    voice_assistant::global_voice_assistant->on_set_configuration(msg.active_wake_words);
-  }
-}
-
 #endif
 
 #ifdef USE_ALARM_CONTROL_PANEL

esphome/components/api/api_connection.h

@@ -152,9 +152,6 @@ class APIConnection : public APIServerConnection {
   void on_voice_assistant_audio(const VoiceAssistantAudio &msg) override;
   void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg) override;
   void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) override;
-  VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
-      const VoiceAssistantConfigurationRequest &msg) override;
-  void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
 #endif
 
 #ifdef USE_ALARM_CONTROL_PANEL

esphome/components/api/api_pb2.cpp

@@ -5149,10 +5149,6 @@ bool MediaPlayerSupportedFormat::decode_varint(uint32_t field_id, ProtoVarInt va
       this->purpose = value.as_enum<enums::MediaPlayerFormatPurpose>();
       return true;
     }
-    case 5: {
-      this->sample_bytes = value.as_uint32();
-      return true;
-    }
     default:
       return false;
   }
@@ -5172,7 +5168,6 @@ void MediaPlayerSupportedFormat::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_uint32(2, this->sample_rate);
   buffer.encode_uint32(3, this->num_channels);
   buffer.encode_enum<enums::MediaPlayerFormatPurpose>(4, this->purpose);
-  buffer.encode_uint32(5, this->sample_bytes);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
@@ -5195,11 +5190,6 @@ void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
   out.append("  purpose: ");
   out.append(proto_enum_to_string<enums::MediaPlayerFormatPurpose>(this->purpose));
   out.append("\n");
-
-  out.append("  sample_bytes: ");
-  sprintf(buffer, "%" PRIu32, this->sample_bytes);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -7124,140 +7114,6 @@ void VoiceAssistantAnnounceFinished::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool VoiceAssistantWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->id = value.as_string();
-      return true;
-    }
-    case 2: {
-      this->wake_word = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->trained_languages.push_back(value.as_string());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantWakeWord::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->id);
-  buffer.encode_string(2, this->wake_word);
-  for (auto &it : this->trained_languages) {
-    buffer.encode_string(3, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantWakeWord::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantWakeWord {\n");
-  out.append("  id: ");
-  out.append("'").append(this->id).append("'");
-  out.append("\n");
-
-  out.append("  wake_word: ");
-  out.append("'").append(this->wake_word).append("'");
-  out.append("\n");
-
-  for (const auto &it : this->trained_languages) {
-    out.append("  trained_languages: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
-void VoiceAssistantConfigurationRequest::encode(ProtoWriteBuffer buffer) const {}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantConfigurationRequest::dump_to(std::string &out) const {
-  out.append("VoiceAssistantConfigurationRequest {}");
-}
-#endif
-bool VoiceAssistantConfigurationResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 3: {
-      this->max_active_wake_words = value.as_uint32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool VoiceAssistantConfigurationResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->available_wake_words.push_back(value.as_message<VoiceAssistantWakeWord>());
-      return true;
-    }
-    case 2: {
-      this->active_wake_words.push_back(value.as_string());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantConfigurationResponse::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->available_wake_words) {
-    buffer.encode_message<VoiceAssistantWakeWord>(1, it, true);
-  }
-  for (auto &it : this->active_wake_words) {
-    buffer.encode_string(2, it, true);
-  }
-  buffer.encode_uint32(3, this->max_active_wake_words);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantConfigurationResponse {\n");
-  for (const auto &it : this->available_wake_words) {
-    out.append("  available_wake_words: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-
-  for (const auto &it : this->active_wake_words) {
-    out.append("  active_wake_words: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-
-  out.append("  max_active_wake_words: ");
-  sprintf(buffer, "%" PRIu32, this->max_active_wake_words);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool VoiceAssistantSetConfiguration::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->active_wake_words.push_back(value.as_string());
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void VoiceAssistantSetConfiguration::encode(ProtoWriteBuffer buffer) const {
-  for (auto &it : this->active_wake_words) {
-    buffer.encode_string(1, it, true);
-  }
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void VoiceAssistantSetConfiguration::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
-  out.append("VoiceAssistantSetConfiguration {\n");
-  for (const auto &it : this->active_wake_words) {
-    out.append("  active_wake_words: ");
-    out.append("'").append(it).append("'");
-    out.append("\n");
-  }
-  out.append("}");
-}
-#endif
 bool ListEntitiesAlarmControlPanelResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 6: {

esphome/components/api/api_pb2.h

@@ -1277,7 +1277,6 @@ class MediaPlayerSupportedFormat : public ProtoMessage {
   uint32_t sample_rate{0};
   uint32_t num_channels{0};
   enums::MediaPlayerFormatPurpose purpose{};
-  uint32_t sample_bytes{0};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1849,53 +1848,6 @@ class VoiceAssistantAnnounceFinished : public ProtoMessage {
  protected:
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class VoiceAssistantWakeWord : public ProtoMessage {
- public:
-  std::string id{};
-  std::string wake_word{};
-  std::vector<std::string> trained_languages{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-};
-class VoiceAssistantConfigurationRequest : public ProtoMessage {
- public:
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-};
-class VoiceAssistantConfigurationResponse : public ProtoMessage {
- public:
-  std::vector<VoiceAssistantWakeWord> available_wake_words{};
-  std::vector<std::string> active_wake_words{};
-  uint32_t max_active_wake_words{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class VoiceAssistantSetConfiguration : public ProtoMessage {
- public:
-  std::vector<std::string> active_wake_words{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-};
 class ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
  public:
   std::string object_id{};

esphome/components/api/api_pb2_service.cpp

@@ -496,19 +496,6 @@ bool APIServerConnectionBase::send_voice_assistant_announce_finished(const Voice
   return this->send_message_<VoiceAssistantAnnounceFinished>(msg, 120);
 }
 #endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
-#ifdef USE_VOICE_ASSISTANT
-bool APIServerConnectionBase::send_voice_assistant_configuration_response(
-    const VoiceAssistantConfigurationResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_voice_assistant_configuration_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<VoiceAssistantConfigurationResponse>(msg, 122);
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool APIServerConnectionBase::send_list_entities_alarm_control_panel_response(
     const ListEntitiesAlarmControlPanelResponse &msg) {
@@ -1169,28 +1156,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_voice_assistant_announce_request: %s", msg.dump().c_str());
 #endif
       this->on_voice_assistant_announce_request(msg);
-#endif
-      break;
-    }
-    case 121: {
-#ifdef USE_VOICE_ASSISTANT
-      VoiceAssistantConfigurationRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_voice_assistant_configuration_request: %s", msg.dump().c_str());
-#endif
-      this->on_voice_assistant_configuration_request(msg);
-#endif
-      break;
-    }
-    case 123: {
-#ifdef USE_VOICE_ASSISTANT
-      VoiceAssistantSetConfiguration msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_voice_assistant_set_configuration: %s", msg.dump().c_str());
-#endif
-      this->on_voice_assistant_set_configuration(msg);
 #endif
       break;
     }
@@ -1681,35 +1646,6 @@ void APIServerConnection::on_subscribe_voice_assistant_request(const SubscribeVo
   this->subscribe_voice_assistant(msg);
 }
 #endif
-#ifdef USE_VOICE_ASSISTANT
-void APIServerConnection::on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  VoiceAssistantConfigurationResponse ret = this->voice_assistant_get_configuration(msg);
-  if (!this->send_voice_assistant_configuration_response(ret)) {
-    this->on_fatal_error();
-  }
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-void APIServerConnection::on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->voice_assistant_set_configuration(msg);
-}
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
 void APIServerConnection::on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) {
   if (!this->is_connection_setup()) {

esphome/components/api/api_pb2_service.h

@@ -253,15 +253,6 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_VOICE_ASSISTANT
   bool send_voice_assistant_announce_finished(const VoiceAssistantAnnounceFinished &msg);
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &value){};
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  bool send_voice_assistant_configuration_response(const VoiceAssistantConfigurationResponse &msg);
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &value){};
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
   bool send_list_entities_alarm_control_panel_response(const ListEntitiesAlarmControlPanelResponse &msg);
 #endif
@@ -434,13 +425,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_VOICE_ASSISTANT
   virtual void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) = 0;
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual VoiceAssistantConfigurationResponse voice_assistant_get_configuration(
-      const VoiceAssistantConfigurationRequest &msg) = 0;
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  virtual void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) = 0;
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
   virtual void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) = 0;
 #endif
@@ -542,12 +526,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_VOICE_ASSISTANT
   void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) override;
 #endif
-#ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) override;
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
-#endif
 #ifdef USE_ALARM_CONTROL_PANEL
   void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) override;
 #endif

esphome/components/ble_presence/binary_sensor.py

@@ -41,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
             cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
-            cv.Optional(CONF_IBEACON_UUID): esp32_ble_tracker.bt_uuid,
+            cv.Optional(CONF_IBEACON_UUID): cv.uuid,
             cv.Optional(CONF_TIMEOUT, default="5min"): cv.positive_time_period,
             cv.Optional(CONF_MIN_RSSI): cv.All(
                 cv.decibel, cv.int_range(min=-100, max=-30)
@@ -83,7 +83,7 @@ async def to_code(config):
             cg.add(var.set_service_uuid128(uuid128))
 
     if ibeacon_uuid := config.get(CONF_IBEACON_UUID):
-        ibeacon_uuid = esp32_ble_tracker.as_reversed_hex_array(ibeacon_uuid)
+        ibeacon_uuid = esp32_ble_tracker.as_hex_array(str(ibeacon_uuid))
         cg.add(var.set_ibeacon_uuid(ibeacon_uuid))
 
         if (ibeacon_major := config.get(CONF_IBEACON_MAJOR)) is not None:

esphome/components/esp32_ble/ble_uuid.cpp

@@ -31,13 +31,6 @@ ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
   memcpy(ret.uuid_.uuid.uuid128, data, ESP_UUID_LEN_128);
   return ret;
 }
-ESPBTUUID ESPBTUUID::from_raw_reversed(const uint8_t *data) {
-  ESPBTUUID ret;
-  ret.uuid_.len = ESP_UUID_LEN_128;
-  for (int i = 0; i < ESP_UUID_LEN_128; i++)
-    ret.uuid_.uuid.uuid128[ESP_UUID_LEN_128 - 1 - i] = data[i];
-  return ret;
-}
 ESPBTUUID ESPBTUUID::from_raw(const std::string &data) {
   ESPBTUUID ret;
   if (data.length() == 4) {

esphome/components/esp32_ble/ble_uuid.h

@@ -20,7 +20,6 @@ class ESPBTUUID {
   static ESPBTUUID from_uint32(uint32_t uuid);
 
   static ESPBTUUID from_raw(const uint8_t *data);
-  static ESPBTUUID from_raw_reversed(const uint8_t *data);
 
   static ESPBTUUID from_raw(const std::string &data);
 

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -462,16 +462,14 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
     ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_string().c_str());
   }
   for (auto &data : this->manufacturer_datas_) {
-    auto ibeacon = ESPBLEiBeacon::from_manufacturer_data(data);
-    if (ibeacon.has_value()) {
-      ESP_LOGVV(TAG, "  Manufacturer iBeacon:");
-      ESP_LOGVV(TAG, "    UUID: %s", ibeacon.value().get_uuid().to_string().c_str());
-      ESP_LOGVV(TAG, "    Major: %u", ibeacon.value().get_major());
-      ESP_LOGVV(TAG, "    Minor: %u", ibeacon.value().get_minor());
-      ESP_LOGVV(TAG, "    TXPower: %d", ibeacon.value().get_signal_power());
-    } else {
-      ESP_LOGVV(TAG, "  Manufacturer ID: %s, data: %s", data.uuid.to_string().c_str(),
-                format_hex_pretty(data.data).c_str());
+    ESP_LOGVV(TAG, "  Manufacturer data: %s", format_hex_pretty(data.data).c_str());
+    if (this->get_ibeacon().has_value()) {
+      auto ibeacon = this->get_ibeacon().value();
+      ESP_LOGVV(TAG, "    iBeacon data:");
+      ESP_LOGVV(TAG, "      UUID: %s", ibeacon.get_uuid().to_string().c_str());
+      ESP_LOGVV(TAG, "      Major: %u", ibeacon.get_major());
+      ESP_LOGVV(TAG, "      Minor: %u", ibeacon.get_minor());
+      ESP_LOGVV(TAG, "      TXPower: %d", ibeacon.get_signal_power());
     }
   }
   for (auto &data : this->service_datas_) {
@@ -480,7 +478,7 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
     ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty(data.data).c_str());
   }
 
-  ESP_LOGVV(TAG, "  Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
+  ESP_LOGVV(TAG, "Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {

esphome/components/esp32_ble_tracker/esp32_ble_tracker.h

@@ -44,10 +44,10 @@ class ESPBLEiBeacon {
   ESPBLEiBeacon(const uint8_t *data);
   static optional<ESPBLEiBeacon> from_manufacturer_data(const ServiceData &data);
 
-  uint16_t get_major() { return byteswap(this->beacon_data_.major); }
-  uint16_t get_minor() { return byteswap(this->beacon_data_.minor); }
+  uint16_t get_major() { return ((this->beacon_data_.major & 0xFF) << 8) | (this->beacon_data_.major >> 8); }
+  uint16_t get_minor() { return ((this->beacon_data_.minor & 0xFF) << 8) | (this->beacon_data_.minor >> 8); }
   int8_t get_signal_power() { return this->beacon_data_.signal_power; }
-  ESPBTUUID get_uuid() { return ESPBTUUID::from_raw_reversed(this->beacon_data_.proximity_uuid); }
+  ESPBTUUID get_uuid() { return ESPBTUUID::from_raw(this->beacon_data_.proximity_uuid); }
 
  protected:
   struct {

esphome/components/media_player/media_player.h

@@ -37,7 +37,6 @@ struct MediaPlayerSupportedFormat {
   uint32_t sample_rate;
   uint32_t num_channels;
   MediaPlayerFormatPurpose purpose;
-  uint32_t sample_bytes;
 };
 
 class MediaPlayer;

esphome/components/voice_assistant/voice_assistant.cpp

@@ -755,7 +755,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
           message = std::move(arg.value);
         }
       }
-      if (code == "wake-word-timeout" || code == "wake_word_detection_aborted" || code == "no_wake_word") {
+      if (code == "wake-word-timeout" || code == "wake_word_detection_aborted") {
         // Don't change state here since either the "tts-end" or "run-end" events will do it.
         return;
       } else if (code == "wake-provider-missing" || code == "wake-engine-missing") {

esphome/components/voice_assistant/voice_assistant.h

@@ -77,18 +77,6 @@ struct Timer {
   }
 };
 
-struct WakeWord {
-  std::string id;
-  std::string wake_word;
-  std::vector<std::string> trained_languages;
-};
-
-struct Configuration {
-  std::vector<WakeWord> available_wake_words;
-  std::vector<std::string> active_wake_words;
-  uint32_t max_active_wake_words;
-};
-
 class VoiceAssistant : public Component {
  public:
   void setup() override;
@@ -145,8 +133,6 @@ class VoiceAssistant : public Component {
   void on_audio(const api::VoiceAssistantAudio &msg);
   void on_timer_event(const api::VoiceAssistantTimerEventResponse &msg);
   void on_announce(const api::VoiceAssistantAnnounceRequest &msg);
-  void on_set_configuration(const std::vector<std::string> &active_wake_words){};
-  const Configuration &get_configuration() { return this->config_; };
 
   bool is_running() const { return this->state_ != State::IDLE; }
   void set_continuous(bool continuous) { this->continuous_ = continuous; }
@@ -293,8 +279,6 @@ class VoiceAssistant : public Component {
   AudioMode audio_mode_{AUDIO_MODE_UDP};
   bool udp_socket_running_{false};
   bool start_udp_socket_();
-
-  Configuration config_{};
 };
 
 template<typename... Ts> class StartAction : public Action<Ts...>, public Parented<VoiceAssistant> {

esphome/const.py

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

esphome/core/config.py

@@ -100,6 +100,9 @@ def valid_include(value):
 def valid_project_name(value: str):
     if value.count(".") != 1:
         raise cv.Invalid("project name needs to have a namespace")
+
+    value = value.replace(" ", "_")
+
     return value
 
 

{esphome-2024.9.0.dist-info → esphome-2024.9.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esphome
-Version: 2024.9.0
+Version: 2024.9.0b1
 Summary: Make creating custom firmwares for ESP32/ESP8266 super easy.
 Author-email: The ESPHome Authors <esphome@nabucasa.com>
 License: MIT

{esphome-2024.9.0.dist-info → esphome-2024.9.0b1.dist-info}/RECORD

@@ -5,7 +5,7 @@ esphome/codegen.py,sha256=GePHUM7xdXb_Pil59SHVsXg2F4VBPgkH-Fz2PDX8Z54,1873
 esphome/config.py,sha256=ArMupdqCpKqQm-vFWb85HueI88DAfYTjuhR6mA691DI,39614
 esphome/config_helpers.py,sha256=MKf_wzO35nn41FvigXE0iYKDslPgL2ruf8R-EPtTT2I,3256
 esphome/config_validation.py,sha256=8EJWDk3JRqPE6eXXL_u6sSPvlRWLHYTIXb6MfsEriW0,66190
-esphome/const.py,sha256=IpfqhzjgG_TpYWfKCNeOgL0j5g_i1w7fnprjLCiXaWM,39687
+esphome/const.py,sha256=GbxZB_gT5N6GQ3ps3R3iWrSn2bcAbI0bsDGx-HcVv1U,39689
 esphome/coroutine.py,sha256=j_14z8dIIzIBeuNO30D4c1RJvMMt1xZFZ58Evd-EvJA,9344
 esphome/cpp_generator.py,sha256=lXPXHYUsFIvBSAoZ93mXYlGcXYg5L18nTtYGHE4_rr8,31203
 esphome/cpp_helpers.py,sha256=6C2vNbOIhZKi43xRVlk5hp9GfshfBn-rc5D_ZFUEYaE,4801
@@ -173,15 +173,15 @@ esphome/components/apds9960/apds9960.h,sha256=oFrXPQrPDS16gNSVdN1n6SKuvjwc9LdvpK
 esphome/components/apds9960/binary_sensor.py,sha256=DcfxkwZFvgmOU3C_gVSfZOpJ-EZlZXMd0gHnAUnxxCs,786
 esphome/components/apds9960/sensor.py,sha256=HoGfwl7WqJkpKI7BjeM1alXPcppdWVRrWwFzrZ0ISAo,871
 esphome/components/api/__init__.py,sha256=grnorxG9QG00eQwcIsiijno_o_JS6xKzOitqLS1DkXg,9895
-esphome/components/api/api_connection.cpp,sha256=iaN0Hr26xHjaMyvWrfWUuFJ6or43td4Y-Hrbb0WW6DU,58827
-esphome/components/api/api_connection.h,sha256=TzVix_TjCGRcXJ5yvkM7-ZVWYec5SAmzKhZFEsrxmiw,10648
+esphome/components/api/api_connection.cpp,sha256=kCxMbK72NJvYdPmj8k7L4IYOv5fTlxfTQp3rUOUvkWk,57490
+esphome/components/api/api_connection.h,sha256=iuCMJTKXOziKjWTSkidOyh8Yh7uEpEVdxSFOxPaFE08,10418
 esphome/components/api/api_frame_helper.cpp,sha256=-K3JLxUJ3gKpxVzJwOAwlCvlwl7C7VTgQWhpHlhzgd0,32998
 esphome/components/api/api_frame_helper.h,sha256=c1ET5DyoWNtdEkxLCVmyfyA8ZASBv9iAA24I5mtmnzA,5522
 esphome/components/api/api_noise_context.h,sha256=0i3J3wchJitnQBTJeQm1380t0duhsz7WxJDrlUBF8mE,405
-esphome/components/api/api_pb2.cpp,sha256=cPTrbhVar99mgyggNjv0vIu4rg0-LMZzd0WGZPvdPkQ,245524
-esphome/components/api/api_pb2.h,sha256=sTeQ5zL0_Ncs4GvxizY-B5kPevCLqJ9tuU9tMX69FgY,70507
-esphome/components/api/api_pb2_service.cpp,sha256=xYIanFE-N_3LRJgp-1_5Ey88_BMlYZao1QjztZEaNPo,53963
-esphome/components/api/api_pb2_service.h,sha256=XgdMInOdOxFQZ0X7EDt8rQWX9Z0TSS2LDWsga5vNckg,22581
+esphome/components/api/api_pb2.cpp,sha256=s2zkb8VgiLbIobbMOJUVGt4xsq5obKwKp6P2BT5_1og,241306
+esphome/components/api/api_pb2.h,sha256=Ix4i56SescULD98D_vEfXV91sz236yFneoZIdtgxLUU,68977
+esphome/components/api/api_pb2_service.cpp,sha256=Qmuo3Aa7FVjOA2z3Y8EOP0SwGphw_-nT7pNqTKetTNc,51970
+esphome/components/api/api_pb2_service.h,sha256=uavT9B8kn3p-Q1fVGIoLGAh3xdpzhQM1zYF09gfstdE,21597
 esphome/components/api/api_server.cpp,sha256=imCfdE_CkAWw9nnOPiA8QsyoSQyHx6jQcNbKvYRDzZc,11286
 esphome/components/api/api_server.h,sha256=BokLEuG9sMLC-TSUR7tCQn2NonL_mJ9E6gdr2wYrQLg,5304
 esphome/components/api/client.py,sha256=UOxu9LsM1fprWq6TmSbSEkvD0mSZjJFVXZxXllMPt8s,1775
@@ -336,7 +336,7 @@ esphome/components/ble_client/text_sensor/automation.h,sha256=OCbnb9y1crqjzfy-4K
 esphome/components/ble_client/text_sensor/ble_text_sensor.cpp,sha256=oVGnE8A_zow1Dl1GaLs1ZFfgo0qNieNJIMxrmKtn61Y,4861
 esphome/components/ble_client/text_sensor/ble_text_sensor.h,sha256=NpCmxNNxJUaM9iz7gX6Fwdu-6vgHoMiXXWQGrha8Vxk,2018
 esphome/components/ble_presence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-esphome/components/ble_presence/binary_sensor.py,sha256=L6YQsfP-QhB7GnouCNHCpdnbSY7h2jn0TrwPSMet-DE,3437
+esphome/components/ble_presence/binary_sensor.py,sha256=2MFciM8F51fPWHsJfc1IfyUOyjJT10YYmJrL6Y5vUxQ,3415
 esphome/components/ble_presence/ble_presence_device.cpp,sha256=bCNNQrzNbYexs2xMSxskyE8biYNHQ0_vsmdEAv0f7wk,325
 esphome/components/ble_presence/ble_presence_device.h,sha256=f9iWhtLuVqEg3HdG3vn6bYET56xj4DVrML861banlvg,4040
 esphome/components/ble_rssi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -769,8 +769,8 @@ esphome/components/esp32_ble/ble.h,sha256=5u4PxcvcOk5tpO_nv2f6fB68BfTf2Zuv1PPH_v
 esphome/components/esp32_ble/ble_advertising.cpp,sha256=nWetDKFwcdhyaqRyq8KKmsFctLEF-4Bw81QPYHmxi24,6039
 esphome/components/esp32_ble/ble_advertising.h,sha256=dLksw168KS1wh3_X7GhesS9nacINphlZUl4nMgYSA8M,1480
 esphome/components/esp32_ble/ble_event.h,sha256=ED5C_SrTybqtu30vevlPr8NBsBUVKK6MSVC9UzwspHc,2771
-esphome/components/esp32_ble/ble_uuid.cpp,sha256=k-txBt8lIMT8fgtBkKcRT94NrEuU57-rBSCE-lcp0Tw,6077
-esphome/components/esp32_ble/ble_uuid.h,sha256=K7SoC6fQB7u_FQc4u__crSBLhxpCezc75uO7JFfaX7E,916
+esphome/components/esp32_ble/ble_uuid.cpp,sha256=B_EzwLTVdJN0Yqqbu_MnFZODRG_wHOHHYzm4m1OHVaU,5837
+esphome/components/esp32_ble/ble_uuid.h,sha256=dwiOniSDlOHF7Yz7O_f7IFzPc8VCXMFljDjPONQ6oJo,857
 esphome/components/esp32_ble/const_esp32c6.h,sha256=-PzjJqEK5QC52OEPtsjKPAlyv1Tr5lJnm4_-RuGSPyc,3123
 esphome/components/esp32_ble/queue.h,sha256=Y-wl0zLEas9TSEUIbRMqE_uCr6CEQvdk_24oNU9MYVo,1141
 esphome/components/esp32_ble_beacon/__init__.py,sha256=X8ovDDVUexlT_UM9OiXWzB6mgGgayA2MdOIix67yoZg,3174
@@ -799,8 +799,8 @@ esphome/components/esp32_ble_server/ble_service.cpp,sha256=zs-xQT9ISP8hn40DoL3k9
 esphome/components/esp32_ble_server/ble_service.h,sha256=MTQ1FsfwMgDoDiLNo0RqPObE8b9sE4NcCSVxlmR49v8,2328
 esphome/components/esp32_ble_tracker/__init__.py,sha256=Sgr8LKTUWh5nC2bh_iKNlQQZY7GSRr5FLG2QxI-piaY,12362
 esphome/components/esp32_ble_tracker/automation.h,sha256=0pDA6EX__f14sT0KJwcnqg7UOsueKjjegHPznQj9biw,3795
-esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp,sha256=x0e81DwrOvBl9RSryR-i9ASagHE9m2qBuPSzEIfn7fY,26439
-esphome/components/esp32_ble_tracker/esp32_ble_tracker.h,sha256=20CmxJv8NhxH5bDKvhkAkiuObByaj6sOJq-BiNROhmE,8842
+esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp,sha256=8onqXeXMzyfcKcgFjqxh6eqv9fXxeacEDnlL7YgJTrk,26335
+esphome/components/esp32_ble_tracker/esp32_ble_tracker.h,sha256=D2Tl9kmxM5NclVzxjcHR-th2_CfEvEvZXiGGNc0Bv98,8913
 esphome/components/esp32_camera/__init__.py,sha256=qhJ3Jgv1gum3m8kfkOFZLK7TLNsbuHZxIrqxBb11mz0,12649
 esphome/components/esp32_camera/esp32_camera.cpp,sha256=Ba2nu453rF4FDSlIJwD5sLnzE8ru4kKK4xVCvMdoyac,16960
 esphome/components/esp32_camera/esp32_camera.h,sha256=3-MKRSBcjDgI3I0uKmt0bGSfp2t6B85Zsjr06tmpa9Q,7590
@@ -1602,7 +1602,7 @@ esphome/components/mdns/mdns_rp2040.cpp,sha256=AzSFWtVJtq2dA9wJIFkvZvk8r_7oYbdFV
 esphome/components/media_player/__init__.py,sha256=5tWKlPTnq8sr0ObnedsntJyfQZRUC8yTUc7Jyk2pcH0,6830
 esphome/components/media_player/automation.h,sha256=jq0TR0-YX9xnyZrdXBaFTUFplrruF-eqWQpfC0TUBYU,2995
 esphome/components/media_player/media_player.cpp,sha256=bJSxcKtsju4xZie-u89yADZavHYx9hiKaUWt-C-BBmk,3938
-esphome/components/media_player/media_player.h,sha256=8NMfzWbDQqo64pK5QPiTggo0BIN6hPRgiQgLFEVXcOY,3069
+esphome/components/media_player/media_player.h,sha256=ysqBAMrWGejUl3dMTTDUqsRfgtREjrYFuXyLhyTnPhs,3044
 esphome/components/mhz19/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esphome/components/mhz19/mhz19.cpp,sha256=CBBVBMqGUsrc-4PMOaBDuKCAFNr43Kukt3a018kQI0k,3924
 esphome/components/mhz19/mhz19.h,sha256=DTuwpBz6gAZVn_QIUnmPiE4Y188XYiOS9WxIggcjZJ4,2050
@@ -2991,8 +2991,8 @@ esphome/components/vl53l0x/sensor.py,sha256=P8rWgRSOAQO-kAn35UC2I2_UwmYKUWS3DvYD
 esphome/components/vl53l0x/vl53l0x_sensor.cpp,sha256=JqSIf9jjNhin561LU-QzAmRKEK0PqQ8CuLO2mn380og,15017
 esphome/components/vl53l0x/vl53l0x_sensor.h,sha256=iTtScB2O7DVFh0eR9AVht2l3AdSAPJOVMtflTv2ZX7c,2561
 esphome/components/voice_assistant/__init__.py,sha256=mMd2eklOnmvpDJLjzr1nIUS6iXIWjHi6mmlGDs7iV1M,13826
-esphome/components/voice_assistant/voice_assistant.cpp,sha256=aVJEIdRAtZa3RQon_sb76UfUKgNwBtRghQLEt8QxLZ4,29613
-esphome/components/voice_assistant/voice_assistant.h,sha256=0nwW6Jzad0JU3L-On3FbUa5VmHy1jmTHhyn3FvQSJxM,11648
+esphome/components/voice_assistant/voice_assistant.cpp,sha256=3PGG9hwvPzFwePMxeZS8NOu7KrvnxR48uN5ywoPqD94,29587
+esphome/components/voice_assistant/voice_assistant.h,sha256=SC4EW1MBdyjBJWyh06XBgGzr7bP3goD204_DQzUJRAU,11204
 esphome/components/voltage_sampler/__init__.py,sha256=IU5YrROZSNyuAP1d6M_V3ZGAwNjXCHPcVy5nMjZ953Y,155
 esphome/components/voltage_sampler/voltage_sampler.h,sha256=Y67FLOpOzW29v29BRRyYgEmGZ_B8QnUUaqJMH6FA3jM,337
 esphome/components/wake_on_lan/__init__.py,sha256=-RYpXD02o3dlFnKzOCYk58bUbxfD2v-wj1ECywj-cgI,50
@@ -3213,7 +3213,7 @@ esphome/core/component.cpp,sha256=Uea5Hkm0E9yJMJYnrbLFFVpdcBZgaWSxfAiwcyGKByA,93
 esphome/core/component.h,sha256=U4m8_g9gSBBIjRNw4k36entP2JcA6F3SsWbwty_hKdo,11744
 esphome/core/component_iterator.cpp,sha256=TUu2K34ATYa1Qyf2s-sZJBksAiFIGj3egzbDKPuFtTQ,11117
 esphome/core/component_iterator.h,sha256=cjacKgRrlxl-VwPOysfBJZNK0NMzcc-w9xXn82m5dYc,3599
-esphome/core/config.py,sha256=gGGU5EI6FJkVGk4N4uP9MdRPct8b9n49Q6P7jGJHBbw,14511
+esphome/core/config.py,sha256=cIyIQzLLMKGr6milcT69-YPNVhehNzw2Tu311-MLGwo,14549
 esphome/core/controller.cpp,sha256=feO4yH0GETNCqi9MTZEtsOaoo-CPV2rM9S7UfQXY6Ew,4553
 esphome/core/controller.h,sha256=PXCcMqYpq0xjFCdlOKv6WuYlcETnB4sq3UQWdOTt9PU,3720
 esphome/core/datatypes.h,sha256=wN8xro8vqXT13w9KvVOXeQfBwlI_WQZ6uFaIGyub67E,2114
@@ -3260,9 +3260,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-2024.9.0.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
-esphome-2024.9.0.dist-info/METADATA,sha256=-goooB6AsPI4f-niKeJ6k3xI_JCtYql0nTptAhGfPJQ,3263
-esphome-2024.9.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-esphome-2024.9.0.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
-esphome-2024.9.0.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
-esphome-2024.9.0.dist-info/RECORD,,
+esphome-2024.9.0b1.dist-info/LICENSE,sha256=HzEjkBInJe44L4WvAOPfhPJJDNj6YbnqFyvGWRzArGM,36664
+esphome-2024.9.0b1.dist-info/METADATA,sha256=kji5jh5Jeh8tmPSkGQMVSu26BMcdaH3FC6h9l5E2G3U,3265
+esphome-2024.9.0b1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+esphome-2024.9.0b1.dist-info/entry_points.txt,sha256=mIxVNuWtbYzeEcaWCl-AQ-97aBOWbnYBAK8nbF6P4M0,50
+esphome-2024.9.0b1.dist-info/top_level.txt,sha256=0GSXEW3cnITpgG3qnsSMz0qoqJHAFyfw7Y8MVtEf1Yk,8
+esphome-2024.9.0b1.dist-info/RECORD,,