From c719b7203cd5e269479a66b15bf18e46aa20b076 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 28 Apr 2024 21:11:16 -0500
Subject: [PATCH] Move automations to `automation.h`, remove `network`
 dependency

---
 esphome/components/ota/__init__.py   |  1 -
 esphome/components/ota/automation.h  | 67 ++++++++++++++++++++++++++++
 esphome/components/ota/ota_backend.h | 62 -------------------------
 3 files changed, 67 insertions(+), 63 deletions(-)
 create mode 100644 esphome/components/ota/automation.h

diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 719f25082f..94ba199788 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -6,7 +6,6 @@ from esphome.const import CONF_ESPHOME, CONF_OTA, CONF_PLATFORM, CONF_TRIGGER_ID
 
 CODEOWNERS = ["@esphome/core"]
 AUTO_LOAD = ["md5"]
-DEPENDENCIES = ["network"]
 
 IS_PLATFORM_COMPONENT = True
 
diff --git a/esphome/components/ota/automation.h b/esphome/components/ota/automation.h
new file mode 100644
index 0000000000..91ec123010
--- /dev/null
+++ b/esphome/components/ota/automation.h
@@ -0,0 +1,67 @@
+#pragma once
+#ifdef USE_OTA_STATE_CALLBACK
+#include "ota_backend.h"
+
+#include "esphome/core/automation.h"
+
+namespace esphome {
+namespace ota {
+
+class OTAStateChangeTrigger : public Trigger<OTAState> {
+ public:
+  explicit OTAStateChangeTrigger(OTAComponent *parent) {
+    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
+      if (!parent->is_failed()) {
+        return trigger(state);
+      }
+    });
+  }
+};
+
+class OTAStartTrigger : public Trigger<> {
+ public:
+  explicit OTAStartTrigger(OTAComponent *parent) {
+    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
+      if (state == OTA_STARTED && !parent->is_failed()) {
+        trigger();
+      }
+    });
+  }
+};
+
+class OTAProgressTrigger : public Trigger<float> {
+ public:
+  explicit OTAProgressTrigger(OTAComponent *parent) {
+    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
+      if (state == OTA_IN_PROGRESS && !parent->is_failed()) {
+        trigger(progress);
+      }
+    });
+  }
+};
+
+class OTAEndTrigger : public Trigger<> {
+ public:
+  explicit OTAEndTrigger(OTAComponent *parent) {
+    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
+      if (state == OTA_COMPLETED && !parent->is_failed()) {
+        trigger();
+      }
+    });
+  }
+};
+
+class OTAErrorTrigger : public Trigger<uint8_t> {
+ public:
+  explicit OTAErrorTrigger(OTAComponent *parent) {
+    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
+      if (state == OTA_ERROR && !parent->is_failed()) {
+        trigger(error);
+      }
+    });
+  }
+};
+
+}  // namespace ota
+}  // namespace esphome
+#endif
diff --git a/esphome/components/ota/ota_backend.h b/esphome/components/ota/ota_backend.h
index 9f2a851f5a..9899d62fab 100644
--- a/esphome/components/ota/ota_backend.h
+++ b/esphome/components/ota/ota_backend.h
@@ -65,67 +65,5 @@ class OTAComponent : public Component {
 };
 
 std::unique_ptr<ota::OTABackend> make_ota_backend();
-
-///
-/// Automations
-///
-
-#ifdef USE_OTA_STATE_CALLBACK
-class OTAStateChangeTrigger : public Trigger<OTAState> {
- public:
-  explicit OTAStateChangeTrigger(OTAComponent *parent) {
-    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
-      if (!parent->is_failed()) {
-        return trigger(state);
-      }
-    });
-  }
-};
-
-class OTAStartTrigger : public Trigger<> {
- public:
-  explicit OTAStartTrigger(OTAComponent *parent) {
-    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
-      if (state == OTA_STARTED && !parent->is_failed()) {
-        trigger();
-      }
-    });
-  }
-};
-
-class OTAProgressTrigger : public Trigger<float> {
- public:
-  explicit OTAProgressTrigger(OTAComponent *parent) {
-    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
-      if (state == OTA_IN_PROGRESS && !parent->is_failed()) {
-        trigger(progress);
-      }
-    });
-  }
-};
-
-class OTAEndTrigger : public Trigger<> {
- public:
-  explicit OTAEndTrigger(OTAComponent *parent) {
-    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
-      if (state == OTA_COMPLETED && !parent->is_failed()) {
-        trigger();
-      }
-    });
-  }
-};
-
-class OTAErrorTrigger : public Trigger<uint8_t> {
- public:
-  explicit OTAErrorTrigger(OTAComponent *parent) {
-    parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
-      if (state == OTA_ERROR && !parent->is_failed()) {
-        trigger(error);
-      }
-    });
-  }
-};
-#endif
-
 }  // namespace ota
 }  // namespace esphome