From e385f87d6cee52d2aa29774e7ed842affca4e6b9 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 30 Jun 2025 12:46:47 -0500 Subject: [PATCH] move more --- esphome/components/http_request/ota/__init__.py | 4 +++- esphome/components/ota/__init__.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/esphome/components/http_request/ota/__init__.py b/esphome/components/http_request/ota/__init__.py index a1c9dba455..d3a54c699b 100644 --- a/esphome/components/http_request/ota/__init__.py +++ b/esphome/components/http_request/ota/__init__.py @@ -1,7 +1,6 @@ from esphome import automation import esphome.codegen as cg from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code -from esphome.components.ota_base import OTAComponent import esphome.config_validation as cv from esphome.const import CONF_ID, CONF_PASSWORD, CONF_URL, CONF_USERNAME from esphome.core import coroutine_with_priority @@ -16,6 +15,9 @@ DEPENDENCIES = ["network", "http_request"] CONF_MD5 = "md5" CONF_MD5_URL = "md5_url" +ota_base_ns = cg.esphome_ns.namespace("ota_base") +OTAComponent = ota_base_ns.class_("OTAComponent", cg.Component) + OtaHttpRequestComponent = http_request_ns.class_( "OtaHttpRequestComponent", OTAComponent ) diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py index 1fa9bfa410..2ac09607be 100644 --- a/esphome/components/ota/__init__.py +++ b/esphome/components/ota/__init__.py @@ -1,6 +1,5 @@ from esphome import automation import esphome.codegen as cg -from esphome.components.ota_base import OTAState import esphome.config_validation as cv from esphome.const import ( CONF_ESPHOME, @@ -11,6 +10,8 @@ from esphome.const import ( ) from esphome.core import coroutine_with_priority +from ..ota_base import OTAState + CODEOWNERS = ["@esphome/core"] AUTO_LOAD = ["safe_mode", "ota_base"] @@ -24,7 +25,6 @@ CONF_ON_STATE_CHANGE = "on_state_change" ota_ns = cg.esphome_ns.namespace("ota") -# OTAComponent and OTAState are imported from ota_base OTAAbortTrigger = ota_ns.class_("OTAAbortTrigger", automation.Trigger.template()) OTAEndTrigger = ota_ns.class_("OTAEndTrigger", automation.Trigger.template()) OTAErrorTrigger = ota_ns.class_("OTAErrorTrigger", automation.Trigger.template())