sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-16 18:22:22 +01:00
Code Issues Releases Wiki Activity

add-black (#1593)

Browse Source 
* Add black

Update pre commit

Update pre commit

add empty line

* Format with black
This commit is contained in:
Guillermo Ruffino
2021-03-07 16:03:16 -03:00
committed by GitHub
parent 2b60b0f1fa
commit 69879920eb
398 changed files with 21624 additions and 12644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/template/__init__.py
View File

@@ -1,3 +1,3 @@
import esphome.codegen as cg
template_ns = cg.esphome_ns.namespace('template_')
template_ns = cg.esphome_ns.namespace("template_")

36
esphome/components/template/binary_sensor/__init__.py
View File

@@ -5,13 +5,16 @@ from esphome.components import binary_sensor
from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE
from .. import template_ns
TemplateBinarySensor = template_ns.class_('TemplateBinarySensor', binary_sensor.BinarySensor,
cg.Component)
TemplateBinarySensor = template_ns.class_(
"TemplateBinarySensor", binary_sensor.BinarySensor, cg.Component
)
CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateBinarySensor),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
}).extend(cv.COMPONENT_SCHEMA)
CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(TemplateBinarySensor),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
}
).extend(cv.COMPONENT_SCHEMA)
def to_code(config):
@@ -20,17 +23,22 @@ def to_code(config):
yield binary_sensor.register_binary_sensor(var, config)
if CONF_LAMBDA in config:
template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
return_type=cg.optional.template(bool))
template_ = yield cg.process_lambda(
config[CONF_LAMBDA], [], return_type=cg.optional.template(bool)
)
cg.add(var.set_template(template_))
@automation.register_action('binary_sensor.template.publish',
binary_sensor.BinarySensorPublishAction,
cv.Schema({
cv.Required(CONF_ID): cv.use_id(binary_sensor.BinarySensor),
cv.Required(CONF_STATE): cv.templatable(cv.boolean),
}))
@automation.register_action(
"binary_sensor.template.publish",
binary_sensor.BinarySensorPublishAction,
cv.Schema(
{
cv.Required(CONF_ID): cv.use_id(binary_sensor.BinarySensor),
cv.Required(CONF_STATE): cv.templatable(cv.boolean),
}
),
)
def binary_sensor_template_publish_to_code(config, action_id, template_arg, args):
paren = yield cg.get_variable(config[CONF_ID])
var = cg.new_Pvariable(action_id, template_arg, paren)

123
esphome/components/template/cover/__init__.py
View File

