Use ATTR_NAME from const.py (#14450)
This commit is contained in:
1 parent
fb501282cc
commit
954e4796b8
26 files changed
+163
-194
No files matched your search
@@ -4,32 +4,31 @@ Sensor for the CityBikes data.
|
||||
For more details about this platform, please refer to the documentation at
|
||||
https://home-assistant.io/components/sensor.citybikes/
|
||||
"""
|
||||
import logging
|
||||
from datetime import timedelta
|
||||
|
||||
import asyncio
|
||||
from datetime import timedelta
|
||||
import logging
|
||||
|
||||
import aiohttp
|
||||
import async_timeout
|
||||
import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA, ENTITY_ID_FORMAT
|
||||
from homeassistant.components.sensor import ENTITY_ID_FORMAT, PLATFORM_SCHEMA
|
||||
from homeassistant.const import (
|
||||
CONF_NAME, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS,
|
||||
ATTR_ATTRIBUTION, ATTR_LOCATION, ATTR_LATITUDE, ATTR_LONGITUDE,
|
||||
STATE_UNKNOWN, LENGTH_METERS, LENGTH_FEET, ATTR_ID)
|
||||
ATTR_ATTRIBUTION, ATTR_ID, ATTR_LATITUDE, ATTR_LOCATION, ATTR_LONGITUDE,
|
||||
ATTR_NAME, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME, CONF_RADIUS,
|
||||
LENGTH_FEET, LENGTH_METERS)
|
||||
from homeassistant.exceptions import PlatformNotReady
|
||||
from homeassistant.helpers.event import async_track_time_interval
|
||||
from homeassistant.helpers.entity import Entity, async_generate_entity_id
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
from homeassistant.util import location, distance
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity, async_generate_entity_id
|
||||
from homeassistant.helpers.event import async_track_time_interval
|
||||
from homeassistant.util import distance, location
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_EMPTY_SLOTS = 'empty_slots'
|
||||
ATTR_EXTRA = 'extra'
|
||||
ATTR_FREE_BIKES = 'free_bikes'
|
||||
ATTR_NAME = 'name'
|
||||
ATTR_NETWORK = 'network'
|
||||
ATTR_NETWORKS_LIST = 'networks'
|
||||
ATTR_STATIONS_LIST = 'stations'
|
||||
@@ -151,8 +150,7 @@ def async_setup_platform(hass, config, async_add_devices,
|
||||
network = CityBikesNetwork(hass, network_id)
|
||||
hass.data[PLATFORM][MONITORED_NETWORKS][network_id] = network
|
||||
hass.async_add_job(network.async_refresh)
|
||||
async_track_time_interval(hass, network.async_refresh,
|
||||
SCAN_INTERVAL)
|
||||
async_track_time_interval(hass, network.async_refresh, SCAN_INTERVAL)
|
||||
else:
|
||||
network = hass.data[PLATFORM][MONITORED_NETWORKS][network_id]
|
||||
|
||||
@@ -160,14 +158,14 @@ def async_setup_platform(hass, config, async_add_devices,
|
||||
|
||||
devices = []
|
||||
for station in network.stations:
|
||||
dist = location.distance(latitude, longitude,
|
||||
station[ATTR_LATITUDE],
|
||||
station[ATTR_LONGITUDE])
|
||||
dist = location.distance(
|
||||
latitude, longitude, station[ATTR_LATITUDE],
|
||||
station[ATTR_LONGITUDE])
|
||||
station_id = station[ATTR_ID]
|
||||
station_uid = str(station.get(ATTR_EXTRA, {}).get(ATTR_UID, ''))
|
||||
|
||||
if radius > dist or stations_list.intersection((station_id,
|
||||
station_uid)):
|
||||
if radius > dist or stations_list.intersection(
|
||||
(station_id, station_uid)):
|
||||
devices.append(CityBikesStation(hass, network, station_id, name))
|
||||
|
||||
async_add_devices(devices, True)
|
||||
@@ -199,8 +197,8 @@ class CityBikesNetwork:
|
||||
for network in networks_list[1:]:
|
||||
network_latitude = network[ATTR_LOCATION][ATTR_LATITUDE]
|
||||
network_longitude = network[ATTR_LOCATION][ATTR_LONGITUDE]
|
||||
dist = location.distance(latitude, longitude,
|
||||
network_latitude, network_longitude)
|
||||
dist = location.distance(
|
||||
latitude, longitude, network_latitude, network_longitude)
|
||||
if dist < minimum_dist:
|
||||
minimum_dist = dist
|
||||
result = network[ATTR_ID]
|
||||
@@ -246,13 +244,13 @@ class CityBikesStation(Entity):
|
||||
uid = "_".join([network.network_id, base_name, station_id])
|
||||
else:
|
||||
uid = "_".join([network.network_id, station_id])
|
||||
self.entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, uid,
|
||||
hass=hass)
|
||||
self.entity_id = async_generate_entity_id(
|
||||
ENTITY_ID_FORMAT, uid, hass=hass)
|
||||
|
||||
@property
|
||||
def state(self):
|
||||
"""Return the state of the sensor."""
|
||||
return self._station_data.get(ATTR_FREE_BIKES, STATE_UNKNOWN)
|
||||
return self._station_data.get(ATTR_FREE_BIKES, None)
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
|
||||
@@ -23,7 +23,6 @@ _LOGGER = logging.getLogger(__name__)
|
||||
ATTR_24H_VOLUME = '24h_volume'
|
||||
ATTR_AVAILABLE_SUPPLY = 'available_supply'
|
||||
ATTR_MARKET_CAP = 'market_cap'
|
||||
ATTR_NAME = 'name'
|
||||
ATTR_PERCENT_CHANGE_24H = 'percent_change_24h'
|
||||
ATTR_PERCENT_CHANGE_7D = 'percent_change_7d'
|
||||
ATTR_PERCENT_CHANGE_1H = 'percent_change_1h'
|
||||
@@ -130,6 +129,4 @@ class CoinMarketCapData(object):
|
||||
"""Get the latest data from blockchain.info."""
|
||||
from coinmarketcap import Market
|
||||
self.ticker = Market().ticker(
|
||||
self.currency,
|
||||
limit=1,
|
||||
convert=self.display_currency)
|
||||
self.currency, limit=1, convert=self.display_currency)
|
||||
@@ -4,19 +4,21 @@ Support for ComEd Hourly Pricing data.
|
||||
For more details about this platform, please refer to the documentation at
|
||||
https://home-assistant.io/components/sensor.comed_hourly_pricing/
|
||||
"""
|
||||
from datetime import timedelta
|
||||
import logging
|
||||
import asyncio
|
||||
from datetime import timedelta
|
||||
import json
|
||||
import async_timeout
|
||||
import logging
|
||||
|
||||
import aiohttp
|
||||
import async_timeout
|
||||
import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import ATTR_ATTRIBUTION, STATE_UNKNOWN
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.const import (
|
||||
ATTR_ATTRIBUTION, CONF_NAME, CONF_OFFSET, STATE_UNKNOWN)
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
_RESOURCE = 'https://hourlypricing.comed.com/api'
|
||||
@@ -27,8 +29,6 @@ CONF_ATTRIBUTION = "Data provided by ComEd Hourly Pricing service"
|
||||
CONF_CURRENT_HOUR_AVERAGE = 'current_hour_average'
|
||||
CONF_FIVE_MINUTE = 'five_minute'
|
||||
CONF_MONITORED_FEEDS = 'monitored_feeds'
|
||||
CONF_NAME = 'name'
|
||||
CONF_OFFSET = 'offset'
|
||||
CONF_SENSOR_TYPE = 'type'
|
||||
|
||||
SENSOR_TYPES = {
|
||||
@@ -40,12 +40,12 @@ TYPES_SCHEMA = vol.In(SENSOR_TYPES)
|
||||
|
||||
SENSORS_SCHEMA = vol.Schema({
|
||||
vol.Required(CONF_SENSOR_TYPE): TYPES_SCHEMA,
|
||||
vol.Optional(CONF_NAME): cv.string,
|
||||
vol.Optional(CONF_OFFSET, default=0.0): vol.Coerce(float),
|
||||
vol.Optional(CONF_NAME): cv.string
|
||||
})
|
||||
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Required(CONF_MONITORED_FEEDS): [SENSORS_SCHEMA]
|
||||
vol.Required(CONF_MONITORED_FEEDS): [SENSORS_SCHEMA],
|
||||
})
|
||||
|
||||
|
||||
|
||||
@@ -10,15 +10,14 @@ import os
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import CONF_NAME, DEVICE_CLASS_BATTERY
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.const import ATTR_NAME, CONF_NAME, DEVICE_CLASS_BATTERY
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
|
||||
REQUIREMENTS = ['batinfo==0.4.2']
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_NAME = 'name'
|
||||
ATTR_PATH = 'path'
|
||||
ATTR_ALARM = 'alarm'
|
||||
ATTR_CAPACITY = 'capacity'
|
||||
|
||||
@@ -12,7 +12,7 @@ import voluptuous as vol
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.const import (
|
||||
CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_SSL,
|
||||
CONF_HOST, CONF_USERNAME, CONF_PASSWORD, CONF_PORT, CONF_SSL, ATTR_NAME,
|
||||
CONF_VERIFY_SSL, CONF_TIMEOUT, CONF_MONITORED_CONDITIONS, TEMP_CELSIUS)
|
||||
from homeassistant.util import Throttle
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
@@ -29,7 +29,6 @@ ATTR_MASK = 'Mask'
|
||||
ATTR_MAX_SPEED = 'Max Speed'
|
||||
ATTR_MEMORY_SIZE = 'Memory Size'
|
||||
ATTR_MODEL = 'Model'
|
||||
ATTR_NAME = 'Name'
|
||||
ATTR_PACKETS_TX = 'Packets (TX)'
|
||||
ATTR_PACKETS_RX = 'Packets (RX)'
|
||||
ATTR_PACKETS_ERR = 'Packets (Err)'
|
||||
|
||||
@@ -10,10 +10,10 @@ import voluptuous as vol
|
||||
|
||||
import homeassistant.components.rfxtrx as rfxtrx
|
||||
from homeassistant.components.rfxtrx import (
|
||||
ATTR_DATA_TYPE, ATTR_FIRE_EVENT, ATTR_NAME, CONF_AUTOMATIC_ADD,
|
||||
CONF_DATA_TYPE, CONF_DEVICES, CONF_FIRE_EVENT, DATA_TYPES)
|
||||
ATTR_DATA_TYPE, ATTR_FIRE_EVENT, CONF_AUTOMATIC_ADD, CONF_DATA_TYPE,
|
||||
CONF_DEVICES, CONF_FIRE_EVENT, DATA_TYPES)
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME
|
||||
from homeassistant.const import ATTR_ENTITY_ID, ATTR_NAME, CONF_NAME
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.util import slugify
|
||||
|
||||
@@ -6,16 +6,14 @@ https://home-assistant.io/components/sensor.tado/
|
||||
"""
|
||||
import logging
|
||||
|
||||
from homeassistant.const import TEMP_CELSIUS
|
||||
from homeassistant.components.tado import DATA_TADO
|
||||
from homeassistant.const import ATTR_ID, ATTR_NAME, TEMP_CELSIUS
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.components.tado import (DATA_TADO)
|
||||
from homeassistant.const import (ATTR_ID)
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_DATA_ID = 'data_id'
|
||||
ATTR_DEVICE = 'device'
|
||||
ATTR_NAME = 'name'
|
||||
ATTR_ZONE = 'zone'
|
||||
|
||||
CLIMATE_SENSOR_TYPES = ['temperature', 'humidity', 'power',
|
||||
@@ -39,14 +37,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
if zone['type'] == 'HEATING':
|
||||
for variable in CLIMATE_SENSOR_TYPES:
|
||||
sensor_items.append(create_zone_sensor(
|
||||
tado, zone, zone['name'], zone['id'],
|
||||
variable))
|
||||
tado, zone, zone['name'], zone['id'], variable))
|
||||
elif zone['type'] == 'HOT_WATER':
|
||||
for variable in HOT_WATER_SENSOR_TYPES:
|
||||
sensor_items.append(create_zone_sensor(
|
||||
tado, zone, zone['name'], zone['id'],
|
||||
variable
|
||||
))
|
||||
tado, zone, zone['name'], zone['id'], variable))
|
||||
|
||||
me_data = tado.get_me()
|
||||
sensor_items.append(create_device_sensor(
|
||||
|
||||
@@ -13,24 +13,27 @@ import voluptuous as vol
|
||||
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import (
|
||||
CONF_API_KEY, CONF_NAME, ATTR_ATTRIBUTION, CONF_ID
|
||||
)
|
||||
CONF_API_KEY, CONF_NAME, ATTR_ATTRIBUTION, CONF_ID, ATTR_NAME)
|
||||
from homeassistant.helpers.entity import Entity
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_ACCESS_CODE = 'AccessCode'
|
||||
ATTR_AVG_TIME = 'AverageTime'
|
||||
ATTR_CURRENT_TIME = 'CurrentTime'
|
||||
ATTR_DESCRIPTION = 'Description'
|
||||
ATTR_TIME_UPDATED = 'TimeUpdated'
|
||||
ATTR_TRAVEL_TIME_ID = 'TravelTimeID'
|
||||
|
||||
CONF_ATTRIBUTION = "Data provided by WSDOT"
|
||||
|
||||
CONF_TRAVEL_TIMES = 'travel_time'
|
||||
|
||||
# API codes for travel time details
|
||||
ATTR_ACCESS_CODE = 'AccessCode'
|
||||
ATTR_TRAVEL_TIME_ID = 'TravelTimeID'
|
||||
ATTR_CURRENT_TIME = 'CurrentTime'
|
||||
ATTR_AVG_TIME = 'AverageTime'
|
||||
ATTR_NAME = 'Name'
|
||||
ATTR_TIME_UPDATED = 'TimeUpdated'
|
||||
ATTR_DESCRIPTION = 'Description'
|
||||
ATTRIBUTION = "Data provided by WSDOT"
|
||||
ICON = 'mdi:car'
|
||||
|
||||
RESOURCE = 'http://www.wsdot.wa.gov/Traffic/api/TravelTimes/' \
|
||||
'TravelTimesREST.svc/GetTravelTimeAsJson'
|
||||
|
||||
SCAN_INTERVAL = timedelta(minutes=3)
|
||||
|
||||
@@ -43,16 +46,14 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
|
||||
|
||||
def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
"""Get the WSDOT sensor."""
|
||||
"""Set up the WSDOT sensor."""
|
||||
sensors = []
|
||||
for travel_time in config.get(CONF_TRAVEL_TIMES):
|
||||
name = (travel_time.get(CONF_NAME) or
|
||||
travel_time.get(CONF_ID))
|
||||
name = (travel_time.get(CONF_NAME) or travel_time.get(CONF_ID))
|
||||
sensors.append(
|
||||
WashingtonStateTravelTimeSensor(
|
||||
name,
|
||||
config.get(CONF_API_KEY),
|
||||
travel_time.get(CONF_ID)))
|
||||
name, config.get(CONF_API_KEY), travel_time.get(CONF_ID)))
|
||||
|
||||
add_devices(sensors, True)
|
||||
|
||||
|
||||
@@ -65,8 +66,6 @@ class WashingtonStateTransportSensor(Entity):
|
||||
can read them and make them available.
|
||||
"""
|
||||
|
||||
ICON = 'mdi:car'
|
||||
|
||||
def __init__(self, name, access_code):
|
||||
"""Initialize the sensor."""
|
||||
self._data = {}
|
||||
@@ -87,16 +86,12 @@ class WashingtonStateTransportSensor(Entity):
|
||||
@property
|
||||
def icon(self):
|
||||
"""Icon to use in the frontend, if any."""
|
||||
return self.ICON
|
||||
return ICON
|
||||
|
||||
|
||||
class WashingtonStateTravelTimeSensor(WashingtonStateTransportSensor):
|
||||
"""Travel time sensor from WSDOT."""
|
||||
|
||||
RESOURCE = ('http://www.wsdot.wa.gov/Traffic/api/TravelTimes/'
|
||||
'TravelTimesREST.svc/GetTravelTimeAsJson')
|
||||
ICON = 'mdi:car'
|
||||
|
||||
def __init__(self, name, access_code, travel_time_id):
|
||||
"""Construct a travel time sensor."""
|
||||
self._travel_time_id = travel_time_id
|
||||
@@ -104,10 +99,12 @@ class WashingtonStateTravelTimeSensor(WashingtonStateTransportSensor):
|
||||
|
||||
def update(self):
|
||||
"""Get the latest data from WSDOT."""
|
||||
params = {ATTR_ACCESS_CODE: self._access_code,
|
||||
ATTR_TRAVEL_TIME_ID: self._travel_time_id}
|
||||
params = {
|
||||
ATTR_ACCESS_CODE: self._access_code,
|
||||
ATTR_TRAVEL_TIME_ID: self._travel_time_id,
|
||||
}
|
||||
|
||||
response = requests.get(self.RESOURCE, params, timeout=10)
|
||||
response = requests.get(RESOURCE, params, timeout=10)
|
||||
if response.status_code != 200:
|
||||
_LOGGER.warning("Invalid response from WSDOT API")
|
||||
else:
|
||||
@@ -118,7 +115,7 @@ class WashingtonStateTravelTimeSensor(WashingtonStateTransportSensor):
|
||||
def device_state_attributes(self):
|
||||
"""Return other details about the sensor state."""
|
||||
if self._data is not None:
|
||||
attrs = {ATTR_ATTRIBUTION: ATTRIBUTION}
|
||||
attrs = {ATTR_ATTRIBUTION: CONF_ATTRIBUTION}
|
||||
for key in [ATTR_AVG_TIME, ATTR_NAME, ATTR_DESCRIPTION,
|
||||
ATTR_TRAVEL_TIME_ID]:
|
||||
attrs[key] = self._data.get(key)
|
||||
@@ -129,7 +126,7 @@ class WashingtonStateTravelTimeSensor(WashingtonStateTransportSensor):
|
||||
@property
|
||||
def unit_of_measurement(self):
|
||||
"""Return the unit this state is expressed in."""
|
||||
return "min"
|
||||
return 'min'
|
||||
|
||||
|
||||
def _parse_wsdot_timestamp(timestamp):
|
||||
@@ -139,5 +136,5 @@ def _parse_wsdot_timestamp(timestamp):
|
||||
# ex: Date(1485040200000-0800)
|
||||
milliseconds, tzone = re.search(
|
||||
r'Date\((\d+)([+-]\d\d)\d\d\)', timestamp).groups()
|
||||
return datetime.fromtimestamp(int(milliseconds) / 1000,
|
||||
tz=timezone(timedelta(hours=int(tzone))))
|
||||
return datetime.fromtimestamp(
|
||||
int(milliseconds) / 1000, tz=timezone(timedelta(hours=int(tzone))))
|
||||
Reference in new issue
Block a user