diff --git a/haco/button.py b/haco/button.py index 9572d78..d1b1fbb 100644 --- a/haco/button.py +++ b/haco/button.py @@ -1,4 +1,4 @@ -from haco import schema, constants +from haco import schema from haco.control import Control @@ -10,9 +10,8 @@ class Button(Control): return schema.Schema( capabilities=[ schema.Capability( - name=constants.DEFAULT, ha=schema.HomeAssistant(announce_data=schema.AnnounceTopic(key='{io_ha}_topic')), - tamota=None + tasmota=None ) ] ) diff --git a/haco/climate.py b/haco/climate.py index 0387355..e02bf4f 100644 --- a/haco/climate.py +++ b/haco/climate.py @@ -41,18 +41,18 @@ class Climate(Control): Capability( name='current_humidity', ha=None, - tamota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) + tasmota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) ), Capability( name='current_temperature', ha=None, - tamota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) + tasmota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) ), Capability( name='action', type=str, ha=None, - tamota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) + tasmota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) ) ] ) diff --git a/haco/constants.py b/haco/constants.py index 38cbfcc..0c4b0ed 100644 --- a/haco/constants.py +++ b/haco/constants.py @@ -6,7 +6,7 @@ CHARS_ALLOWED = string.ascii_lowercase + string.digits SEPS = '_- /' BRANCH = 'release' -DEFAULT = 'default' +CAPABILITY_DEFAULT = 'default' CONFIGS_PATH = Path(os.environ['HACO_CONFIGS_PATH']) OPTIONS_PATH = Path(os.environ['HACO_OPTIONS_PATH']) diff --git a/haco/control.py b/haco/control.py index a7f5a2f..1a1c49d 100644 --- a/haco/control.py +++ b/haco/control.py @@ -17,9 +17,8 @@ class Control: schema = Schema( capabilities=[ Capability( - name=constants.DEFAULT, ha=HomeAssistant(announce_data=AnnounceTopic(key='{io_ha}_topic')), - tamota=Tasmota(announce_data=AnnounceTopic(key='{io_ha}_topic')) + tasmota=Tasmota(announce_data=AnnounceTopic(key='{io_ha}_topic')) ) ] ) @@ -49,7 +48,7 @@ class Control: def add_callback(self, trigger, function): if (function_name := function.__name__) in {Tasmota.PLATFORM, HomeAssistant.PLATFORM}: - function_name = f'{constants.DEFAULT}_{function_name}' + function_name = f'{constants.CAPABILITY_DEFAULT}_{function_name}' callback_names = self.schema.get_callback_function_names() diff --git a/haco/schema.py b/haco/schema.py index 04002a9..9f8744e 100644 --- a/haco/schema.py +++ b/haco/schema.py @@ -313,13 +313,20 @@ class Default: class Capability: - def __init__(self, name, type=ControlType, tamota: Tasmota = Default, ha: HomeAssistant = Default, alias=None): + def __init__( + self, + name: str = constants.CAPABILITY_DEFAULT, + type=ControlType, + tasmota: typing.Optional[Tasmota] = Default, + ha: typing.Optional[HomeAssistant] = Default, + alias: typing.Optional[str] = None + ): self.name = name self.alias = alias or name self.type = type self.schema = None - self.tasmota = tamota if tamota is not Default else Tasmota() + self.tasmota = tasmota if tasmota is not Default else Tasmota() self.ha = ha if ha is not Default else HomeAssistant() self.platforms = [io for io in {self.tasmota, self.ha} if io] diff --git a/haco/sensor.py b/haco/sensor.py index 4d7fbfa..2a1c26e 100644 --- a/haco/sensor.py +++ b/haco/sensor.py @@ -1,4 +1,4 @@ -from haco import schema, constants +from haco import schema from haco.control import Control from haco.data.type_sensor import DeviceClassSensor @@ -16,9 +16,8 @@ class Sensor(Control): return schema.Schema( capabilities=[ schema.Capability( - name=constants.DEFAULT, ha=None, - tamota=schema.Tasmota(announce_data=schema.AnnounceTopic(key='{io_ha}_topic')) + tasmota=schema.Tasmota(announce_data=schema.AnnounceTopic(key='{io_ha}_topic')) ) ] ) diff --git a/haco/update.py b/haco/update.py index 7617a98..e5c6dae 100644 --- a/haco/update.py +++ b/haco/update.py @@ -1,4 +1,3 @@ -from haco import constants from haco.control import Control from haco.schema import Schema, Capability, AnnounceTopic, Tasmota, HomeAssistant @@ -11,14 +10,13 @@ class Update(Control): schema = Schema( capabilities=[ Capability( - name=constants.DEFAULT, ha=HomeAssistant(announce_data=AnnounceTopic(key='{io_ha}_topic')), - tamota=Tasmota(announce_data=AnnounceTopic(key='{io_ha}_topic')) + tasmota=Tasmota(announce_data=AnnounceTopic(key='{io_ha}_topic')) ), Capability( name='latest_version', ha=None, - tamota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) + tasmota=Tasmota(announce_data=AnnounceTopic(key='{capability}_topic')) ) ] )