@@ -2,37 +2,54 @@ import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import automation
from esphome.components import cover
from esphome.const import CONF_ASSUMED_STATE, CONF_CLOSE_ACTION, CONF_CURRENT_OPERATION, CONF_ID, \
CONF_LAMBDA, CONF_OPEN_ACTION, CONF_OPTIMISTIC, CONF_POSITION, CONF_RESTORE_MODE, \
CONF_STATE, CONF_STOP_ACTION, CONF_TILT, CONF_TILT_ACTION, CONF_TILT_LAMBDA, \
CONF_POSITION_ACTION
from esphome.const import (
CONF_ASSUMED_STATE,
CONF_CLOSE_ACTION,
CONF_CURRENT_OPERATION,
CONF_ID,
CONF_LAMBDA,
CONF_OPEN_ACTION,
CONF_OPTIMISTIC,
CONF_POSITION,
CONF_RESTORE_MODE,
CONF_STATE,
CONF_STOP_ACTION,
CONF_TILT,
CONF_TILT_ACTION,
CONF_TILT_LAMBDA,
CONF_POSITION_ACTION,
)
from .. import template_ns
TemplateCover = template_ns.class_('TemplateCover', cover.Cover, cg.Component)
TemplateCover = template_ns.class_("TemplateCover", cover.Cover, cg.Component)
TemplateCoverRestoreMode = template_ns.enum('TemplateCoverRestoreMode')
TemplateCoverRestoreMode = template_ns.enum("TemplateCoverRestoreMode")
RESTORE_MODES = {
'NO_RESTORE': TemplateCoverRestoreMode.COVER_NO_RESTORE,
'RESTORE': TemplateCoverRestoreMode.COVER_RESTORE,
'RESTORE_AND_CALL': TemplateCoverRestoreMode.COVER_RESTORE_AND_CALL,
"NO_RESTORE": TemplateCoverRestoreMode.COVER_NO_RESTORE,
"RESTORE": TemplateCoverRestoreMode.COVER_RESTORE,
"RESTORE_AND_CALL": TemplateCoverRestoreMode.COVER_RESTORE_AND_CALL,
}
CONF_HAS_POSITION = 'has_position'
CONF_HAS_POSITION = "has_position"
CONFIG_SCHEMA = cover.COVER_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateCover),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
cv.Optional(CONF_ASSUMED_STATE, default=False): cv.boolean,
cv.Optional(CONF_HAS_POSITION, default=False): cv.boolean,
cv.Optional(CONF_OPEN_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_CLOSE_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_STOP_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_TILT_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_TILT_LAMBDA): cv.returning_lambda,
cv.Optional(CONF_POSITION_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_RESTORE_MODE, default='RESTORE'): cv.enum(RESTORE_MODES, upper=True),
}).extend(cv.COMPONENT_SCHEMA)
CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(TemplateCover),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
cv.Optional(CONF_ASSUMED_STATE, default=False): cv.boolean,
cv.Optional(CONF_HAS_POSITION, default=False): cv.boolean,
cv.Optional(CONF_OPEN_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_CLOSE_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_STOP_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_TILT_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_TILT_LAMBDA): cv.returning_lambda,
cv.Optional(CONF_POSITION_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_RESTORE_MODE, default="RESTORE"): cv.enum(
RESTORE_MODES, upper=True
),
}
).extend(cv.COMPONENT_SCHEMA)
def to_code(config):
@@ -40,26 +57,36 @@ def to_code(config):
yield cg.register_component(var, config)
yield cover.register_cover(var, config)
if CONF_LAMBDA in config:
template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
return_type=cg.optional.template(float))
template_ = yield cg.process_lambda(
config[CONF_LAMBDA], [], return_type=cg.optional.template(float)
)
cg.add(var.set_state_lambda(template_))
if CONF_OPEN_ACTION in config:
yield automation.build_automation(var.get_open_trigger(), [], config[CONF_OPEN_ACTION])
yield automation.build_automation(
var.get_open_trigger(), [], config[CONF_OPEN_ACTION]
)
if CONF_CLOSE_ACTION in config:
yield automation.build_automation(var.get_close_trigger(), [], config[CONF_CLOSE_ACTION])
yield automation.build_automation(
var.get_close_trigger(), [], config[CONF_CLOSE_ACTION]
)
if CONF_STOP_ACTION in config:
yield automation.build_automation(var.get_stop_trigger(), [], config[CONF_STOP_ACTION])
yield automation.build_automation(
var.get_stop_trigger(), [], config[CONF_STOP_ACTION]
)
if CONF_TILT_ACTION in config:
yield automation.build_automation(var.get_tilt_trigger(), [(float, 'tilt')],
config[CONF_TILT_ACTION])
yield automation.build_automation(
var.get_tilt_trigger(), [(float, "tilt")], config[CONF_TILT_ACTION]
)
cg.add(var.set_has_tilt(True))
if CONF_TILT_LAMBDA in config:
tilt_template_ = yield cg.process_lambda(config[CONF_TILT_LAMBDA], [],
return_type=cg.optional.template(float))
tilt_template_ = yield cg.process_lambda(
config[CONF_TILT_LAMBDA], [], return_type=cg.optional.template(float)
)
cg.add(var.set_tilt_lambda(tilt_template_))
if CONF_POSITION_ACTION in config:
yield automation.build_automation(var.get_position_trigger(), [(float, 'pos')],
config[CONF_POSITION_ACTION])
yield automation.build_automation(
var.get_position_trigger(), [(float, "pos")], config[CONF_POSITION_ACTION]
)
cg.add(var.set_has_position(True))
else:
cg.add(var.set_has_position(config[CONF_HAS_POSITION]))
@@ -68,13 +95,21 @@ def to_code(config):
cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
@automation.register_action('cover.template.publish', cover.CoverPublishAction, cv.Schema({
cv.Required(CONF_ID): cv.use_id(cover.Cover),
cv.Exclusive(CONF_STATE, 'pos'): cv.templatable(cover.validate_cover_state),
cv.Exclusive(CONF_POSITION, 'pos'): cv.templatable(cv.zero_to_one_float),
cv.Optional(CONF_CURRENT_OPERATION): cv.templatable(cover.validate_cover_operation),
cv.Optional(CONF_TILT): cv.templatable(cv.zero_to_one_float),
}))
@automation.register_action(
"cover.template.publish",
cover.CoverPublishAction,
cv.Schema(
{
cv.Required(CONF_ID): cv.use_id(cover.Cover),
cv.Exclusive(CONF_STATE, "pos"): cv.templatable(cover.validate_cover_state),
cv.Exclusive(CONF_POSITION, "pos"): cv.templatable(cv.zero_to_one_float),
cv.Optional(CONF_CURRENT_OPERATION): cv.templatable(
cover.validate_cover_operation
),
cv.Optional(CONF_TILT): cv.templatable(cv.zero_to_one_float),
}
),
)
def cover_template_publish_to_code(config, action_id, template_arg, args):
paren = yield cg.get_variable(config[CONF_ID])
var = cg.new_Pvariable(action_id, template_arg, paren)
@@ -88,6 +123,8 @@ def cover_template_publish_to_code(config, action_id, template_arg, args):
template_ = yield cg.templatable(config[CONF_TILT], args, float)
cg.add(var.set_tilt(template_))
if CONF_CURRENT_OPERATION in config:
template_ = yield cg.templatable(config[CONF_CURRENT_OPERATION], args, cover.CoverOperation)
template_ = yield cg.templatable(
config[CONF_CURRENT_OPERATION], args, cover.CoverOperation
)
cg.add(var.set_current_operation(template_))
yield var

