mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-06-01 02:28:28 +02:00
add-black (#1593)
* Add black Update pre commit Update pre commit add empty line * Format with black
This commit is contained in:
Guillermo Ruffino
committed by
GitHub
GitHub
parent
2b60b0f1fa
commit
69879920eb
@@ -3,39 +3,54 @@ import urllib.parse as urlparse
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome import automation
|
||||
from esphome.const import CONF_ID, CONF_TIMEOUT, CONF_ESPHOME, CONF_METHOD, \
|
||||
CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266, CONF_URL
|
||||
from esphome.const import (
|
||||
CONF_ID,
|
||||
CONF_TIMEOUT,
|
||||
CONF_ESPHOME,
|
||||
CONF_METHOD,
|
||||
CONF_ARDUINO_VERSION,
|
||||
ARDUINO_VERSION_ESP8266,
|
||||
CONF_URL,
|
||||
)
|
||||
from esphome.core import CORE, Lambda
|
||||
from esphome.core_config import PLATFORMIO_ESP8266_LUT
|
||||
|
||||
DEPENDENCIES = ['network']
|
||||
AUTO_LOAD = ['json']
|
||||
DEPENDENCIES = ["network"]
|
||||
AUTO_LOAD = ["json"]
|
||||
|
||||
http_request_ns = cg.esphome_ns.namespace('http_request')
|
||||
HttpRequestComponent = http_request_ns.class_('HttpRequestComponent', cg.Component)
|
||||
HttpRequestSendAction = http_request_ns.class_('HttpRequestSendAction', automation.Action)
|
||||
http_request_ns = cg.esphome_ns.namespace("http_request")
|
||||
HttpRequestComponent = http_request_ns.class_("HttpRequestComponent", cg.Component)
|
||||
HttpRequestSendAction = http_request_ns.class_(
|
||||
"HttpRequestSendAction", automation.Action
|
||||
)
|
||||
|
||||
CONF_HEADERS = 'headers'
|
||||
CONF_USERAGENT = 'useragent'
|
||||
CONF_BODY = 'body'
|
||||
CONF_JSON = 'json'
|
||||
CONF_VERIFY_SSL = 'verify_ssl'
|
||||
CONF_HEADERS = "headers"
|
||||
CONF_USERAGENT = "useragent"
|
||||
CONF_BODY = "body"
|
||||
CONF_JSON = "json"
|
||||
CONF_VERIFY_SSL = "verify_ssl"
|
||||
|
||||
|
||||
def validate_framework(config):
|
||||
if CORE.is_esp32:
|
||||
return config
|
||||
|
||||
version = 'RECOMMENDED'
|
||||
version = "RECOMMENDED"
|
||||
if CONF_ARDUINO_VERSION in CORE.raw_config[CONF_ESPHOME]:
|
||||
version = CORE.raw_config[CONF_ESPHOME][CONF_ARDUINO_VERSION]
|
||||
|
||||
if version in ['LATEST', 'DEV']:
|
||||
if version in ["LATEST", "DEV"]:
|
||||
return config
|
||||
|
||||
framework = PLATFORMIO_ESP8266_LUT[version] if version in PLATFORMIO_ESP8266_LUT else version
|
||||
if framework < ARDUINO_VERSION_ESP8266['2.5.1']:
|
||||
raise cv.Invalid('This component is not supported on arduino framework version below 2.5.1')
|
||||
framework = (
|
||||
PLATFORMIO_ESP8266_LUT[version]
|
||||
if version in PLATFORMIO_ESP8266_LUT
|
||||
else version
|
||||
)
|
||||
if framework < ARDUINO_VERSION_ESP8266["2.5.1"]:
|
||||
raise cv.Invalid(
|
||||
"This component is not supported on arduino framework version below 2.5.1"
|
||||
)
|
||||
return config
|
||||
|
||||
|
||||
@@ -44,34 +59,47 @@ def validate_url(value):
|
||||
try:
|
||||
parsed = list(urlparse.urlparse(value))
|
||||
except Exception as err:
|
||||
raise cv.Invalid('Invalid URL') from err
|
||||
raise cv.Invalid("Invalid URL") from err
|
||||
|
||||
if not parsed[0] or not parsed[1]:
|
||||
raise cv.Invalid('URL must have a URL scheme and host')
|
||||
raise cv.Invalid("URL must have a URL scheme and host")
|
||||
|
||||
if parsed[0] not in ['http', 'https']:
|
||||
raise cv.Invalid('Scheme must be http or https')
|
||||
if parsed[0] not in ["http", "https"]:
|
||||
raise cv.Invalid("Scheme must be http or https")
|
||||
|
||||
if not parsed[2]:
|
||||
parsed[2] = '/'
|
||||
parsed[2] = "/"
|
||||
|
||||
return urlparse.urlunparse(parsed)
|
||||
|
||||
|
||||
def validate_secure_url(config):
|
||||
url_ = config[CONF_URL]
|
||||
if config.get(CONF_VERIFY_SSL) and not isinstance(url_, Lambda) \
|
||||
and url_.lower().startswith('https:'):
|
||||
raise cv.Invalid('Currently ESPHome doesn\'t support SSL verification. '
|
||||
'Set \'verify_ssl: false\' to make insecure HTTPS requests.')
|
||||
if (
|
||||
config.get(CONF_VERIFY_SSL)
|
||||
and not isinstance(url_, Lambda)
|
||||
and url_.lower().startswith("https:")
|
||||
):
|
||||
raise cv.Invalid(
|
||||
"Currently ESPHome doesn't support SSL verification. "
|
||||
"Set 'verify_ssl: false' to make insecure HTTPS requests."
|
||||
)
|
||||
return config
|
||||
|
||||
|
||||
CONFIG_SCHEMA = cv.Schema({
|
||||
cv.GenerateID(): cv.declare_id(HttpRequestComponent),
|
||||
cv.Optional(CONF_USERAGENT, 'ESPHome'): cv.string,
|
||||
cv.Optional(CONF_TIMEOUT, default='5s'): cv.positive_time_period_milliseconds,
|
||||
}).add_extra(validate_framework).extend(cv.COMPONENT_SCHEMA)
|
||||
CONFIG_SCHEMA = (
|
||||
cv.Schema(
|
||||
{
|
||||
cv.GenerateID(): cv.declare_id(HttpRequestComponent),
|
||||
cv.Optional(CONF_USERAGENT, "ESPHome"): cv.string,
|
||||
cv.Optional(
|
||||
CONF_TIMEOUT, default="5s"
|
||||
): cv.positive_time_period_milliseconds,
|
||||
}
|
||||
)
|
||||
.add_extra(validate_framework)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
)
|
||||
|
||||
|
||||
def to_code(config):
|
||||
@@ -81,41 +109,60 @@ def to_code(config):
|
||||
yield cg.register_component(var, config)
|
||||
|
||||
|
||||
HTTP_REQUEST_ACTION_SCHEMA = cv.Schema({
|
||||
cv.GenerateID(): cv.use_id(HttpRequestComponent),
|
||||
cv.Required(CONF_URL): cv.templatable(validate_url),
|
||||
cv.Optional(CONF_HEADERS): cv.All(cv.Schema({cv.string: cv.templatable(cv.string)})),
|
||||
cv.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
|
||||
}).add_extra(validate_secure_url)
|
||||
HTTP_REQUEST_ACTION_SCHEMA = cv.Schema(
|
||||
{
|
||||
cv.GenerateID(): cv.use_id(HttpRequestComponent),
|
||||
cv.Required(CONF_URL): cv.templatable(validate_url),
|
||||
cv.Optional(CONF_HEADERS): cv.All(
|
||||
cv.Schema({cv.string: cv.templatable(cv.string)})
|
||||
),
|
||||
cv.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
|
||||
}
|
||||
).add_extra(validate_secure_url)
|
||||
HTTP_REQUEST_GET_ACTION_SCHEMA = automation.maybe_conf(
|
||||
CONF_URL, HTTP_REQUEST_ACTION_SCHEMA.extend({
|
||||
cv.Optional(CONF_METHOD, default='GET'): cv.one_of('GET', upper=True),
|
||||
})
|
||||
CONF_URL,
|
||||
HTTP_REQUEST_ACTION_SCHEMA.extend(
|
||||
{
|
||||
cv.Optional(CONF_METHOD, default="GET"): cv.one_of("GET", upper=True),
|
||||
}
|
||||
),
|
||||
)
|
||||
HTTP_REQUEST_POST_ACTION_SCHEMA = automation.maybe_conf(
|
||||
CONF_URL, HTTP_REQUEST_ACTION_SCHEMA.extend({
|
||||
cv.Optional(CONF_METHOD, default='POST'): cv.one_of('POST', upper=True),
|
||||
cv.Exclusive(CONF_BODY, 'body'): cv.templatable(cv.string),
|
||||
cv.Exclusive(CONF_JSON, 'body'): cv.Any(
|
||||
cv.lambda_, cv.All(cv.Schema({cv.string: cv.templatable(cv.string_strict)})),
|
||||
),
|
||||
})
|
||||
)
|
||||
HTTP_REQUEST_SEND_ACTION_SCHEMA = HTTP_REQUEST_ACTION_SCHEMA.extend({
|
||||
cv.Required(CONF_METHOD): cv.one_of('GET', 'POST', 'PUT', 'DELETE', 'PATCH', upper=True),
|
||||
cv.Exclusive(CONF_BODY, 'body'): cv.templatable(cv.string),
|
||||
cv.Exclusive(CONF_JSON, 'body'): cv.Any(
|
||||
cv.lambda_, cv.All(cv.Schema({cv.string: cv.templatable(cv.string_strict)})),
|
||||
CONF_URL,
|
||||
HTTP_REQUEST_ACTION_SCHEMA.extend(
|
||||
{
|
||||
cv.Optional(CONF_METHOD, default="POST"): cv.one_of("POST", upper=True),
|
||||
cv.Exclusive(CONF_BODY, "body"): cv.templatable(cv.string),
|
||||
cv.Exclusive(CONF_JSON, "body"): cv.Any(
|
||||
cv.lambda_,
|
||||
cv.All(cv.Schema({cv.string: cv.templatable(cv.string_strict)})),
|
||||
),
|
||||
}
|
||||
),
|
||||
})
|
||||
)
|
||||
HTTP_REQUEST_SEND_ACTION_SCHEMA = HTTP_REQUEST_ACTION_SCHEMA.extend(
|
||||
{
|
||||
cv.Required(CONF_METHOD): cv.one_of(
|
||||
"GET", "POST", "PUT", "DELETE", "PATCH", upper=True
|
||||
),
|
||||
cv.Exclusive(CONF_BODY, "body"): cv.templatable(cv.string),
|
||||
cv.Exclusive(CONF_JSON, "body"): cv.Any(
|
||||
cv.lambda_,
|
||||
cv.All(cv.Schema({cv.string: cv.templatable(cv.string_strict)})),
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@automation.register_action('http_request.get', HttpRequestSendAction,
|
||||
HTTP_REQUEST_GET_ACTION_SCHEMA)
|
||||
@automation.register_action('http_request.post', HttpRequestSendAction,
|
||||
HTTP_REQUEST_POST_ACTION_SCHEMA)
|
||||
@automation.register_action('http_request.send', HttpRequestSendAction,
|
||||
HTTP_REQUEST_SEND_ACTION_SCHEMA)
|
||||
@automation.register_action(
|
||||
"http_request.get", HttpRequestSendAction, HTTP_REQUEST_GET_ACTION_SCHEMA
|
||||
)
|
||||
@automation.register_action(
|
||||
"http_request.post", HttpRequestSendAction, HTTP_REQUEST_POST_ACTION_SCHEMA
|
||||
)
|
||||
@automation.register_action(
|
||||
"http_request.send", HttpRequestSendAction, HTTP_REQUEST_SEND_ACTION_SCHEMA
|
||||
)
|
||||
def http_request_action_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)
|
||||
@@ -129,7 +176,7 @@ def http_request_action_to_code(config, action_id, template_arg, args):
|
||||
if CONF_JSON in config:
|
||||
json_ = config[CONF_JSON]
|
||||
if isinstance(json_, Lambda):
|
||||
args_ = args + [(cg.JsonObjectRef, 'root')]
|
||||
args_ = args + [(cg.JsonObjectRef, "root")]
|
||||
lambda_ = yield cg.process_lambda(json_, args_, return_type=cg.void)
|
||||
cg.add(var.set_json(lambda_))
|
||||
else:
|
||||
@@ -137,7 +184,9 @@ def http_request_action_to_code(config, action_id, template_arg, args):
|
||||
template_ = yield cg.templatable(json_[key], args, cg.std_string)
|
||||
cg.add(var.add_json(key, template_))
|
||||
for key in config.get(CONF_HEADERS, []):
|
||||
template_ = yield cg.templatable(config[CONF_HEADERS][key], args, cg.const_char_ptr)
|
||||
template_ = yield cg.templatable(
|
||||
config[CONF_HEADERS][key], args, cg.const_char_ptr
|
||||
)
|
||||
cg.add(var.add_header(key, template_))
|
||||
|
||||
yield var
|
||||
|
||||
Reference in New Issue
Block a user