49
esphome/components/template/output/__init__.py
View File

@@ -5,30 +5,43 @@ from esphome.components import output
from esphome.const import CONF_ID, CONF_TYPE, CONF_BINARY
from .. import template_ns
TemplateBinaryOutput = template_ns.class_('TemplateBinaryOutput', output.BinaryOutput)
TemplateFloatOutput = template_ns.class_('TemplateFloatOutput', output.FloatOutput)
TemplateBinaryOutput = template_ns.class_("TemplateBinaryOutput", output.BinaryOutput)
TemplateFloatOutput = template_ns.class_("TemplateFloatOutput", output.FloatOutput)
CONF_FLOAT = 'float'
CONF_WRITE_ACTION = 'write_action'
CONF_FLOAT = "float"
CONF_WRITE_ACTION = "write_action"
CONFIG_SCHEMA = cv.typed_schema({
CONF_BINARY: output.BINARY_OUTPUT_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateBinaryOutput),
cv.Required(CONF_WRITE_ACTION): automation.validate_automation(single=True),
}),
CONF_FLOAT: output.FLOAT_OUTPUT_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateFloatOutput),
cv.Required(CONF_WRITE_ACTION): automation.validate_automation(single=True),
}),
}, lower=True)
CONFIG_SCHEMA = cv.typed_schema(
{
CONF_BINARY: output.BINARY_OUTPUT_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(TemplateBinaryOutput),
cv.Required(CONF_WRITE_ACTION): automation.validate_automation(
single=True
),
}
),
CONF_FLOAT: output.FLOAT_OUTPUT_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(TemplateFloatOutput),
cv.Required(CONF_WRITE_ACTION): automation.validate_automation(
single=True
),
}
),
},
lower=True,
)
def to_code(config):
var = cg.new_Pvariable(config[CONF_ID])
if config[CONF_TYPE] == CONF_BINARY:
yield automation.build_automation(var.get_trigger(), [(bool, 'state')],
config[CONF_WRITE_ACTION])
yield automation.build_automation(
var.get_trigger(), [(bool, "state")], config[CONF_WRITE_ACTION]
)
else:
yield automation.build_automation(var.get_trigger(), [(float, 'state')],
config[CONF_WRITE_ACTION])
yield automation.build_automation(
var.get_trigger(), [(float, "state")], config[CONF_WRITE_ACTION]
)
yield output.register_output(var, config)

48
esphome/components/template/sensor/__init__.py
View File

@@ -2,16 +2,30 @@ import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import automation
from esphome.components import sensor
from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE, DEVICE_CLASS_EMPTY, UNIT_EMPTY, \
ICON_EMPTY
from esphome.const import (
CONF_ID,
CONF_LAMBDA,
CONF_STATE,
DEVICE_CLASS_EMPTY,
UNIT_EMPTY,
ICON_EMPTY,
)
from .. import template_ns
TemplateSensor = template_ns.class_('TemplateSensor', sensor.Sensor, cg.PollingComponent)
TemplateSensor = template_ns.class_(
"TemplateSensor", sensor.Sensor, cg.PollingComponent
)
CONFIG_SCHEMA = sensor.sensor_schema(UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY).extend({
cv.GenerateID(): cv.declare_id(TemplateSensor),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
}).extend(cv.polling_component_schema('60s'))
CONFIG_SCHEMA = (
sensor.sensor_schema(UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY)
.extend(
{
cv.GenerateID(): cv.declare_id(TemplateSensor),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
}
)
.extend(cv.polling_component_schema("60s"))
)
def to_code(config):
@@ -20,16 +34,22 @@ def to_code(config):
yield sensor.register_sensor(var, config)
if CONF_LAMBDA in config:
template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
return_type=cg.optional.template(float))
template_ = yield cg.process_lambda(
config[CONF_LAMBDA], [], return_type=cg.optional.template(float)
)
cg.add(var.set_template(template_))
@automation.register_action('sensor.template.publish', sensor.SensorPublishAction,
cv.Schema({
cv.Required(CONF_ID): cv.use_id(sensor.Sensor),
cv.Required(CONF_STATE): cv.templatable(cv.float_),
}))
@automation.register_action(
"sensor.template.publish",
sensor.SensorPublishAction,
cv.Schema(
{
cv.Required(CONF_ID): cv.use_id(sensor.Sensor),
cv.Required(CONF_STATE): cv.templatable(cv.float_),
}
),
)
def sensor_template_publish_to_code(config, action_id, template_arg, args):
paren = yield cg.get_variable(config[CONF_ID])
var = cg.new_Pvariable(action_id, template_arg, paren)

63
esphome/components/template/switch/__init__.py
View File

@@ -2,21 +2,31 @@ import esphome.codegen as cg
import esphome.config_validation as cv
from esphome import automation
from esphome.components import switch
from esphome.const import CONF_ASSUMED_STATE, CONF_ID, CONF_LAMBDA, CONF_OPTIMISTIC, \
CONF_RESTORE_STATE, CONF_STATE, CONF_TURN_OFF_ACTION, CONF_TURN_ON_ACTION
from esphome.const import (
CONF_ASSUMED_STATE,
CONF_ID,
CONF_LAMBDA,
CONF_OPTIMISTIC,
CONF_RESTORE_STATE,
CONF_STATE,
CONF_TURN_OFF_ACTION,
CONF_TURN_ON_ACTION,
)
from .. import template_ns
TemplateSwitch = template_ns.class_('TemplateSwitch', switch.Switch, cg.Component)
TemplateSwitch = template_ns.class_("TemplateSwitch", switch.Switch, cg.Component)
CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateSwitch),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
cv.Optional(CONF_ASSUMED_STATE, default=False): cv.boolean,
cv.Optional(CONF_TURN_OFF_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_TURN_ON_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_RESTORE_STATE, default=False): cv.boolean,
}).extend(cv.COMPONENT_SCHEMA)
CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(TemplateSwitch),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
cv.Optional(CONF_ASSUMED_STATE, default=False): cv.boolean,
cv.Optional(CONF_TURN_OFF_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_TURN_ON_ACTION): automation.validate_automation(single=True),
cv.Optional(CONF_RESTORE_STATE, default=False): cv.boolean,
}
).extend(cv.COMPONENT_SCHEMA)
def to_code(config):
@@ -25,24 +35,33 @@ def to_code(config):
yield switch.register_switch(var, config)
if CONF_LAMBDA in config:
template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
return_type=cg.optional.template(bool))
template_ = yield cg.process_lambda(
config[CONF_LAMBDA], [], return_type=cg.optional.template(bool)
)
cg.add(var.set_state_lambda(template_))
if CONF_TURN_OFF_ACTION in config:
yield automation.build_automation(var.get_turn_off_trigger(), [],
config[CONF_TURN_OFF_ACTION])
yield automation.build_automation(
var.get_turn_off_trigger(), [], config[CONF_TURN_OFF_ACTION]
)
if CONF_TURN_ON_ACTION in config:
yield automation.build_automation(var.get_turn_on_trigger(), [],
config[CONF_TURN_ON_ACTION])
yield automation.build_automation(
var.get_turn_on_trigger(), [], config[CONF_TURN_ON_ACTION]
)
cg.add(var.set_optimistic(config[CONF_OPTIMISTIC]))
cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
cg.add(var.set_restore_state(config[CONF_RESTORE_STATE]))
@automation.register_action('switch.template.publish', switch.SwitchPublishAction, cv.Schema({
cv.Required(CONF_ID): cv.use_id(switch.Switch),
cv.Required(CONF_STATE): cv.templatable(cv.boolean),
}))
@automation.register_action(
"switch.template.publish",
switch.SwitchPublishAction,
cv.Schema(
{
cv.Required(CONF_ID): cv.use_id(switch.Switch),
cv.Required(CONF_STATE): cv.templatable(cv.boolean),
}
),
)
def switch_template_publish_to_code(config, action_id, template_arg, args):
paren = yield cg.get_variable(config[CONF_ID])
var = cg.new_Pvariable(action_id, template_arg, paren)

34
esphome/components/template/text_sensor/__init__.py
View File

@@ -6,13 +6,16 @@ from esphome.components.text_sensor import TextSensorPublishAction
from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE
from .. import template_ns
TemplateTextSensor = template_ns.class_('TemplateTextSensor', text_sensor.TextSensor,
cg.PollingComponent)
TemplateTextSensor = template_ns.class_(
"TemplateTextSensor", text_sensor.TextSensor, cg.PollingComponent
)
CONFIG_SCHEMA = text_sensor.TEXT_SENSOR_SCHEMA.extend({
cv.GenerateID(): cv.declare_id(TemplateTextSensor),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
}).extend(cv.polling_component_schema('60s'))
CONFIG_SCHEMA = text_sensor.TEXT_SENSOR_SCHEMA.extend(
{
cv.GenerateID(): cv.declare_id(TemplateTextSensor),
cv.Optional(CONF_LAMBDA): cv.returning_lambda,
}
).extend(cv.polling_component_schema("60s"))
def to_code(config):
@@ -21,15 +24,22 @@ def to_code(config):
yield text_sensor.register_text_sensor(var, config)
if CONF_LAMBDA in config:
template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
return_type=cg.optional.template(cg.std_string))
template_ = yield cg.process_lambda(
config[CONF_LAMBDA], [], return_type=cg.optional.template(cg.std_string)
)
cg.add(var.set_template(template_))
@automation.register_action('text_sensor.template.publish', TextSensorPublishAction, cv.Schema({
cv.Required(CONF_ID): cv.use_id(text_sensor.TextSensor),
cv.Required(CONF_STATE): cv.templatable(cv.string_strict),
}))
@automation.register_action(
"text_sensor.template.publish",
TextSensorPublishAction,
cv.Schema(
{
cv.Required(CONF_ID): cv.use_id(text_sensor.TextSensor),
cv.Required(CONF_STATE): cv.templatable(cv.string_strict),
}
),
)
def text_sensor_template_publish_to_code(config, action_id, template_arg, args):
paren = yield cg.get_variable(config[CONF_ID])
var = cg.new_Pvariable(action_id, template_arg, paren)