Version bump to 0.66.0.beta1

* Add version bump script

* Lint

.coveragerc

@@ -62,6 +62,9 @@ omit =
     homeassistant/components/comfoconnect.py
     homeassistant/components/*/comfoconnect.py
 
+    homeassistant/components/daikin.py
+    homeassistant/components/*/daikin.py
+
     homeassistant/components/deconz/*
     homeassistant/components/*/deconz.py
 
@@ -82,6 +85,9 @@ omit =
     homeassistant/components/ecobee.py
     homeassistant/components/*/ecobee.py
 
+    homeassistant/components/egardia.py
+    homeassistant/components/*/egardia.py
+
     homeassistant/components/enocean.py
     homeassistant/components/*/enocean.py
 
@@ -103,6 +109,9 @@ omit =
     homeassistant/components/homematic/__init__.py
     homeassistant/components/*/homematic.py
 
+    homeassistant/components/homematicip_cloud.py
+    homeassistant/components/*/homematicip_cloud.py
+
     homeassistant/components/ihc/*
     homeassistant/components/*/ihc.py
 
@@ -181,6 +190,9 @@ omit =
     homeassistant/components/opencv.py
     homeassistant/components/*/opencv.py
 
+    homeassistant/components/pilight.py
+    homeassistant/components/*/pilight.py
+
     homeassistant/components/qwikswitch.py
     homeassistant/components/*/qwikswitch.py
 
@@ -244,6 +256,9 @@ omit =
     homeassistant/components/notify/twilio_sms.py
     homeassistant/components/notify/twilio_call.py
 
+    homeassistant/components/upcloud.py
+    homeassistant/components/*/upcloud.py
+
     homeassistant/components/usps.py
     homeassistant/components/*/usps.py
 
@@ -293,14 +308,11 @@ omit =
     homeassistant/components/zoneminder.py
     homeassistant/components/*/zoneminder.py
 
-    homeassistant/components/daikin.py
-    homeassistant/components/*/daikin.py
-
     homeassistant/components/alarm_control_panel/alarmdotcom.py
     homeassistant/components/alarm_control_panel/canary.py
     homeassistant/components/alarm_control_panel/concord232.py
-    homeassistant/components/alarm_control_panel/egardia.py
     homeassistant/components/alarm_control_panel/ialarm.py
+    homeassistant/components/alarm_control_panel/ifttt.py
     homeassistant/components/alarm_control_panel/manual_mqtt.py
     homeassistant/components/alarm_control_panel/nx584.py
     homeassistant/components/alarm_control_panel/simplisafe.py
@@ -312,7 +324,6 @@ omit =
     homeassistant/components/binary_sensor/hikvision.py
     homeassistant/components/binary_sensor/iss.py
     homeassistant/components/binary_sensor/mystrom.py
-    homeassistant/components/binary_sensor/pilight.py
     homeassistant/components/binary_sensor/ping.py
     homeassistant/components/binary_sensor/rest.py
     homeassistant/components/binary_sensor/tapsaff.py
@@ -325,6 +336,7 @@ omit =
     homeassistant/components/camera/foscam.py
     homeassistant/components/camera/mjpeg.py
     homeassistant/components/camera/onvif.py
+    homeassistant/components/camera/proxy.py
     homeassistant/components/camera/ring.py
     homeassistant/components/camera/rpi_camera.py
     homeassistant/components/camera/synology.py
@@ -353,12 +365,14 @@ omit =
     homeassistant/components/cover/scsgate.py
     homeassistant/components/device_tracker/actiontec.py
     homeassistant/components/device_tracker/aruba.py
+    homeassistant/components/device_tracker/asuswrt.py
     homeassistant/components/device_tracker/automatic.py
     homeassistant/components/device_tracker/bbox.py
     homeassistant/components/device_tracker/bluetooth_le_tracker.py
     homeassistant/components/device_tracker/bluetooth_tracker.py
     homeassistant/components/device_tracker/bt_home_hub_5.py
     homeassistant/components/device_tracker/cisco_ios.py
+    homeassistant/components/device_tracker/ddwrt.py
     homeassistant/components/device_tracker/fritz.py
     homeassistant/components/device_tracker/gpslogger.py
     homeassistant/components/device_tracker/hitron_coda.py
@@ -394,20 +408,20 @@ omit =
     homeassistant/components/image_processing/dlib_face_detect.py
     homeassistant/components/image_processing/dlib_face_identify.py
     homeassistant/components/image_processing/seven_segments.py
-    homeassistant/components/keyboard.py
     homeassistant/components/keyboard_remote.py
+    homeassistant/components/keyboard.py
     homeassistant/components/light/avion.py
     homeassistant/components/light/blinksticklight.py
     homeassistant/components/light/blinkt.py
-    homeassistant/components/light/decora.py
     homeassistant/components/light/decora_wifi.py
+    homeassistant/components/light/decora.py
     homeassistant/components/light/flux_led.py
     homeassistant/components/light/greenwave.py
     homeassistant/components/light/hue.py
     homeassistant/components/light/hyperion.py
     homeassistant/components/light/iglo.py
-    homeassistant/components/light/lifx.py
     homeassistant/components/light/lifx_legacy.py
+    homeassistant/components/light/lifx.py
     homeassistant/components/light/limitlessled.py
     homeassistant/components/light/mystrom.py
     homeassistant/components/light/osramlightify.py
@@ -433,6 +447,7 @@ omit =
     homeassistant/components/media_player/bluesound.py
     homeassistant/components/media_player/braviatv.py
     homeassistant/components/media_player/cast.py
+    homeassistant/components/media_player/channels.py
     homeassistant/components/media_player/clementine.py
     homeassistant/components/media_player/cmus.py
     homeassistant/components/media_player/denon.py
@@ -464,6 +479,7 @@ omit =
     homeassistant/components/media_player/russound_rio.py
     homeassistant/components/media_player/russound_rnet.py
     homeassistant/components/media_player/snapcast.py
+    homeassistant/components/media_player/songpal.py
     homeassistant/components/media_player/sonos.py
     homeassistant/components/media_player/spotify.py
     homeassistant/components/media_player/squeezebox.py
@@ -472,8 +488,8 @@ omit =
     homeassistant/components/media_player/vlc.py
     homeassistant/components/media_player/volumio.py
     homeassistant/components/media_player/xiaomi_tv.py
-    homeassistant/components/media_player/yamaha.py
     homeassistant/components/media_player/yamaha_musiccast.py
+    homeassistant/components/media_player/yamaha.py
     homeassistant/components/media_player/ziggo_mediabox_xl.py
     homeassistant/components/mycroft.py
     homeassistant/components/notify/aws_lambda.py
@@ -481,8 +497,8 @@ omit =
     homeassistant/components/notify/aws_sqs.py
     homeassistant/components/notify/ciscospark.py
     homeassistant/components/notify/clickatell.py
-    homeassistant/components/notify/clicksend.py
     homeassistant/components/notify/clicksend_tts.py
+    homeassistant/components/notify/clicksend.py
     homeassistant/components/notify/discord.py
     homeassistant/components/notify/free_mobile.py
     homeassistant/components/notify/gntp.py
@@ -507,7 +523,9 @@ omit =
     homeassistant/components/notify/sendgrid.py
     homeassistant/components/notify/simplepush.py
     homeassistant/components/notify/slack.py
+    homeassistant/components/notify/stride.py
     homeassistant/components/notify/smtp.py
+    homeassistant/components/notify/synology_chat.py
     homeassistant/components/notify/syslog.py
     homeassistant/components/notify/telegram.py
     homeassistant/components/notify/telstra.py
@@ -543,7 +561,6 @@ omit =
     homeassistant/components/sensor/crimereports.py
     homeassistant/components/sensor/cups.py
     homeassistant/components/sensor/currencylayer.py
-    homeassistant/components/sensor/darksky.py
     homeassistant/components/sensor/deluge.py
     homeassistant/components/sensor/deutsche_bahn.py
     homeassistant/components/sensor/dht.py
@@ -565,6 +582,7 @@ omit =
     homeassistant/components/sensor/fitbit.py
     homeassistant/components/sensor/fixer.py
     homeassistant/components/sensor/folder.py
+    homeassistant/components/sensor/foobot.py
     homeassistant/components/sensor/fritzbox_callmonitor.py
     homeassistant/components/sensor/fritzbox_netmonitor.py
     homeassistant/components/sensor/gearbest.py
@@ -577,8 +595,8 @@ omit =
     homeassistant/components/sensor/haveibeenpwned.py
     homeassistant/components/sensor/hp_ilo.py
     homeassistant/components/sensor/htu21d.py
-    homeassistant/components/sensor/imap.py
     homeassistant/components/sensor/imap_email_content.py
+    homeassistant/components/sensor/imap.py
     homeassistant/components/sensor/influxdb.py
     homeassistant/components/sensor/irish_rail_transport.py
     homeassistant/components/sensor/kwb.py
@@ -619,10 +637,12 @@ omit =
     homeassistant/components/sensor/ripple.py
     homeassistant/components/sensor/sabnzbd.py
     homeassistant/components/sensor/scrape.py
+    homeassistant/components/sensor/sense.py
     homeassistant/components/sensor/sensehat.py
-    homeassistant/components/sensor/serial.py
     homeassistant/components/sensor/serial_pm.py
+    homeassistant/components/sensor/serial.py
     homeassistant/components/sensor/shodan.py
+    homeassistant/components/sensor/simulated.py
     homeassistant/components/sensor/skybeacon.py
     homeassistant/components/sensor/sma.py
     homeassistant/components/sensor/snmp.py
@@ -634,16 +654,17 @@ omit =
     homeassistant/components/sensor/supervisord.py
     homeassistant/components/sensor/swiss_hydrological_data.py
     homeassistant/components/sensor/swiss_public_transport.py
+    homeassistant/components/sensor/syncthru.py
     homeassistant/components/sensor/synologydsm.py
     homeassistant/components/sensor/systemmonitor.py
     homeassistant/components/sensor/sytadin.py
     homeassistant/components/sensor/tank_utility.py
     homeassistant/components/sensor/ted5000.py
-    homeassistant/components/sensor/teksavvy.py
     homeassistant/components/sensor/temper.py
     homeassistant/components/sensor/tibber.py
     homeassistant/components/sensor/time_date.py
     homeassistant/components/sensor/torque.py
+    homeassistant/components/sensor/trafikverket_weatherstation.py
     homeassistant/components/sensor/transmission.py
     homeassistant/components/sensor/travisci.py
     homeassistant/components/sensor/twitch.py
@@ -658,6 +679,7 @@ omit =
     homeassistant/components/sensor/worxlandroid.py
     homeassistant/components/sensor/xbox_live.py
     homeassistant/components/sensor/zamg.py
+    homeassistant/components/sensor/zestimate.py
     homeassistant/components/shiftr.py
     homeassistant/components/spc.py
     homeassistant/components/switch/acer_projector.py
@@ -675,7 +697,6 @@ omit =
     homeassistant/components/switch/mystrom.py
     homeassistant/components/switch/netio.py
     homeassistant/components/switch/orvibo.py
-    homeassistant/components/switch/pilight.py
     homeassistant/components/switch/pulseaudio_loopback.py
     homeassistant/components/switch/rainbird.py
     homeassistant/components/switch/rainmachine.py
@@ -685,6 +706,7 @@ omit =
     homeassistant/components/switch/telnet.py
     homeassistant/components/switch/tplink.py
     homeassistant/components/switch/transmission.py
+    homeassistant/components/switch/vesync.py
     homeassistant/components/switch/xiaomi_miio.py
     homeassistant/components/telegram_bot/*
     homeassistant/components/thingspeak.py

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,19 +12,18 @@
 
 ## Checklist:
   - [ ] The code change is tested and works locally.
+  - [ ] Local tests pass with `tox`. **Your PR cannot be merged unless tests pass**
 
 If user exposed functionality or configuration variables are added/changed:
   - [ ] Documentation added/updated in [home-assistant.github.io](https://github.com/home-assistant/home-assistant.github.io)
 
 If the code communicates with devices, web services, or third-party tools:
-  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
   - [ ] New dependencies have been added to the `REQUIREMENTS` variable ([example][ex-requir]).
   - [ ] New dependencies are only imported inside functions that use them ([example][ex-import]).
   - [ ] New dependencies have been added to `requirements_all.txt` by running `script/gen_requirements_all.py`.
   - [ ] New files were added to `.coveragerc`.
 
 If the code does not interact with devices:
-  - [ ] Local tests with `tox` run successfully. **Your PR cannot be merged unless tests pass**
   - [ ] Tests have been added to verify that the new code works.
 
 [ex-requir]: https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/keyboard.py#L14

.gitignore

@@ -21,6 +21,7 @@ Icon
 *.iml
 
 # pytest
+.pytest_cache
 .cache
 
 # GITHUB Proposed Python stuff:
@@ -103,3 +104,6 @@ desktop.ini
 
 # mypy
 /.mypy_cache/*
+
+# Secrets
+.lokalise_token

.travis.yml

@@ -6,12 +6,10 @@ addons:
 matrix:
   fast_finish: true
   include:
-    - python: "3.4.2"
+    - python: "3.5.3"
       env: TOXENV=lint
-    - python: "3.4.2"
+    - python: "3.5.3"
       env: TOXENV=pylint
-    - python: "3.4.2"
-      env: TOXENV=py34
     # - python: "3.5"
     #   env: TOXENV=typing
     - python: "3.5.3"
@@ -30,4 +28,15 @@ cache:
 install: pip install -U tox coveralls
 language: python
 script: travis_wait 30 tox --develop
+services:
+  - docker
+before_deploy:
+  - docker pull lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7
+deploy:
+  skip_cleanup: true
+  provider: script
+  script: script/travis_deploy
+  on:
+    branch: dev
+    condition: $TOXENV = lint
 after_success: coveralls

CODEOWNERS

@@ -43,17 +43,20 @@ homeassistant/components/hassio.py @home-assistant/hassio
 
 # Individual components
 homeassistant/components/alarm_control_panel/egardia.py @jeroenterheerdt
+homeassistant/components/binary_sensor/hikvision.py @mezz64
 homeassistant/components/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/camera/yi.py @bachya
 homeassistant/components/climate/ephember.py @ttroy50
 homeassistant/components/climate/eq3btsmart.py @rytilahti
 homeassistant/components/climate/sensibo.py @andrey-git
+homeassistant/components/cover/group.py @cdce8p
 homeassistant/components/cover/template.py @PhracturedBlue
 homeassistant/components/device_tracker/automatic.py @armills
 homeassistant/components/device_tracker/tile.py @bachya
 homeassistant/components/history_graph.py @andrey-git
 homeassistant/components/light/tplink.py @rytilahti
 homeassistant/components/light/yeelight.py @rytilahti
+homeassistant/components/media_player/emby.py @mezz64
 homeassistant/components/media_player/kodi.py @armills
 homeassistant/components/media_player/mediaroom.py @dgomes
 homeassistant/components/media_player/monoprice.py @etsinko
@@ -77,6 +80,8 @@ homeassistant/components/xiaomi_aqara.py @danielhiversen @syssi
 homeassistant/components/*/axis.py @kane610
 homeassistant/components/*/bmw_connected_drive.py @ChristianKuehnel
 homeassistant/components/*/broadlink.py @danielhiversen
+homeassistant/components/eight_sleep.py @mezz64
+homeassistant/components/*/eight_sleep.py @mezz64
 homeassistant/components/hive.py @Rendili @KJonline
 homeassistant/components/*/hive.py @Rendili @KJonline
 homeassistant/components/homekit/* @cdce8p

CONTRIBUTING.md

@@ -4,7 +4,7 @@ Everybody is invited and welcome to contribute to Home Assistant. There is a lot
 
 The process is straight-forward.
 
- - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0)
+ - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0)
  - Fork the Home Assistant [git repository](https://github.com/home-assistant/home-assistant).
  - Write the code for your device, notification service, sensor, or IoT thing.
  - Ensure tests work.

docs/source/api/util.rst

@@ -4,10 +4,10 @@ homeassistant.util package
 Submodules
 ----------
 
-homeassistant.util.async module
+homeassistant.util.async_ module
 -------------------------------
 
-.. automodule:: homeassistant.util.async
+.. automodule:: homeassistant.util.async_
     :members:
     :undoc-members:
     :show-inheritance:

homeassistant/__main__.py

@@ -15,7 +15,6 @@ from homeassistant.const import (
     __version__,
     EVENT_HOMEASSISTANT_START,
     REQUIRED_PYTHON_VER,
-    REQUIRED_PYTHON_VER_WIN,
     RESTART_EXIT_CODE,
 )
 
@@ -33,12 +32,7 @@ def attempt_use_uvloop():
 
 def validate_python() -> None:
     """Validate that the right Python version is running."""
-    if sys.platform == "win32" and \
-       sys.version_info[:3] < REQUIRED_PYTHON_VER_WIN:
-        print("Home Assistant requires at least Python {}.{}.{}".format(
-            *REQUIRED_PYTHON_VER_WIN))
-        sys.exit(1)
-    elif sys.version_info[:3] < REQUIRED_PYTHON_VER:
+    if sys.version_info[:3] < REQUIRED_PYTHON_VER:
         print("Home Assistant requires at least Python {}.{}.{}".format(
             *REQUIRED_PYTHON_VER))
         sys.exit(1)
@@ -278,7 +272,7 @@ def setup_and_run_hass(config_dir: str,
 
     if args.open_ui:
         # Imported here to avoid importing asyncio before monkey patch
-        from homeassistant.util.async import run_callback_threadsafe
+        from homeassistant.util.async_ import run_callback_threadsafe
 
         def open_browser(event):
             """Open the webinterface in a browser."""
@@ -341,7 +335,8 @@ def main() -> int:
     """Start Home Assistant."""
     validate_python()
 
-    if os.environ.get('HASS_NO_MONKEY') != '1':
+    monkey_patch_needed = sys.version_info[:3] < (3, 6, 3)
+    if monkey_patch_needed and os.environ.get('HASS_NO_MONKEY') != '1':
         if sys.version_info[:2] >= (3, 6):
             monkey_patch.disable_c_asyncio()
         monkey_patch.patch_weakref_tasks()

homeassistant/bootstrap.py

@@ -86,14 +86,6 @@ def async_from_config_dict(config: Dict[str, Any],
     if enable_log:
         async_enable_logging(hass, verbose, log_rotate_days, log_file)
 
-    if sys.version_info[:2] < (3, 5):
-        _LOGGER.warning(
-            'Python 3.4 support has been deprecated and will be removed in '
-            'the beginning of 2018. Please upgrade Python or your operating '
-            'system. More info: https://home-assistant.io/blog/2017/10/06/'
-            'deprecating-python-3.4-support/'
-        )
-
     core_config = config.get(core.DOMAIN, {})
 
     try:
@@ -112,17 +104,17 @@ def async_from_config_dict(config: Dict[str, Any],
     if not loader.PREPARED:
         yield from hass.async_add_job(loader.prepare, hass)
 
+    # Make a copy because we are mutating it.
+    config = OrderedDict(config)
+
     # Merge packages
     conf_util.merge_packages_config(
         config, core_config.get(conf_util.CONF_PACKAGES, {}))
 
-    # Make a copy because we are mutating it.
-    # Use OrderedDict in case original one was one.
-    # Convert values to dictionaries if they are None
-    new_config = OrderedDict()
+    # Ensure we have no None values after merge
     for key, value in config.items():
-        new_config[key] = value or {}
-    config = new_config
+        if not value:
+            config[key] = {}
 
     hass.config_entries = config_entries.ConfigEntries(hass, config)
     yield from hass.config_entries.async_load()

homeassistant/components/__init__.py

@@ -156,9 +156,10 @@ def async_setup(hass, config):
     hass.services.async_register(
         ha.DOMAIN, SERVICE_TOGGLE, async_handle_turn_service)
     hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TURN_ON, ha.DOMAIN, SERVICE_TURN_ON, "Turned on {}"))
+        intent.INTENT_TURN_ON, ha.DOMAIN, SERVICE_TURN_ON, "Turned {} on"))
     hass.helpers.intent.async_register(intent.ServiceIntentHandler(
-        intent.INTENT_TURN_OFF, ha.DOMAIN, SERVICE_TURN_OFF, "Turned off {}"))
+        intent.INTENT_TURN_OFF, ha.DOMAIN, SERVICE_TURN_OFF,
+        "Turned {} off"))
     hass.helpers.intent.async_register(intent.ServiceIntentHandler(
         intent.INTENT_TOGGLE, ha.DOMAIN, SERVICE_TOGGLE, "Toggled {}"))
 

homeassistant/components/alarm_control_panel/alarmdotcom.py

@@ -17,7 +17,7 @@ from homeassistant.const import (
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pyalarmdotcom==0.3.0']
+REQUIREMENTS = ['pyalarmdotcom==0.3.1']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/alarm_control_panel/concord232.py

@@ -26,7 +26,7 @@ DEFAULT_HOST = 'localhost'
 DEFAULT_NAME = 'CONCORD232'
 DEFAULT_PORT = 5007
 
-SCAN_INTERVAL = timedelta(seconds=1)
+SCAN_INTERVAL = timedelta(seconds=10)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,

homeassistant/components/alarm_control_panel/egardia.py

@@ -4,130 +4,70 @@ Interfaces with Egardia/Woonveilig alarm control panel.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.egardia/
 """
+import asyncio
 import logging
 
 import requests
-import voluptuous as vol
 
 import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT, CONF_USERNAME,
-    EVENT_HOMEASSISTANT_STOP, STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
-import homeassistant.exceptions as exc
-import homeassistant.helpers.config_validation as cv
-
-REQUIREMENTS = ['pythonegardia==1.0.26']
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_TRIGGERED,
+    STATE_ALARM_ARMED_NIGHT)
+from homeassistant.components.egardia import (
+    EGARDIA_DEVICE, EGARDIA_SERVER,
+    REPORT_SERVER_CODES_IGNORE, CONF_REPORT_SERVER_CODES,
+    CONF_REPORT_SERVER_ENABLED, CONF_REPORT_SERVER_PORT
+    )
+DEPENDENCIES = ['egardia']
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_REPORT_SERVER_CODES = 'report_server_codes'
-CONF_REPORT_SERVER_ENABLED = 'report_server_enabled'
-CONF_REPORT_SERVER_PORT = 'report_server_port'
-CONF_REPORT_SERVER_CODES_IGNORE = 'ignore'
-CONF_VERSION = 'version'
-
-DEFAULT_NAME = 'Egardia'
-DEFAULT_PORT = 80
-DEFAULT_REPORT_SERVER_ENABLED = False
-DEFAULT_REPORT_SERVER_PORT = 52010
-DEFAULT_VERSION = 'GATE-01'
-DOMAIN = 'egardia'
-D_EGARDIASRV = 'egardiaserver'
-
-NOTIFICATION_ID = 'egardia_notification'
-NOTIFICATION_TITLE = 'Egardia'
-
 STATES = {
     'ARM': STATE_ALARM_ARMED_AWAY,
     'DAY HOME': STATE_ALARM_ARMED_HOME,
     'DISARM': STATE_ALARM_DISARMED,
+    'ARMHOME': STATE_ALARM_ARMED_HOME,
     'HOME': STATE_ALARM_ARMED_HOME,
-    'TRIGGERED': STATE_ALARM_TRIGGERED,
-    'UNKNOWN': STATE_UNKNOWN,
+    'NIGHT HOME': STATE_ALARM_ARMED_NIGHT,
+    'TRIGGERED': STATE_ALARM_TRIGGERED
 }
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST): cv.string,
-    vol.Required(CONF_PASSWORD): cv.string,
-    vol.Required(CONF_USERNAME): cv.string,
-    vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): cv.string,
-    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-    vol.Optional(CONF_REPORT_SERVER_CODES): vol.All(cv.ensure_list),
-    vol.Optional(CONF_REPORT_SERVER_ENABLED,
-                 default=DEFAULT_REPORT_SERVER_ENABLED): cv.boolean,
-    vol.Optional(CONF_REPORT_SERVER_PORT, default=DEFAULT_REPORT_SERVER_PORT):
-        cv.port,
-})
-
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up the Egardia platform."""
-    from pythonegardia import egardiadevice
-    from pythonegardia import egardiaserver
-
-    name = config.get(CONF_NAME)
-    username = config.get(CONF_USERNAME)
-    password = config.get(CONF_PASSWORD)
-    host = config.get(CONF_HOST)
-    port = config.get(CONF_PORT)
-    rs_enabled = config.get(CONF_REPORT_SERVER_ENABLED)
-    rs_port = config.get(CONF_REPORT_SERVER_PORT)
-    rs_codes = config.get(CONF_REPORT_SERVER_CODES)
-    version = config.get(CONF_VERSION)
-
-    try:
-        egardiasystem = egardiadevice.EgardiaDevice(
-            host, port, username, password, '', version)
-    except requests.exceptions.RequestException:
-        raise exc.PlatformNotReady()
-    except egardiadevice.UnauthorizedError:
-        _LOGGER.error("Unable to authorize. Wrong password or username")
+    if discovery_info is None:
         return
-
-    eg_dev = EgardiaAlarm(
-        name, egardiasystem, rs_enabled, rs_codes)
-
-    if rs_enabled:
-        # Set up the egardia server
-        _LOGGER.info("Setting up EgardiaServer")
-        try:
-            if D_EGARDIASRV not in hass.data:
-                server = egardiaserver.EgardiaServer('', rs_port)
-                bound = server.bind()
-                if not bound:
-                    raise IOError(
-                        "Binding error occurred while starting EgardiaServer")
-                hass.data[D_EGARDIASRV] = server
-                server.start()
-        except IOError:
-            return
-        hass.data[D_EGARDIASRV].register_callback(eg_dev.handle_status_event)
-
-    def handle_stop_event(event):
-        """Call function for Home Assistant stop event."""
-        hass.data[D_EGARDIASRV].stop()
-
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, handle_stop_event)
-
-    add_devices([eg_dev], True)
+    device = EgardiaAlarm(
+        discovery_info['name'],
+        hass.data[EGARDIA_DEVICE],
+        discovery_info[CONF_REPORT_SERVER_ENABLED],
+        discovery_info.get(CONF_REPORT_SERVER_CODES),
+        discovery_info[CONF_REPORT_SERVER_PORT])
+    # add egardia alarm device
+    add_devices([device], True)
 
 
 class EgardiaAlarm(alarm.AlarmControlPanel):
     """Representation of a Egardia alarm."""
 
-    def __init__(self, name, egardiasystem, rs_enabled=False, rs_codes=None):
+    def __init__(self, name, egardiasystem,
+                 rs_enabled=False, rs_codes=None, rs_port=52010):
         """Initialize the Egardia alarm."""
         self._name = name
         self._egardiasystem = egardiasystem
         self._status = None
         self._rs_enabled = rs_enabled
-        if rs_codes is not None:
-            self._rs_codes = rs_codes[0]
-        else:
-            self._rs_codes = rs_codes
+        self._rs_codes = rs_codes
+        self._rs_port = rs_port
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Add Egardiaserver callback if enabled."""
+        if self._rs_enabled:
+            _LOGGER.debug("Registering callback to Egardiaserver")
+            self.hass.data[EGARDIA_SERVER].register_callback(
+                self.handle_status_event)
 
     @property
     def name(self):
@@ -156,31 +96,20 @@ class EgardiaAlarm(alarm.AlarmControlPanel):
 
     def lookupstatusfromcode(self, statuscode):
         """Look at the rs_codes and returns the status from the code."""
-        status = 'UNKNOWN'
-        if self._rs_codes is not None:
-            statuscode = str(statuscode).strip()
-            for i in self._rs_codes:
-                val = str(self._rs_codes[i]).strip()
-                if ',' in val:
-                    splitted = val.split(',')
-                    for code in splitted:
-                        code = str(code).strip()
-                        if statuscode == code:
-                            status = i.upper()
-                            break
-                elif statuscode == val:
-                    status = i.upper()
-                    break
+        status = next((
+            status_group.upper() for status_group, codes
+            in self._rs_codes.items() for code in codes
+            if statuscode == code), 'UNKNOWN')
         return status
 
     def parsestatus(self, status):
         """Parse the status."""
         _LOGGER.debug("Parsing status %s", status)
         # Ignore the statuscode if it is IGNORE
-        if status.lower().strip() != CONF_REPORT_SERVER_CODES_IGNORE:
-            _LOGGER.debug("Not ignoring status")
-            newstatus = ([v for k, v in STATES.items()
-                          if status.upper() == k][0])
+        if status.lower().strip() != REPORT_SERVER_CODES_IGNORE:
+            _LOGGER.debug("Not ignoring status %s", status)
+            newstatus = STATES.get(status.upper())
+            _LOGGER.debug("newstatus %s", newstatus)
             self._status = newstatus
         else:
             _LOGGER.error("Ignoring status")

homeassistant/components/alarm_control_panel/ifttt.py

@@ -0,0 +1,170 @@
+"""
+Interfaces with alarm control panels that have to be controlled through IFTTT.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.ifttt/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.alarm_control_panel import (
+    DOMAIN, PLATFORM_SCHEMA)
+from homeassistant.components.ifttt import (
+    ATTR_EVENT, DOMAIN as IFTTT_DOMAIN, SERVICE_TRIGGER)
+from homeassistant.const import (
+    ATTR_ENTITY_ID, ATTR_STATE, CONF_NAME, CONF_CODE,
+    CONF_OPTIMISTIC, STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY)
+import homeassistant.helpers.config_validation as cv
+
+DEPENDENCIES = ['ifttt']
+
+_LOGGER = logging.getLogger(__name__)
+
+ALLOWED_STATES = [
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_NIGHT,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME]
+
+DATA_IFTTT_ALARM = 'ifttt_alarm'
+DEFAULT_NAME = "Home"
+
+CONF_EVENT_AWAY = "event_arm_away"
+CONF_EVENT_HOME = "event_arm_home"
+CONF_EVENT_NIGHT = "event_arm_night"
+CONF_EVENT_DISARM = "event_disarm"
+
+DEFAULT_EVENT_AWAY = "alarm_arm_away"
+DEFAULT_EVENT_HOME = "alarm_arm_home"
+DEFAULT_EVENT_NIGHT = "alarm_arm_night"
+DEFAULT_EVENT_DISARM = "alarm_disarm"
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_CODE): cv.string,
+    vol.Optional(CONF_EVENT_AWAY, default=DEFAULT_EVENT_AWAY): cv.string,
+    vol.Optional(CONF_EVENT_HOME, default=DEFAULT_EVENT_HOME): cv.string,
+    vol.Optional(CONF_EVENT_NIGHT, default=DEFAULT_EVENT_NIGHT): cv.string,
+    vol.Optional(CONF_EVENT_DISARM, default=DEFAULT_EVENT_DISARM): cv.string,
+    vol.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
+})
+
+SERVICE_PUSH_ALARM_STATE = "ifttt_push_alarm_state"
+
+PUSH_ALARM_STATE_SERVICE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_STATE): cv.string,
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up a control panel managed through IFTTT."""
+    if DATA_IFTTT_ALARM not in hass.data:
+        hass.data[DATA_IFTTT_ALARM] = []
+
+    name = config.get(CONF_NAME)
+    code = config.get(CONF_CODE)
+    event_away = config.get(CONF_EVENT_AWAY)
+    event_home = config.get(CONF_EVENT_HOME)
+    event_night = config.get(CONF_EVENT_NIGHT)
+    event_disarm = config.get(CONF_EVENT_DISARM)
+    optimistic = config.get(CONF_OPTIMISTIC)
+
+    alarmpanel = IFTTTAlarmPanel(name, code, event_away, event_home,
+                                 event_night, event_disarm, optimistic)
+    hass.data[DATA_IFTTT_ALARM].append(alarmpanel)
+    add_devices([alarmpanel])
+
+    async def push_state_update(service):
+        """Set the service state as device state attribute."""
+        entity_ids = service.data.get(ATTR_ENTITY_ID)
+        state = service.data.get(ATTR_STATE)
+        devices = hass.data[DATA_IFTTT_ALARM]
+        if entity_ids:
+            devices = [d for d in devices if d.entity_id in entity_ids]
+
+        for device in devices:
+            device.push_alarm_state(state)
+            device.async_schedule_update_ha_state()
+
+    hass.services.register(DOMAIN, SERVICE_PUSH_ALARM_STATE, push_state_update,
+                           schema=PUSH_ALARM_STATE_SERVICE_SCHEMA)
+
+
+class IFTTTAlarmPanel(alarm.AlarmControlPanel):
+    """Representation of an alarm control panel controlled throught IFTTT."""
+
+    def __init__(self, name, code, event_away, event_home, event_night,
+                 event_disarm, optimistic):
+        """Initialize the alarm control panel."""
+        self._name = name
+        self._code = code
+        self._event_away = event_away
+        self._event_home = event_home
+        self._event_night = event_night
+        self._event_disarm = event_disarm
+        self._optimistic = optimistic
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    @property
+    def assumed_state(self):
+        """Notify that this platform return an assumed state."""
+        return True
+
+    @property
+    def code_format(self):
+        """Return one or more characters."""
+        return None if self._code is None else '.+'
+
+    def alarm_disarm(self, code=None):
+        """Send disarm command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_disarm, STATE_ALARM_DISARMED)
+
+    def alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_away, STATE_ALARM_ARMED_AWAY)
+
+    def alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_home, STATE_ALARM_ARMED_HOME)
+
+    def alarm_arm_night(self, code=None):
+        """Send arm night command."""
+        if not self._check_code(code):
+            return
+        self.set_alarm_state(self._event_night, STATE_ALARM_ARMED_NIGHT)
+
+    def set_alarm_state(self, event, state):
+        """Call the IFTTT trigger service to change the alarm state."""
+        data = {ATTR_EVENT: event}
+
+        self.hass.services.call(IFTTT_DOMAIN, SERVICE_TRIGGER, data)
+        _LOGGER.debug("Called IFTTT component to trigger event %s", event)
+        if self._optimistic:
+            self._state = state
+
+    def push_alarm_state(self, value):
+        """Push the alarm state to the given value."""
+        if value in ALLOWED_STATES:
+            _LOGGER.debug("Pushed the alarm state to %s", value)
+            self._state = value
+
+    def _check_code(self, code):
+        return self._code is None or self._code == code

homeassistant/components/alarm_control_panel/services.yaml

@@ -69,3 +69,13 @@ alarmdecoder_alarm_toggle_chime:
     code:
       description: A required code to toggle the alarm control panel chime with.
       example: 1234
+
+ifttt_push_alarm_state:
+  description: Update the alarm state to the specified value.
+  fields:
+    entity_id:
+      description: Name of the alarm control panel which state has to be updated.
+      example: 'alarm_control_panel.downstairs'
+    state:
+      description: The state to which the alarm control panel has to be set.
+      example: 'armed_night'

homeassistant/components/alexa/smart_home.py

@@ -438,9 +438,7 @@ class _LightCapabilities(_AlexaEntity):
         supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
         if supported & light.SUPPORT_BRIGHTNESS:
             yield _AlexaBrightnessController(self.entity)
-        if supported & light.SUPPORT_RGB_COLOR:
-            yield _AlexaColorController(self.entity)
-        if supported & light.SUPPORT_XY_COLOR:
+        if supported & light.SUPPORT_COLOR:
             yield _AlexaColorController(self.entity)
         if supported & light.SUPPORT_COLOR_TEMP:
             yield _AlexaColorTemperatureController(self.entity)
@@ -842,25 +840,16 @@ def async_api_adjust_brightness(hass, config, request, entity):
 @asyncio.coroutine
 def async_api_set_color(hass, config, request, entity):
     """Process a set color request."""
-    supported = entity.attributes.get(ATTR_SUPPORTED_FEATURES)
     rgb = color_util.color_hsb_to_RGB(
         float(request[API_PAYLOAD]['color']['hue']),
         float(request[API_PAYLOAD]['color']['saturation']),
         float(request[API_PAYLOAD]['color']['brightness'])
     )
 
-    if supported & light.SUPPORT_RGB_COLOR > 0:
-        yield from hass.services.async_call(entity.domain, SERVICE_TURN_ON, {
-            ATTR_ENTITY_ID: entity.entity_id,
-            light.ATTR_RGB_COLOR: rgb,
-        }, blocking=False)
-    else:
-        xyz = color_util.color_RGB_to_xy(*rgb)
-        yield from hass.services.async_call(entity.domain, SERVICE_TURN_ON, {
-            ATTR_ENTITY_ID: entity.entity_id,
-            light.ATTR_XY_COLOR: (xyz[0], xyz[1]),
-            light.ATTR_BRIGHTNESS: xyz[2],
-        }, blocking=False)
+    yield from hass.services.async_call(entity.domain, SERVICE_TURN_ON, {
+        ATTR_ENTITY_ID: entity.entity_id,
+        light.ATTR_RGB_COLOR: rgb,
+    }, blocking=False)
 
     return api_message(request)
 

homeassistant/components/api.py

@@ -131,8 +131,7 @@ class APIEventStream(HomeAssistantView):
                     msg = "data: {}\n\n".format(payload)
                     _LOGGER.debug('STREAM %s WRITING %s', id(stop_obj),
                                   msg.strip())
-                    response.write(msg.encode("UTF-8"))
-                    yield from response.drain()
+                    yield from response.write(msg.encode("UTF-8"))
                 except asyncio.TimeoutError:
                     yield from to_write.put(STREAM_PING_PAYLOAD)
 

homeassistant/components/august.py

@@ -21,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 
 _CONFIGURING = {}
 
-REQUIREMENTS = ['py-august==0.3.0']
+REQUIREMENTS = ['py-august==0.4.0']
 
 DEFAULT_TIMEOUT = 10
 ACTIVITY_FETCH_LIMIT = 10
@@ -159,7 +159,7 @@ class AugustData:
         self._api = api
         self._access_token = access_token
         self._doorbells = self._api.get_doorbells(self._access_token) or []
-        self._locks = self._api.get_locks(self._access_token) or []
+        self._locks = self._api.get_operable_locks(self._access_token) or []
         self._house_ids = [d.house_id for d in self._doorbells + self._locks]
 
         self._doorbell_detail_by_id = {}

homeassistant/components/binary_sensor/__init__.py

@@ -4,7 +4,7 @@ Component to interface with binary sensors.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor/
 """
-import asyncio
+
 from datetime import timedelta
 import logging
 
@@ -28,6 +28,7 @@ DEVICE_CLASSES = [
     'gas',           # On means gas detected, Off means no gas (clear)
     'heat',          # On means hot, Off means normal
     'light',         # On means light detected, Off means no light
+    'lock',          # On means open (unlocked), Off means closed (locked)
     'moisture',      # On means wet, Off means dry
     'motion',        # On means motion detected, Off means no motion (clear)
     'moving',        # On means moving, Off means not moving (stopped)
@@ -47,13 +48,12 @@ DEVICE_CLASSES = [
 DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.In(DEVICE_CLASSES))
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Track states and offer events for binary sensors."""
     component = EntityComponent(
         logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
 
-    yield from component.async_setup(config)
+    await component.async_setup(config)
     return True
 
 

homeassistant/components/binary_sensor/bmw_connected_drive.py

@@ -0,0 +1,118 @@
+"""
+Reads vehicle status from BMW connected drive portal.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.bmw_connected_drive/
+"""
+import asyncio
+import logging
+
+from homeassistant.components.bmw_connected_drive import DOMAIN as BMW_DOMAIN
+from homeassistant.components.binary_sensor import BinarySensorDevice
+
+DEPENDENCIES = ['bmw_connected_drive']
+
+_LOGGER = logging.getLogger(__name__)
+
+SENSOR_TYPES = {
+    'lids': ['Doors', 'opening'],
+    'windows': ['Windows', 'opening'],
+    'door_lock_state': ['Door lock state', 'safety']
+}
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the BMW sensors."""
+    accounts = hass.data[BMW_DOMAIN]
+    _LOGGER.debug('Found BMW accounts: %s',
+                  ', '.join([a.name for a in accounts]))
+    devices = []
+    for account in accounts:
+        for vehicle in account.account.vehicles:
+            for key, value in sorted(SENSOR_TYPES.items()):
+                device = BMWConnectedDriveSensor(account, vehicle, key,
+                                                 value[0], value[1])
+                devices.append(device)
+    add_devices(devices, True)
+
+
+class BMWConnectedDriveSensor(BinarySensorDevice):
+    """Representation of a BMW vehicle binary sensor."""
+
+    def __init__(self, account, vehicle, attribute: str, sensor_name,
+                 device_class):
+        """Constructor."""
+        self._account = account
+        self._vehicle = vehicle
+        self._attribute = attribute
+        self._name = '{} {}'.format(self._vehicle.modelName, self._attribute)
+        self._sensor_name = sensor_name
+        self._device_class = device_class
+        self._state = None
+
+    @property
+    def should_poll(self) -> bool:
+        """Data update is triggered from BMWConnectedDriveEntity."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the binary sensor."""
+        return self._name
+
+    @property
+    def device_class(self):
+        """Return the class of the binary sensor."""
+        return self._device_class
+
+    @property
+    def is_on(self):
+        """Return the state of the binary sensor."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes of the binary sensor."""
+        vehicle_state = self._vehicle.state
+        result = {
+            'car': self._vehicle.modelName
+        }
+
+        if self._attribute == 'lids':
+            for lid in vehicle_state.lids:
+                result[lid.name] = lid.state.value
+        elif self._attribute == 'windows':
+            for window in vehicle_state.windows:
+                result[window.name] = window.state.value
+        elif self._attribute == 'door_lock_state':
+            result['door_lock_state'] = vehicle_state.door_lock_state.value
+
+        return result
+
+    def update(self):
+        """Read new state data from the library."""
+        vehicle_state = self._vehicle.state
+
+        # device class opening: On means open, Off means closed
+        if self._attribute == 'lids':
+            _LOGGER.debug("Status of lid: %s", vehicle_state.all_lids_closed)
+            self._state = not vehicle_state.all_lids_closed
+        if self._attribute == 'windows':
+            self._state = not vehicle_state.all_windows_closed
+        # device class safety: On means unsafe, Off means safe
+        if self._attribute == 'door_lock_state':
+            # Possible values: LOCKED, SECURED, SELECTIVELOCKED, UNLOCKED
+            self._state = bool(vehicle_state.door_lock_state.value
+                               in ('SELECTIVELOCKED', 'UNLOCKED'))
+
+    def update_callback(self):
+        """Schedule a state update."""
+        self.schedule_update_ha_state(True)
+
+    @asyncio.coroutine
+    def async_added_to_hass(self):
+        """Add callback after being added to hass.
+
+        Show latest data after startup.
+        """
+        self._account.add_update_listener(self.update_callback)

homeassistant/components/binary_sensor/concord232.py

@@ -27,7 +27,7 @@ DEFAULT_NAME = 'Alarm'
 DEFAULT_PORT = '5007'
 DEFAULT_SSL = False
 
-SCAN_INTERVAL = datetime.timedelta(seconds=1)
+SCAN_INTERVAL = datetime.timedelta(seconds=10)
 
 ZONE_TYPES_SCHEMA = vol.Schema({
     cv.positive_int: vol.In(DEVICE_CLASSES),

homeassistant/components/binary_sensor/deconz.py

@@ -4,8 +4,6 @@ Support for deCONZ binary sensor.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.deconz/
 """
-import asyncio
-
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.deconz import (
     DOMAIN as DATA_DECONZ, DATA_DECONZ_ID)
@@ -15,8 +13,8 @@ from homeassistant.core import callback
 DEPENDENCIES = ['deconz']
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
     """Set up the deCONZ binary sensor."""
     if discovery_info is None:
         return
@@ -25,8 +23,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     sensors = hass.data[DATA_DECONZ].sensors
     entities = []
 
-    for key in sorted(sensors.keys(), key=int):
-        sensor = sensors[key]
+    for sensor in sensors.values():
         if sensor and sensor.type in DECONZ_BINARY_SENSOR:
             entities.append(DeconzBinarySensor(sensor))
     async_add_devices(entities, True)
@@ -39,8 +36,7 @@ class DeconzBinarySensor(BinarySensorDevice):
         """Set up sensor and add update callback to get data from websocket."""
         self._sensor = sensor
 
-    @asyncio.coroutine
-    def async_added_to_hass(self):
+    async def async_added_to_hass(self):
         """Subscribe sensors events."""
         self._sensor.register_async_callback(self.async_update_callback)
         self.hass.data[DATA_DECONZ_ID][self.entity_id] = self._sensor.deconz_id
@@ -96,9 +92,9 @@ class DeconzBinarySensor(BinarySensorDevice):
     def device_state_attributes(self):
         """Return the state attributes of the sensor."""
         from pydeconz.sensor import PRESENCE
-        attr = {
-            ATTR_BATTERY_LEVEL: self._sensor.battery,
-        }
-        if self._sensor.type in PRESENCE:
+        attr = {}
+        if self._sensor.battery:
+            attr[ATTR_BATTERY_LEVEL] = self._sensor.battery
+        if self._sensor.type in PRESENCE and self._sensor.dark:
             attr['dark'] = self._sensor.dark
         return attr

homeassistant/components/binary_sensor/egardia.py

@@ -0,0 +1,78 @@
+"""
+Interfaces with Egardia/Woonveilig alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.egardia/
+"""
+import asyncio
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.const import STATE_ON, STATE_OFF
+from homeassistant.components.egardia import (
+    EGARDIA_DEVICE, ATTR_DISCOVER_DEVICES)
+_LOGGER = logging.getLogger(__name__)
+DEPENDENCIES = ['egardia']
+EGARDIA_TYPE_TO_DEVICE_CLASS = {'IR Sensor': 'motion',
+                                'Door Contact': 'opening',
+                                'IR': 'motion'}
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Initialize the platform."""
+    if (discovery_info is None or
+            discovery_info[ATTR_DISCOVER_DEVICES] is None):
+        return
+
+    disc_info = discovery_info[ATTR_DISCOVER_DEVICES]
+    # multiple devices here!
+    async_add_devices(
+        (
+            EgardiaBinarySensor(
+                sensor_id=disc_info[sensor]['id'],
+                name=disc_info[sensor]['name'],
+                egardia_system=hass.data[EGARDIA_DEVICE],
+                device_class=EGARDIA_TYPE_TO_DEVICE_CLASS.get(
+                    disc_info[sensor]['type'], None)
+            )
+            for sensor in disc_info
+        ), True)
+
+
+class EgardiaBinarySensor(BinarySensorDevice):
+    """Represents a sensor based on an Egardia sensor (IR, Door Contact)."""
+
+    def __init__(self, sensor_id, name, egardia_system, device_class):
+        """Initialize the sensor device."""
+        self._id = sensor_id
+        self._name = name
+        self._state = None
+        self._device_class = device_class
+        self._egardia_system = egardia_system
+
+    def update(self):
+        """Update the status."""
+        egardia_input = self._egardia_system.getsensorstate(self._id)
+        self._state = STATE_ON if egardia_input else STATE_OFF
+
+    @property
+    def name(self):
+        """The name of the device."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Whether the device is switched on."""
+        return self._state == STATE_ON
+
+    @property
+    def hidden(self):
+        """Whether the device is hidden by default."""
+        # these type of sensors are probably mainly used for automations
+        return True
+
+    @property
+    def device_class(self):
+        """The device class."""
+        return self._device_class

homeassistant/components/binary_sensor/hikvision.py

@@ -18,7 +18,7 @@ from homeassistant.const import (
     CONF_SSL, EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START,
     ATTR_LAST_TRIP_TIME, CONF_CUSTOMIZE)
 
-REQUIREMENTS = ['pyhik==0.1.4']
+REQUIREMENTS = ['pyhik==0.1.8']
 _LOGGER = logging.getLogger(__name__)
 
 CONF_IGNORED = 'ignored'
@@ -48,6 +48,9 @@ DEVICE_CLASS_MAP = {
     'Face Detection': 'motion',
     'Scene Change Detection': 'motion',
     'I/O': None,
+    'Unattended Baggage': 'motion',
+    'Attended Baggage': 'motion',
+    'Recording Failure': None,
 }
 
 CUSTOMIZE_SCHEMA = vol.Schema({
@@ -211,7 +214,7 @@ class HikvisionBinarySensor(BinarySensorDevice):
 
     @property
     def unique_id(self):
-        """Return an unique ID."""
+        """Return a unique ID."""
         return self._id
 
     @property

homeassistant/components/binary_sensor/insteon_plm.py

@@ -2,86 +2,56 @@
 Support for INSTEON dimmers via PowerLinc Modem.
 
 For more details about this component, please refer to the documentation at
-https://home-assistant.io/components/insteon_plm/
+https://home-assistant.io/components/binary_sensor.insteon_plm/
 """
-import logging
 import asyncio
+import logging
 
-from homeassistant.core import callback
 from homeassistant.components.binary_sensor import BinarySensorDevice
-from homeassistant.loader import get_component
+from homeassistant.components.insteon_plm import InsteonPLMEntity
 
 DEPENDENCIES = ['insteon_plm']
 
 _LOGGER = logging.getLogger(__name__)
 
+SENSOR_TYPES = {'openClosedSensor': 'opening',
+                'motionSensor': 'motion',
+                'doorSensor': 'door',
+                'leakSensor': 'moisture'}
+
 
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     """Set up the INSTEON PLM device class for the hass platform."""
     plm = hass.data['insteon_plm']
 
-    device_list = []
-    for device in discovery_info:
-        name = device.get('address')
-        address = device.get('address_hex')
+    address = discovery_info['address']
+    device = plm.devices[address]
+    state_key = discovery_info['state_key']
 
-        _LOGGER.info('Registered %s with binary_sensor platform.', name)
+    _LOGGER.debug('Adding device %s entity %s to Binary Sensor platform',
+                  device.address.hex, device.states[state_key].name)
 
-        device_list.append(
-            InsteonPLMBinarySensorDevice(hass, plm, address, name)
-        )
+    new_entity = InsteonPLMBinarySensor(device, state_key)
 
-    async_add_devices(device_list)
+    async_add_devices([new_entity])
 
 
-class InsteonPLMBinarySensorDevice(BinarySensorDevice):
-    """A Class for an Insteon device."""
+class InsteonPLMBinarySensor(InsteonPLMEntity, BinarySensorDevice):
+    """A Class for an Insteon device entity."""
 
-    def __init__(self, hass, plm, address, name):
-        """Initialize the binarysensor."""
-        self._hass = hass
-        self._plm = plm.protocol
-        self._address = address
-        self._name = name
-
-        self._plm.add_update_callback(
-            self.async_binarysensor_update, {'address': self._address})
+    def __init__(self, device, state_key):
+        """Initialize the INSTEON PLM binary sensor."""
+        super().__init__(device, state_key)
+        self._sensor_type = SENSOR_TYPES.get(self._insteon_device_state.name)
 
     @property
-    def should_poll(self):
-        """No polling needed."""
-        return False
-
-    @property
-    def address(self):
-        """Return the address of the node."""
-        return self._address
-
-    @property
-    def name(self):
-        """Return the name of the node."""
-        return self._name
+    def device_class(self):
+        """Return the class of this sensor."""
+        return self._sensor_type
 
     @property
     def is_on(self):
         """Return the boolean response if the node is on."""
-        sensorstate = self._plm.get_device_attr(self._address, 'sensorstate')
-        _LOGGER.info("Sensor state for %s is %s", self._address, sensorstate)
+        sensorstate = self._insteon_device_state.value
         return bool(sensorstate)
-
-    @property
-    def device_state_attributes(self):
-        """Provide attributes for display on device card."""
-        insteon_plm = get_component('insteon_plm')
-        return insteon_plm.common_attributes(self)
-
-    def get_attr(self, key):
-        """Return specified attribute for this device."""
-        return self._plm.get_device_attr(self.address, key)
-
-    @callback
-    def async_binarysensor_update(self, message):
-        """Receive notification from transport that new data exists."""
-        _LOGGER.info("Received update callback from PLM for %s", self._address)
-        self._hass.async_add_job(self.async_update_ha_state())

homeassistant/components/binary_sensor/isy994.py

@@ -56,24 +56,17 @@ def setup_platform(hass, config: ConfigType,
         else:
             device_type = _detect_device_type(node)
             subnode_id = int(node.nid[-1])
-            if device_type == 'opening':
-                # Door/window sensors use an optional "negative" node
-                if subnode_id == 4:
+            if (device_type == 'opening' or device_type == 'moisture'):
+                # These sensors use an optional "negative" subnode 2 to snag
+                # all state changes
+                if subnode_id == 2:
+                    parent_device.add_negative_node(node)
+                elif subnode_id == 4:
                     # Subnode 4 is the heartbeat node, which we will represent
                     # as a separate binary_sensor
                     device = ISYBinarySensorHeartbeat(node, parent_device)
                     parent_device.add_heartbeat_device(device)
                     devices.append(device)
-                elif subnode_id == 2:
-                    parent_device.add_negative_node(node)
-            elif device_type == 'moisture':
-                # Moisture nodes have a subnode 2, but we ignore it because
-                # it's just the inverse of the primary node.
-                if subnode_id == 4:
-                    # Heartbeat node
-                    device = ISYBinarySensorHeartbeat(node, parent_device)
-                    parent_device.add_heartbeat_device(device)
-                    devices.append(device)
             else:
                 # We don't yet have any special logic for other sensor types,
                 # so add the nodes as individual devices

homeassistant/components/binary_sensor/knx.py

@@ -4,7 +4,6 @@ Support for KNX/IP binary sensors.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.knx/
 """
-import asyncio
 
 import voluptuous as vol
 
@@ -26,6 +25,7 @@ CONF_DEFAULT_HOOK = 'on'
 CONF_COUNTER = 'counter'
 CONF_DEFAULT_COUNTER = 1
 CONF_ACTION = 'action'
+CONF_RESET_AFTER = 'reset_after'
 
 CONF__ACTION = 'turn_off_action'
 
@@ -49,12 +49,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_DEVICE_CLASS): cv.string,
     vol.Optional(CONF_SIGNIFICANT_BIT, default=CONF_DEFAULT_SIGNIFICANT_BIT):
         cv.positive_int,
+    vol.Optional(CONF_RESET_AFTER): cv.positive_int,
     vol.Optional(CONF_AUTOMATION): AUTOMATIONS_SCHEMA,
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
     """Set up binary sensor(s) for KNX platform."""
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
@@ -82,7 +83,8 @@ def async_add_devices_config(hass, config, async_add_devices):
         name=name,
         group_address=config.get(CONF_ADDRESS),
         device_class=config.get(CONF_DEVICE_CLASS),
-        significant_bit=config.get(CONF_SIGNIFICANT_BIT))
+        significant_bit=config.get(CONF_SIGNIFICANT_BIT),
+        reset_after=config.get(CONF_RESET_AFTER))
     hass.data[DATA_KNX].xknx.devices.add(binary_sensor)
 
     entity = KNXBinarySensor(hass, binary_sensor)
@@ -111,11 +113,10 @@ class KNXBinarySensor(BinarySensorDevice):
     @callback
     def async_register_callbacks(self):
         """Register callbacks to update hass after device was changed."""
-        @asyncio.coroutine
-        def after_update_callback(device):
+        async def after_update_callback(device):
             """Call after device was updated."""
             # pylint: disable=unused-argument
-            yield from self.async_update_ha_state()
+            await self.async_update_ha_state()
         self.device.register_device_updated_cb(after_update_callback)
 
     @property

homeassistant/components/binary_sensor/mysensors.py

@@ -9,6 +9,17 @@ from homeassistant.components.binary_sensor import (
     DEVICE_CLASSES, DOMAIN, BinarySensorDevice)
 from homeassistant.const import STATE_ON
 
+SENSORS = {
+    'S_DOOR': 'door',
+    'S_MOTION': 'motion',
+    'S_SMOKE': 'smoke',
+    'S_SPRINKLER': 'safety',
+    'S_WATER_LEAK': 'safety',
+    'S_SOUND': 'sound',
+    'S_VIBRATION': 'vibration',
+    'S_MOISTURE': 'moisture',
+}
+
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up the MySensors platform for binary sensors."""
@@ -29,18 +40,7 @@ class MySensorsBinarySensor(mysensors.MySensorsEntity, BinarySensorDevice):
     def device_class(self):
         """Return the class of this sensor, from DEVICE_CLASSES."""
         pres = self.gateway.const.Presentation
-        class_map = {
-            pres.S_DOOR: 'opening',
-            pres.S_MOTION: 'motion',
-            pres.S_SMOKE: 'smoke',
-        }
-        if float(self.gateway.protocol_version) >= 1.5:
-            class_map.update({
-                pres.S_SPRINKLER: 'sprinkler',
-                pres.S_WATER_LEAK: 'leak',
-                pres.S_SOUND: 'sound',
-                pres.S_VIBRATION: 'vibration',
-                pres.S_MOISTURE: 'moisture',
-            })
-        if class_map.get(self.child_type) in DEVICE_CLASSES:
-            return class_map.get(self.child_type)
+        device_class = SENSORS.get(pres(self.child_type).name)
+        if device_class in DEVICE_CLASSES:
+            return device_class
+        return None

homeassistant/components/binary_sensor/rfxtrx.py

@@ -55,13 +55,13 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         if device_id in rfxtrx.RFX_DEVICES:
             continue
 
-        if entity[CONF_DATA_BITS] is not None:
+        if entity.get(CONF_DATA_BITS) is not None:
             _LOGGER.debug(
                 "Masked device id: %s", rfxtrx.get_pt2262_deviceid(
-                    device_id, entity[CONF_DATA_BITS]))
+                    device_id, entity.get(CONF_DATA_BITS)))
 
         _LOGGER.debug("Add %s rfxtrx.binary_sensor (class %s)",
-                      entity[ATTR_NAME], entity[CONF_DEVICE_CLASS])
+                      entity[ATTR_NAME], entity.get(CONF_DEVICE_CLASS))
 
         device = RfxtrxBinarySensor(
             event, entity.get(CONF_NAME), entity.get(CONF_DEVICE_CLASS),

homeassistant/components/binary_sensor/trend.py

@@ -23,7 +23,7 @@ from homeassistant.helpers.entity import generate_entity_id
 from homeassistant.helpers.event import async_track_state_change
 from homeassistant.util import utcnow
 
-REQUIREMENTS = ['numpy==1.14.0']
+REQUIREMENTS = ['numpy==1.14.2']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/binary_sensor/upcloud.py

@@ -0,0 +1,38 @@
+"""
+Support for monitoring the state of UpCloud servers.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.upcloud/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.binary_sensor import (
+    BinarySensorDevice, PLATFORM_SCHEMA)
+from homeassistant.components.upcloud import (
+    UpCloudServerEntity, CONF_SERVERS, DATA_UPCLOUD)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['upcloud']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_SERVERS): vol.All(cv.ensure_list, [cv.string]),
+})
+
+
+def setup_platform(hass, config, add_devices, discovery_info=None):
+    """Set up the UpCloud server binary sensor."""
+    upcloud = hass.data[DATA_UPCLOUD]
+
+    servers = config.get(CONF_SERVERS)
+
+    devices = [UpCloudBinarySensor(upcloud, uuid) for uuid in servers]
+
+    add_devices(devices, True)
+
+
+class UpCloudBinarySensor(UpCloudServerEntity, BinarySensorDevice):
+    """Representation of an UpCloud server sensor."""

homeassistant/components/binary_sensor/workday.py

@@ -17,7 +17,7 @@ import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['holidays==0.9.3']
+REQUIREMENTS = ['holidays==0.9.4']
 
 # List of all countries currently supported by holidays
 # There seems to be no way to get the list out at runtime

homeassistant/components/binary_sensor/xiaomi_aqara.py

@@ -319,7 +319,10 @@ class XiaomiButton(XiaomiBinarySensor):
             click_type = 'double'
         elif value == 'both_click':
             click_type = 'both'
+        elif value == 'shake':
+            click_type = 'shake'
         else:
+            _LOGGER.warning("Unsupported click_type detected: %s", value)
             return False
 
         self._hass.bus.fire('click', {

homeassistant/components/binary_sensor/zha.py

@@ -4,7 +4,6 @@ Binary sensors on Zigbee Home Automation networks.
 For more details on this platform, please refer to the documentation
 at https://home-assistant.io/components/binary_sensor.zha/
 """
-import asyncio
 import logging
 
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
@@ -25,8 +24,8 @@ CLASS_MAPPING = {
 }
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
     """Set up the Zigbee Home Automation binary sensors."""
     discovery_info = zha.get_discovery_info(hass, discovery_info)
     if discovery_info is None:
@@ -39,19 +38,19 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     device_class = None
     cluster = in_clusters[IasZone.cluster_id]
     if discovery_info['new_join']:
-        yield from cluster.bind()
+        await cluster.bind()
         ieee = cluster.endpoint.device.application.ieee
-        yield from cluster.write_attributes({'cie_addr': ieee})
+        await cluster.write_attributes({'cie_addr': ieee})
 
     try:
-        zone_type = yield from cluster['zone_type']
+        zone_type = await cluster['zone_type']
         device_class = CLASS_MAPPING.get(zone_type, None)
     except Exception:  # pylint: disable=broad-except
         # If we fail to read from the device, use a non-specific class
         pass
 
     sensor = BinarySensor(device_class, **discovery_info)
-    async_add_devices([sensor])
+    async_add_devices([sensor], update_before_add=True)
 
 
 class BinarySensor(zha.Entity, BinarySensorDevice):
@@ -66,6 +65,11 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
         from zigpy.zcl.clusters.security import IasZone
         self._ias_zone_cluster = self._in_clusters[IasZone.cluster_id]
 
+    @property
+    def should_poll(self) -> bool:
+        """Let zha handle polling."""
+        return False
+
     @property
     def is_on(self) -> bool:
         """Return True if entity is on."""
@@ -83,7 +87,18 @@ class BinarySensor(zha.Entity, BinarySensorDevice):
         if command_id == 0:
             self._state = args[0] & 3
             _LOGGER.debug("Updated alarm state: %s", self._state)
-            self.schedule_update_ha_state()
+            self.async_schedule_update_ha_state()
         elif command_id == 1:
             _LOGGER.debug("Enroll requested")
-            self.hass.add_job(self._ias_zone_cluster.enroll_response(0, 0))
+            res = self._ias_zone_cluster.enroll_response(0, 0)
+            self.hass.async_add_job(res)
+
+    async def async_update(self):
+        """Retrieve latest state."""
+        from bellows.types.basic import uint16_t
+
+        result = await zha.safe_read(self._endpoint.ias_zone,
+                                     ['zone_status'])
+        state = result.get('zone_status', self._state)
+        if isinstance(state, (int, uint16_t)):
+            self._state = result.get('zone_status', self._state) & 3

homeassistant/components/bmw_connected_drive.py

@@ -16,7 +16,7 @@ from homeassistant.const import (
     CONF_USERNAME, CONF_PASSWORD
 )
 
-REQUIREMENTS = ['bimmer_connected==0.3.0']
+REQUIREMENTS = ['bimmer_connected==0.4.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,7 +37,7 @@ CONFIG_SCHEMA = vol.Schema({
 }, extra=vol.ALLOW_EXTRA)
 
 
-BMW_COMPONENTS = ['device_tracker', 'sensor']
+BMW_COMPONENTS = ['binary_sensor', 'device_tracker', 'lock', 'sensor']
 UPDATE_INTERVAL = 5  # in minutes
 
 

homeassistant/components/calendar/caldav.py

@@ -194,7 +194,9 @@ class WebDavCalendarData(object):
     @staticmethod
     def is_over(vevent):
         """Return if the event is over."""
-        return dt.now() > WebDavCalendarData.get_end_date(vevent)
+        return dt.now() >= WebDavCalendarData.to_datetime(
+            WebDavCalendarData.get_end_date(vevent)
+        )
 
     @staticmethod
     def get_hass_date(obj):
@@ -230,4 +232,4 @@ class WebDavCalendarData(object):
         else:
             enddate = obj.dtstart.value + timedelta(days=1)
 
-        return WebDavCalendarData.to_datetime(enddate)
+        return enddate

homeassistant/components/calendar/todoist.py

@@ -496,6 +496,10 @@ class TodoistProjectData(object):
             # We had no valid tasks
             return True
 
+        # Make sure the task collection is reset to prevent an
+        # infinite collection repeating the same tasks
+        self.all_project_tasks.clear()
+
         # Organize the best tasks (so users can see all the tasks
         # they have, organized)
         while project_tasks:

homeassistant/components/camera/__init__.py

@@ -264,9 +264,9 @@ class Camera(Entity):
                                  'boundary=--frameboundary')
         yield from response.prepare(request)
 
-        def write(img_bytes):
+        async def write(img_bytes):
             """Write image to stream."""
-            response.write(bytes(
+            await response.write(bytes(
                 '--frameboundary\r\n'
                 'Content-Type: {}\r\n'
                 'Content-Length: {}\r\n\r\n'.format(
@@ -282,15 +282,14 @@ class Camera(Entity):
                     break
 
                 if img_bytes and img_bytes != last_image:
-                    write(img_bytes)
+                    yield from write(img_bytes)
 
                     # Chrome seems to always ignore first picture,
                     # print it twice.
                     if last_image is None:
-                        write(img_bytes)
+                        yield from write(img_bytes)
 
                     last_image = img_bytes
-                    yield from response.drain()
 
                 yield from asyncio.sleep(.5)
 

homeassistant/components/camera/arlo.py

@@ -49,8 +49,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up an Arlo IP Camera."""
     arlo = hass.data.get(DATA_ARLO)
     if not arlo:
@@ -60,7 +59,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     for camera in arlo.cameras:
         cameras.append(ArloCam(hass, camera, config))
 
-    async_add_devices(cameras, True)
+    add_devices(cameras, True)
 
 
 class ArloCam(Camera):

homeassistant/components/camera/generic.py

@@ -21,7 +21,7 @@ from homeassistant.components.camera import (
     PLATFORM_SCHEMA, DEFAULT_CONTENT_TYPE, Camera)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers import config_validation as cv
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/camera/onvif.py

@@ -6,6 +6,7 @@ https://home-assistant.io/components/camera.onvif/
 """
 import asyncio
 import logging
+import os
 
 import voluptuous as vol
 
@@ -33,6 +34,9 @@ DEFAULT_PORT = 5000
 DEFAULT_USERNAME = 'admin'
 DEFAULT_PASSWORD = '888888'
 DEFAULT_ARGUMENTS = '-q:v 2'
+DEFAULT_PROFILE = 0
+
+CONF_PROFILE = "profile"
 
 ATTR_PAN = "pan"
 ATTR_TILT = "tilt"
@@ -57,6 +61,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
     vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
     vol.Optional(CONF_EXTRA_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
+    vol.Optional(CONF_PROFILE, default=DEFAULT_PROFILE):
+        vol.All(vol.Coerce(int), vol.Range(min=0)),
 })
 
 SERVICE_PTZ_SCHEMA = vol.Schema({
@@ -67,8 +73,7 @@ SERVICE_PTZ_SCHEMA = vol.Schema({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up a ONVIF camera."""
     if not hass.data[DATA_FFMPEG].async_run_test(config.get(CONF_HOST)):
         return
@@ -91,7 +96,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 
     hass.services.async_register(DOMAIN, SERVICE_PTZ, handle_ptz,
                                  schema=SERVICE_PTZ_SCHEMA)
-    async_add_devices([ONVIFHassCamera(hass, config)])
+    add_devices([ONVIFHassCamera(hass, config)])
 
 
 class ONVIFHassCamera(Camera):
@@ -99,85 +104,128 @@ class ONVIFHassCamera(Camera):
 
     def __init__(self, hass, config):
         """Initialize a ONVIF camera."""
-        from onvif import ONVIFCamera, exceptions
         super().__init__()
+        import onvif
 
+        self._username = config.get(CONF_USERNAME)
+        self._password = config.get(CONF_PASSWORD)
+        self._host = config.get(CONF_HOST)
+        self._port = config.get(CONF_PORT)
         self._name = config.get(CONF_NAME)
         self._ffmpeg_arguments = config.get(CONF_EXTRA_ARGUMENTS)
+        self._profile_index = config.get(CONF_PROFILE)
         self._input = None
-        camera = None
+        self._media_service = \
+            onvif.ONVIFService('http://{}:{}/onvif/device_service'.format(
+                self._host, self._port),
+                               self._username, self._password,
+                               '{}/wsdl/media.wsdl'.format(os.path.dirname(
+                                   onvif.__file__)))
+
+        self._ptz_service = \
+            onvif.ONVIFService('http://{}:{}/onvif/device_service'.format(
+                self._host, self._port),
+                               self._username, self._password,
+                               '{}/wsdl/ptz.wsdl'.format(os.path.dirname(
+                                   onvif.__file__)))
+
+    def obtain_input_uri(self):
+        """Set the input uri for the camera."""
+        from onvif import exceptions
+        _LOGGER.debug("Connecting with ONVIF Camera: %s on port %s",
+                      self._host, self._port)
+
         try:
-            _LOGGER.debug("Connecting with ONVIF Camera: %s on port %s",
-                          config.get(CONF_HOST), config.get(CONF_PORT))
-            camera = ONVIFCamera(
-                config.get(CONF_HOST), config.get(CONF_PORT),
-                config.get(CONF_USERNAME), config.get(CONF_PASSWORD)
-            )
-            media_service = camera.create_media_service()
-            stream_uri = media_service.GetStreamUri(
-                {'StreamSetup': {'Stream': 'RTP-Unicast', 'Transport': 'RTSP'}}
-                )
-            self._input = stream_uri.Uri.replace(
-                'rtsp://', 'rtsp://{}:{}@'.format(
-                    config.get(CONF_USERNAME),
-                    config.get(CONF_PASSWORD)), 1)
+            profiles = self._media_service.GetProfiles()
+
+            if self._profile_index >= len(profiles):
+                _LOGGER.warning("ONVIF Camera '%s' doesn't provide profile %d."
+                                " Using the last profile.",
+                                self._name, self._profile_index)
+                self._profile_index = -1
+
+            req = self._media_service.create_type('GetStreamUri')
+
+            # pylint: disable=protected-access
+            req.ProfileToken = profiles[self._profile_index]._token
+            uri_no_auth = self._media_service.GetStreamUri(req).Uri
+            uri_for_log = uri_no_auth.replace(
+                'rtsp://', 'rtsp://<user>:<password>@', 1)
+            self._input = uri_no_auth.replace(
+                'rtsp://', 'rtsp://{}:{}@'.format(self._username,
+                                                  self._password), 1)
             _LOGGER.debug(
                 "ONVIF Camera Using the following URL for %s: %s",
-                self._name, self._input)
-        except Exception as err:
-            _LOGGER.error("Unable to communicate with ONVIF Camera: %s", err)
-            raise
-        try:
-            self._ptz = camera.create_ptz_service()
+                self._name, uri_for_log)
+            # we won't need the media service anymore
+            self._media_service = None
         except exceptions.ONVIFError as err:
-            self._ptz = None
-            _LOGGER.warning("Unable to setup PTZ for ONVIF Camera: %s", err)
+            _LOGGER.debug("Couldn't setup camera '%s'. Error: %s",
+                          self._name, err)
+            return
 
     def perform_ptz(self, pan, tilt, zoom):
         """Perform a PTZ action on the camera."""
-        if self._ptz:
+        from onvif import exceptions
+        if self._ptz_service:
             pan_val = 1 if pan == DIR_RIGHT else -1 if pan == DIR_LEFT else 0
             tilt_val = 1 if tilt == DIR_UP else -1 if tilt == DIR_DOWN else 0
             zoom_val = 1 if zoom == ZOOM_IN else -1 if zoom == ZOOM_OUT else 0
             req = {"Velocity": {
                 "PanTilt": {"_x": pan_val, "_y": tilt_val},
                 "Zoom": {"_x": zoom_val}}}
-            self._ptz.ContinuousMove(req)
+            try:
+                self._ptz_service.ContinuousMove(req)
+            except exceptions.ONVIFError as err:
+                if "Bad Request" in err.reason:
+                    self._ptz_service = None
+                    _LOGGER.debug("Camera '%s' doesn't support PTZ.",
+                                  self._name)
+        else:
+            _LOGGER.debug("Camera '%s' doesn't support PTZ.", self._name)
 
-    @asyncio.coroutine
-    def async_added_to_hass(self):
+    async def async_added_to_hass(self):
         """Callback when entity is added to hass."""
         if ONVIF_DATA not in self.hass.data:
             self.hass.data[ONVIF_DATA] = {}
             self.hass.data[ONVIF_DATA][ENTITIES] = []
         self.hass.data[ONVIF_DATA][ENTITIES].append(self)
 
-    @asyncio.coroutine
-    def async_camera_image(self):
+    async def async_camera_image(self):
         """Return a still image response from the camera."""
         from haffmpeg import ImageFrame, IMAGE_JPEG
+
+        if not self._input:
+            await self.hass.async_add_job(self.obtain_input_uri)
+            if not self._input:
+                return None
+
         ffmpeg = ImageFrame(
             self.hass.data[DATA_FFMPEG].binary, loop=self.hass.loop)
 
-        image = yield from asyncio.shield(ffmpeg.get_image(
+        image = await asyncio.shield(ffmpeg.get_image(
             self._input, output_format=IMAGE_JPEG,
             extra_cmd=self._ffmpeg_arguments), loop=self.hass.loop)
         return image
 
-    @asyncio.coroutine
-    def handle_async_mjpeg_stream(self, request):
+    async def handle_async_mjpeg_stream(self, request):
         """Generate an HTTP MJPEG stream from the camera."""
         from haffmpeg import CameraMjpeg
 
+        if not self._input:
+            await self.hass.async_add_job(self.obtain_input_uri)
+            if not self._input:
+                return None
+
         stream = CameraMjpeg(self.hass.data[DATA_FFMPEG].binary,
                              loop=self.hass.loop)
-        yield from stream.open_camera(
+        await stream.open_camera(
             self._input, extra_cmd=self._ffmpeg_arguments)
 
-        yield from async_aiohttp_proxy_stream(
+        await async_aiohttp_proxy_stream(
             self.hass, request, stream,
             'multipart/x-mixed-replace;boundary=ffserver')
-        yield from stream.close()
+        await stream.close()
 
     @property
     def name(self):

homeassistant/components/camera/proxy.py

@@ -0,0 +1,244 @@
+"""
+Proxy camera platform that enables image processing of camera data.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/proxy
+"""
+import logging
+import asyncio
+import aiohttp
+import async_timeout
+
+import voluptuous as vol
+
+from homeassistant.util.async_ import run_coroutine_threadsafe
+from homeassistant.helpers import config_validation as cv
+
+import homeassistant.util.dt as dt_util
+from homeassistant.const import (
+    CONF_NAME, CONF_ENTITY_ID, HTTP_HEADER_HA_AUTH)
+from homeassistant.components.camera import (
+    PLATFORM_SCHEMA, Camera)
+from homeassistant.helpers.aiohttp_client import (
+    async_get_clientsession, async_aiohttp_proxy_web)
+
+REQUIREMENTS = ['pillow==5.0.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_MAX_IMAGE_WIDTH = "max_image_width"
+CONF_IMAGE_QUALITY = "image_quality"
+CONF_IMAGE_REFRESH_RATE = "image_refresh_rate"
+CONF_FORCE_RESIZE = "force_resize"
+CONF_MAX_STREAM_WIDTH = "max_stream_width"
+CONF_STREAM_QUALITY = "stream_quality"
+CONF_CACHE_IMAGES = "cache_images"
+
+DEFAULT_BASENAME = "Camera Proxy"
+DEFAULT_QUALITY = 75
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_ENTITY_ID): cv.entity_id,
+    vol.Optional(CONF_NAME): cv.string,
+    vol.Optional(CONF_MAX_IMAGE_WIDTH): int,
+    vol.Optional(CONF_IMAGE_QUALITY): int,
+    vol.Optional(CONF_IMAGE_REFRESH_RATE): float,
+    vol.Optional(CONF_FORCE_RESIZE, False): cv.boolean,
+    vol.Optional(CONF_CACHE_IMAGES, False): cv.boolean,
+    vol.Optional(CONF_MAX_STREAM_WIDTH): int,
+    vol.Optional(CONF_STREAM_QUALITY): int,
+})
+
+
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
+    """Set up the Proxy camera platform."""
+    async_add_devices([ProxyCamera(hass, config)])
+
+
+def _resize_image(image, opts):
+    """Resize image."""
+    from PIL import Image
+    import io
+
+    if not opts:
+        return image
+
+    quality = opts.quality or DEFAULT_QUALITY
+    new_width = opts.max_width
+
+    img = Image.open(io.BytesIO(image))
+    imgfmt = str(img.format)
+    if imgfmt != 'PNG' and imgfmt != 'JPEG':
+        _LOGGER.debug("Image is of unsupported type: %s", imgfmt)
+        return image
+
+    (old_width, old_height) = img.size
+    old_size = len(image)
+    if old_width <= new_width:
+        if opts.quality is None:
+            _LOGGER.debug("Image is smaller-than / equal-to requested width")
+            return image
+        new_width = old_width
+
+    scale = new_width / float(old_width)
+    new_height = int((float(old_height)*float(scale)))
+
+    img = img.resize((new_width, new_height), Image.ANTIALIAS)
+    imgbuf = io.BytesIO()
+    img.save(imgbuf, "JPEG", optimize=True, quality=quality)
+    newimage = imgbuf.getvalue()
+    if not opts.force_resize and len(newimage) >= old_size:
+        _LOGGER.debug("Using original image(%d bytes) "
+                      "because resized image (%d bytes) is not smaller",
+                      old_size, len(newimage))
+        return image
+
+    _LOGGER.debug("Resized image "
+                  "from (%dx%d - %d bytes) "
+                  "to (%dx%d - %d bytes)",
+                  old_width, old_height, old_size,
+                  new_width, new_height, len(newimage))
+    return newimage
+
+
+class ImageOpts():
+    """The representation of image options."""
+
+    def __init__(self, max_width, quality, force_resize):
+        """Initialize image options."""
+        self.max_width = max_width
+        self.quality = quality
+        self.force_resize = force_resize
+
+    def __bool__(self):
+        """Bool evalution rules."""
+        return bool(self.max_width or self.quality)
+
+
+class ProxyCamera(Camera):
+    """The representation of a Proxy camera."""
+
+    def __init__(self, hass, config):
+        """Initialize a proxy camera component."""
+        super().__init__()
+        self.hass = hass
+        self._proxied_camera = config.get(CONF_ENTITY_ID)
+        self._name = (
+            config.get(CONF_NAME) or
+            "{} - {}".format(DEFAULT_BASENAME, self._proxied_camera))
+        self._image_opts = ImageOpts(
+            config.get(CONF_MAX_IMAGE_WIDTH),
+            config.get(CONF_IMAGE_QUALITY),
+            config.get(CONF_FORCE_RESIZE))
+
+        self._stream_opts = ImageOpts(
+            config.get(CONF_MAX_STREAM_WIDTH),
+            config.get(CONF_STREAM_QUALITY),
+            True)
+
+        self._image_refresh_rate = config.get(CONF_IMAGE_REFRESH_RATE)
+        self._cache_images = bool(
+            config.get(CONF_IMAGE_REFRESH_RATE)
+            or config.get(CONF_CACHE_IMAGES))
+        self._last_image_time = 0
+        self._last_image = None
+        self._headers = (
+            {HTTP_HEADER_HA_AUTH: self.hass.config.api.api_password}
+            if self.hass.config.api.api_password is not None
+            else None)
+
+    def camera_image(self):
+        """Return camera image."""
+        return run_coroutine_threadsafe(
+            self.async_camera_image(), self.hass.loop).result()
+
+    async def async_camera_image(self):
+        """Return a still image response from the camera."""
+        now = dt_util.utcnow()
+
+        if (self._image_refresh_rate and
+                now < self._last_image_time + self._image_refresh_rate):
+            return self._last_image
+
+        self._last_image_time = now
+        url = "{}/api/camera_proxy/{}".format(
+            self.hass.config.api.base_url, self._proxied_camera)
+        try:
+            websession = async_get_clientsession(self.hass)
+            with async_timeout.timeout(10, loop=self.hass.loop):
+                response = await websession.get(url, headers=self._headers)
+            image = await response.read()
+        except asyncio.TimeoutError:
+            _LOGGER.error("Timeout getting camera image")
+            return self._last_image
+        except aiohttp.ClientError as err:
+            _LOGGER.error("Error getting new camera image: %s", err)
+            return self._last_image
+
+        image = await self.hass.async_add_job(
+            _resize_image, image, self._image_opts)
+
+        if self._cache_images:
+            self._last_image = image
+        return image
+
+    async def handle_async_mjpeg_stream(self, request):
+        """Generate an HTTP MJPEG stream from camera images."""
+        websession = async_get_clientsession(self.hass)
+        url = "{}/api/camera_proxy_stream/{}".format(
+            self.hass.config.api.base_url, self._proxied_camera)
+        stream_coro = websession.get(url, headers=self._headers)
+
+        if not self._stream_opts:
+            await async_aiohttp_proxy_web(self.hass, request, stream_coro)
+            return
+
+        response = aiohttp.web.StreamResponse()
+        response.content_type = ('multipart/x-mixed-replace; '
+                                 'boundary=--frameboundary')
+        await response.prepare(request)
+
+        async def write(img_bytes):
+            """Write image to stream."""
+            await response.write(bytes(
+                '--frameboundary\r\n'
+                'Content-Type: {}\r\n'
+                'Content-Length: {}\r\n\r\n'.format(
+                    self.content_type, len(img_bytes)),
+                'utf-8') + img_bytes + b'\r\n')
+
+        with async_timeout.timeout(10, loop=self.hass.loop):
+            req = await stream_coro
+
+        try:
+            # This would be nicer as an async generator
+            # But that would only be supported for python >=3.6
+            data = b''
+            stream = req.content
+            while True:
+                chunk = await stream.read(102400)
+                if not chunk:
+                    break
+                data += chunk
+                jpg_start = data.find(b'\xff\xd8')
+                jpg_end = data.find(b'\xff\xd9')
+                if jpg_start != -1 and jpg_end != -1:
+                    image = data[jpg_start:jpg_end + 2]
+                    image = await self.hass.async_add_job(
+                        _resize_image, image, self._stream_opts)
+                    await write(image)
+                    data = data[jpg_end + 2:]
+        except asyncio.CancelledError:
+            _LOGGER.debug("Stream closed by frontend.")
+            req.close()
+            response = None
+
+        finally:
+            if response is not None:
+                await response.write_eof()
+
+    @property
+    def name(self):
+        """Return the name of this camera."""
+        return self._name

homeassistant/components/camera/rpi_camera.py

@@ -106,6 +106,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         _LOGGER.error("'%s' is not a whitelisted directory", file_path)
         return False
 
+    add_devices([RaspberryCamera(setup_config)])
+
 
 class RaspberryCamera(Camera):
     """Representation of a Raspberry Pi camera."""

homeassistant/components/camera/synology.py

@@ -20,7 +20,7 @@ from homeassistant.helpers.aiohttp_client import (
     async_get_clientsession)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['py-synology==0.1.5']
+REQUIREMENTS = ['py-synology==0.2.0']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/camera/xeoma.py

@@ -4,7 +4,6 @@ Support for Xeoma Cameras.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/camera.xeoma/
 """
-import asyncio
 import logging
 
 import voluptuous as vol
@@ -14,7 +13,7 @@ from homeassistant.const import (
     CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME)
 from homeassistant.helpers import config_validation as cv
 
-REQUIREMENTS = ['pyxeoma==1.3']
+REQUIREMENTS = ['pyxeoma==1.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -41,8 +40,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
     """Discover and setup Xeoma Cameras."""
     from pyxeoma.xeoma import Xeoma, XeomaError
 
@@ -53,8 +52,8 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     xeoma = Xeoma(host, login, password)
 
     try:
-        yield from xeoma.async_test_connection()
-        discovered_image_names = yield from xeoma.async_get_image_names()
+        await xeoma.async_test_connection()
+        discovered_image_names = await xeoma.async_get_image_names()
         discovered_cameras = [
             {
                 CONF_IMAGE_NAME: image_name,
@@ -103,12 +102,11 @@ class XeomaCamera(Camera):
         self._password = password
         self._last_image = None
 
-    @asyncio.coroutine
-    def async_camera_image(self):
+    async def async_camera_image(self):
         """Return a still image response from the camera."""
         from pyxeoma.xeoma import XeomaError
         try:
-            image = yield from self._xeoma.async_get_camera_image(
+            image = await self._xeoma.async_get_camera_image(
                 self._image, self._username, self._password)
             self._last_image = image
         except XeomaError as err:

homeassistant/components/camera/yi.py

@@ -38,8 +38,10 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass,
+                               config,
+                               async_add_devices,
+                               discovery_info=None):
     """Set up a Yi Camera."""
     _LOGGER.debug('Received configuration: %s', config)
     async_add_devices([YiCamera(hass, config)], True)
@@ -107,31 +109,29 @@ class YiCamera(Camera):
             self.user, self.passwd, self.host, self.port, self.path,
             latest_dir, videos[-1])
 
-    @asyncio.coroutine
-    def async_camera_image(self):
+    async def async_camera_image(self):
         """Return a still image response from the camera."""
         from haffmpeg import ImageFrame, IMAGE_JPEG
 
-        url = yield from self.hass.async_add_job(self.get_latest_video_url)
+        url = await self.hass.async_add_job(self.get_latest_video_url)
         if url != self._last_url:
             ffmpeg = ImageFrame(self._manager.binary, loop=self.hass.loop)
-            self._last_image = yield from asyncio.shield(ffmpeg.get_image(
+            self._last_image = await asyncio.shield(ffmpeg.get_image(
                 url, output_format=IMAGE_JPEG,
                 extra_cmd=self._extra_arguments), loop=self.hass.loop)
             self._last_url = url
 
         return self._last_image
 
-    @asyncio.coroutine
-    def handle_async_mjpeg_stream(self, request):
+    async def handle_async_mjpeg_stream(self, request):
         """Generate an HTTP MJPEG stream from the camera."""
         from haffmpeg import CameraMjpeg
 
         stream = CameraMjpeg(self._manager.binary, loop=self.hass.loop)
-        yield from stream.open_camera(
+        await stream.open_camera(
             self._last_url, extra_cmd=self._extra_arguments)
 
-        yield from async_aiohttp_proxy_stream(
+        await async_aiohttp_proxy_stream(
             self.hass, request, stream,
             'multipart/x-mixed-replace;boundary=ffserver')
-        yield from stream.close()
+        await stream.close()

homeassistant/components/canary.py

@@ -15,7 +15,7 @@ from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, CONF_TIMEOUT
 from homeassistant.helpers import discovery
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['py-canary==0.4.0']
+REQUIREMENTS = ['py-canary==0.4.1']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/climate/__init__.py

@@ -237,14 +237,12 @@ def set_swing_mode(hass, swing_mode, entity_id=None):
     hass.services.call(DOMAIN, SERVICE_SET_SWING_MODE, data)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Set up climate devices."""
     component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
-    yield from component.async_setup(config)
+    await component.async_setup(config)
 
-    @asyncio.coroutine
-    def async_away_mode_set_service(service):
+    async def async_away_mode_set_service(service):
         """Set away mode on target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -253,23 +251,22 @@ def async_setup(hass, config):
         update_tasks = []
         for climate in target_climate:
             if away_mode:
-                yield from climate.async_turn_away_mode_on()
+                await climate.async_turn_away_mode_on()
             else:
-                yield from climate.async_turn_away_mode_off()
+                await climate.async_turn_away_mode_off()
 
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_AWAY_MODE, async_away_mode_set_service,
         schema=SET_AWAY_MODE_SCHEMA)
 
-    @asyncio.coroutine
-    def async_hold_mode_set_service(service):
+    async def async_hold_mode_set_service(service):
         """Set hold mode on target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -277,21 +274,20 @@ def async_setup(hass, config):
 
         update_tasks = []
         for climate in target_climate:
-            yield from climate.async_set_hold_mode(hold_mode)
+            await climate.async_set_hold_mode(hold_mode)
 
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_HOLD_MODE, async_hold_mode_set_service,
         schema=SET_HOLD_MODE_SCHEMA)
 
-    @asyncio.coroutine
-    def async_aux_heat_set_service(service):
+    async def async_aux_heat_set_service(service):
         """Set auxiliary heater on target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -300,23 +296,22 @@ def async_setup(hass, config):
         update_tasks = []
         for climate in target_climate:
             if aux_heat:
-                yield from climate.async_turn_aux_heat_on()
+                await climate.async_turn_aux_heat_on()
             else:
-                yield from climate.async_turn_aux_heat_off()
+                await climate.async_turn_aux_heat_off()
 
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_AUX_HEAT, async_aux_heat_set_service,
         schema=SET_AUX_HEAT_SCHEMA)
 
-    @asyncio.coroutine
-    def async_temperature_set_service(service):
+    async def async_temperature_set_service(service):
         """Set temperature on the target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -333,21 +328,20 @@ def async_setup(hass, config):
                 else:
                     kwargs[value] = temp
 
-            yield from climate.async_set_temperature(**kwargs)
+            await climate.async_set_temperature(**kwargs)
 
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_TEMPERATURE, async_temperature_set_service,
         schema=SET_TEMPERATURE_SCHEMA)
 
-    @asyncio.coroutine
-    def async_humidity_set_service(service):
+    async def async_humidity_set_service(service):
         """Set humidity on the target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -355,20 +349,19 @@ def async_setup(hass, config):
 
         update_tasks = []
         for climate in target_climate:
-            yield from climate.async_set_humidity(humidity)
+            await climate.async_set_humidity(humidity)
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_HUMIDITY, async_humidity_set_service,
         schema=SET_HUMIDITY_SCHEMA)
 
-    @asyncio.coroutine
-    def async_fan_mode_set_service(service):
+    async def async_fan_mode_set_service(service):
         """Set fan mode on target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -376,20 +369,19 @@ def async_setup(hass, config):
 
         update_tasks = []
         for climate in target_climate:
-            yield from climate.async_set_fan_mode(fan)
+            await climate.async_set_fan_mode(fan)
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_FAN_MODE, async_fan_mode_set_service,
         schema=SET_FAN_MODE_SCHEMA)
 
-    @asyncio.coroutine
-    def async_operation_set_service(service):
+    async def async_operation_set_service(service):
         """Set operating mode on the target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -397,20 +389,19 @@ def async_setup(hass, config):
 
         update_tasks = []
         for climate in target_climate:
-            yield from climate.async_set_operation_mode(operation_mode)
+            await climate.async_set_operation_mode(operation_mode)
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_OPERATION_MODE, async_operation_set_service,
         schema=SET_OPERATION_MODE_SCHEMA)
 
-    @asyncio.coroutine
-    def async_swing_set_service(service):
+    async def async_swing_set_service(service):
         """Set swing mode on the target climate devices."""
         target_climate = component.async_extract_from_service(service)
 
@@ -418,36 +409,35 @@ def async_setup(hass, config):
 
         update_tasks = []
         for climate in target_climate:
-            yield from climate.async_set_swing_mode(swing_mode)
+            await climate.async_set_swing_mode(swing_mode)
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_SET_SWING_MODE, async_swing_set_service,
         schema=SET_SWING_MODE_SCHEMA)
 
-    @asyncio.coroutine
-    def async_on_off_service(service):
+    async def async_on_off_service(service):
         """Handle on/off calls."""
         target_climate = component.async_extract_from_service(service)
 
         update_tasks = []
         for climate in target_climate:
             if service.service == SERVICE_TURN_ON:
-                yield from climate.async_turn_on()
+                await climate.async_turn_on()
             elif service.service == SERVICE_TURN_OFF:
-                yield from climate.async_turn_off()
+                await climate.async_turn_off()
 
             if not climate.should_poll:
                 continue
             update_tasks.append(climate.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     hass.services.async_register(
         DOMAIN, SERVICE_TURN_OFF, async_on_off_service,

homeassistant/components/climate/ecobee.py

@@ -14,10 +14,10 @@ from homeassistant.components.climate import (
     ATTR_TARGET_TEMP_LOW, ATTR_TARGET_TEMP_HIGH, SUPPORT_TARGET_TEMPERATURE,
     SUPPORT_AWAY_MODE, SUPPORT_HOLD_MODE, SUPPORT_OPERATION_MODE,
     SUPPORT_TARGET_HUMIDITY_LOW, SUPPORT_TARGET_HUMIDITY_HIGH,
-    SUPPORT_AUX_HEAT, SUPPORT_TARGET_TEMPERATURE_HIGH,
-    SUPPORT_TARGET_TEMPERATURE_LOW)
+    SUPPORT_AUX_HEAT, SUPPORT_TARGET_TEMPERATURE_HIGH, SUPPORT_FAN_MODE,
+    SUPPORT_TARGET_TEMPERATURE_LOW, STATE_OFF)
 from homeassistant.const import (
-    ATTR_ENTITY_ID, STATE_OFF, STATE_ON, ATTR_TEMPERATURE, TEMP_FAHRENHEIT)
+    ATTR_ENTITY_ID, STATE_ON, ATTR_TEMPERATURE, TEMP_FAHRENHEIT)
 import homeassistant.helpers.config_validation as cv
 
 _CONFIGURING = {}
@@ -50,7 +50,7 @@ SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_AWAY_MODE |
                  SUPPORT_HOLD_MODE | SUPPORT_OPERATION_MODE |
                  SUPPORT_TARGET_HUMIDITY_LOW | SUPPORT_TARGET_HUMIDITY_HIGH |
                  SUPPORT_AUX_HEAT | SUPPORT_TARGET_TEMPERATURE_HIGH |
-                 SUPPORT_TARGET_TEMPERATURE_LOW)
+                 SUPPORT_TARGET_TEMPERATURE_LOW | SUPPORT_FAN_MODE)
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -122,6 +122,7 @@ class Thermostat(ClimateDevice):
         self._climate_list = self.climate_list
         self._operation_list = ['auto', 'auxHeatOnly', 'cool',
                                 'heat', 'off']
+        self._fan_list = ['auto', 'on']
         self.update_without_throttle = False
 
     def update(self):
@@ -180,24 +181,29 @@ class Thermostat(ClimateDevice):
             return self.thermostat['runtime']['desiredCool'] / 10.0
         return None
 
-    @property
-    def desired_fan_mode(self):
-        """Return the desired fan mode of operation."""
-        return self.thermostat['runtime']['desiredFanMode']
-
     @property
     def fan(self):
-        """Return the current fan state."""
+        """Return the current fan status."""
         if 'fan' in self.thermostat['equipmentStatus']:
             return STATE_ON
         return STATE_OFF
 
+    @property
+    def current_fan_mode(self):
+        """Return the fan setting."""
+        return self.thermostat['runtime']['desiredFanMode']
+
     @property
     def current_hold_mode(self):
         """Return current hold mode."""
         mode = self._current_hold_mode
         return None if mode == AWAY_MODE else mode
 
+    @property
+    def fan_list(self):
+        """Return the available fan modes."""
+        return self._fan_list
+
     @property
     def _current_hold_mode(self):
         events = self.thermostat['events']
@@ -206,7 +212,7 @@ class Thermostat(ClimateDevice):
                 if event['type'] == 'hold':
                     if event['holdClimateRef'] == 'away':
                         if int(event['endDate'][0:4]) - \
-                           int(event['startDate'][0:4]) <= 1:
+                                int(event['startDate'][0:4]) <= 1:
                             # A temporary hold from away climate is a hold
                             return 'away'
                         # A permanent hold from away climate
@@ -228,7 +234,7 @@ class Thermostat(ClimateDevice):
     def current_operation(self):
         """Return current operation."""
         if self.operation_mode == 'auxHeatOnly' or \
-           self.operation_mode == 'heatPump':
+                self.operation_mode == 'heatPump':
             return STATE_HEAT
         return self.operation_mode
 
@@ -271,10 +277,11 @@ class Thermostat(ClimateDevice):
             operation = STATE_HEAT
         else:
             operation = status
+
         return {
             "actual_humidity": self.thermostat['runtime']['actualHumidity'],
             "fan": self.fan,
-            "mode": self.mode,
+            "climate_mode": self.mode,
             "operation": operation,
             "climate_list": self.climate_list,
             "fan_min_on_time": self.fan_min_on_time
@@ -342,25 +349,46 @@ class Thermostat(ClimateDevice):
                                        cool_temp_setpoint, heat_temp_setpoint,
                                        self.hold_preference())
         _LOGGER.debug("Setting ecobee hold_temp to: heat=%s, is=%s, "
-                      "cool=%s, is=%s", heat_temp, isinstance(
-                          heat_temp, (int, float)), cool_temp,
+                      "cool=%s, is=%s", heat_temp,
+                      isinstance(heat_temp, (int, float)), cool_temp,
                       isinstance(cool_temp, (int, float)))
 
         self.update_without_throttle = True
 
+    def set_fan_mode(self, fan_mode):
+        """Set the fan mode.  Valid values are "on" or "auto"."""
+        if (fan_mode.lower() != STATE_ON) and (fan_mode.lower() != STATE_AUTO):
+            error = "Invalid fan_mode value:  Valid values are 'on' or 'auto'"
+            _LOGGER.error(error)
+            return
+
+        cool_temp = self.thermostat['runtime']['desiredCool'] / 10.0
+        heat_temp = self.thermostat['runtime']['desiredHeat'] / 10.0
+        self.data.ecobee.set_fan_mode(self.thermostat_index, fan_mode,
+                                      cool_temp, heat_temp,
+                                      self.hold_preference())
+
+        _LOGGER.info("Setting fan mode to: %s", fan_mode)
+
     def set_temp_hold(self, temp):
-        """Set temperature hold in modes other than auto."""
-        # Set arbitrary range when not in auto mode
-        if self.current_operation == STATE_HEAT:
+        """Set temperature hold in modes other than auto.
+
+        Ecobee API: It is good practice to set the heat and cool hold
+        temperatures to be the same, if the thermostat is in either heat, cool,
+        auxHeatOnly, or off mode. If the thermostat is in auto mode, an
+        additional rule is required. The cool hold temperature must be greater
+        than the heat hold temperature by at least the amount in the
+        heatCoolMinDelta property.
+        https://www.ecobee.com/home/developer/api/examples/ex5.shtml
+        """
+        if self.current_operation == STATE_HEAT or self.current_operation == \
+                STATE_COOL:
             heat_temp = temp
-            cool_temp = temp + 20
-        elif self.current_operation == STATE_COOL:
-            heat_temp = temp - 20
             cool_temp = temp
         else:
-            # In auto mode set temperature between
-            heat_temp = temp - 10
-            cool_temp = temp + 10
+            delta = self.thermostat['settings']['heatCoolMinDelta'] / 10
+            heat_temp = temp - delta
+            cool_temp = temp + delta
         self.set_auto_temp_hold(heat_temp, cool_temp)
 
     def set_temperature(self, **kwargs):
@@ -369,8 +397,8 @@ class Thermostat(ClimateDevice):
         high_temp = kwargs.get(ATTR_TARGET_TEMP_HIGH)
         temp = kwargs.get(ATTR_TEMPERATURE)
 
-        if self.current_operation == STATE_AUTO and (low_temp is not None or
-                                                     high_temp is not None):
+        if self.current_operation == STATE_AUTO and \
+                (low_temp is not None or high_temp is not None):
             self.set_auto_temp_hold(low_temp, high_temp)
         elif temp is not None:
             self.set_temp_hold(temp)

homeassistant/components/climate/generic_thermostat.py

@@ -229,7 +229,7 @@ class GenericThermostat(ClimateDevice):
         """List of available operation modes."""
         return self._operation_list
 
-    def set_operation_mode(self, operation_mode):
+    async def async_set_operation_mode(self, operation_mode):
         """Set operation mode."""
         if operation_mode == STATE_HEAT:
             self._current_operation = STATE_HEAT

homeassistant/components/climate/knx.py

@@ -4,7 +4,6 @@ Support for KNX/IP climate devices.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/climate.knx/
 """
-import asyncio
 
 import voluptuous as vol
 
@@ -61,8 +60,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
     """Set up climate(s) for KNX platform."""
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
@@ -135,11 +134,10 @@ class KNXClimate(ClimateDevice):
 
     def async_register_callbacks(self):
         """Register callbacks to update hass after device was changed."""
-        @asyncio.coroutine
-        def after_update_callback(device):
+        async def after_update_callback(device):
             """Call after device was updated."""
             # pylint: disable=unused-argument
-            yield from self.async_update_ha_state()
+            await self.async_update_ha_state()
         self.device.register_device_updated_cb(after_update_callback)
 
     @property
@@ -187,14 +185,13 @@ class KNXClimate(ClimateDevice):
         """Return the maximum temperature."""
         return self.device.target_temperature_max
 
-    @asyncio.coroutine
-    def async_set_temperature(self, **kwargs):
+    async def async_set_temperature(self, **kwargs):
         """Set new target temperature."""
         temperature = kwargs.get(ATTR_TEMPERATURE)
         if temperature is None:
             return
-        yield from self.device.set_target_temperature(temperature)
-        yield from self.async_update_ha_state()
+        await self.device.set_target_temperature(temperature)
+        await self.async_update_ha_state()
 
     @property
     def current_operation(self):
@@ -210,10 +207,9 @@ class KNXClimate(ClimateDevice):
                 operation_mode in
                 self.device.get_supported_operation_modes()]
 
-    @asyncio.coroutine
-    def async_set_operation_mode(self, operation_mode):
+    async def async_set_operation_mode(self, operation_mode):
         """Set operation mode."""
         if self.device.supports_operation_mode:
             from xknx.knx import HVACOperationMode
             knx_operation_mode = HVACOperationMode(operation_mode)
-            yield from self.device.set_operation_mode(knx_operation_mode)
+            await self.device.set_operation_mode(knx_operation_mode)

homeassistant/components/climate/nest.py

@@ -29,10 +29,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 NEST_MODE_HEAT_COOL = 'heat-cool'
 
-SUPPORT_FLAGS = (SUPPORT_TARGET_TEMPERATURE | SUPPORT_TARGET_TEMPERATURE_HIGH |
-                 SUPPORT_TARGET_TEMPERATURE_LOW | SUPPORT_OPERATION_MODE |
-                 SUPPORT_AWAY_MODE | SUPPORT_FAN_MODE)
-
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up the Nest thermostat."""
@@ -58,6 +54,10 @@ class NestThermostat(ClimateDevice):
         self.device = device
         self._fan_list = [STATE_ON, STATE_AUTO]
 
+        # Set the default supported features
+        self._support_flags = (SUPPORT_TARGET_TEMPERATURE |
+                               SUPPORT_OPERATION_MODE | SUPPORT_AWAY_MODE)
+
         # Not all nest devices support cooling and heating remove unused
         self._operation_list = [STATE_OFF]
 
@@ -70,11 +70,16 @@ class NestThermostat(ClimateDevice):
 
         if self.device.can_heat and self.device.can_cool:
             self._operation_list.append(STATE_AUTO)
+            self._support_flags = (self._support_flags |
+                                   SUPPORT_TARGET_TEMPERATURE_HIGH |
+                                   SUPPORT_TARGET_TEMPERATURE_LOW)
 
         self._operation_list.append(STATE_ECO)
 
         # feature of device
         self._has_fan = self.device.has_fan
+        if self._has_fan:
+            self._support_flags = (self._support_flags | SUPPORT_FAN_MODE)
 
         # data attributes
         self._away = None
@@ -95,7 +100,7 @@ class NestThermostat(ClimateDevice):
     @property
     def supported_features(self):
         """Return the list of supported features."""
-        return SUPPORT_FLAGS
+        return self._support_flags
 
     @property
     def unique_id(self):
@@ -162,6 +167,7 @@ class NestThermostat(ClimateDevice):
 
     def set_temperature(self, **kwargs):
         """Set new target temperature."""
+        import nest
         target_temp_low = kwargs.get(ATTR_TARGET_TEMP_LOW)
         target_temp_high = kwargs.get(ATTR_TARGET_TEMP_HIGH)
         if self._mode == NEST_MODE_HEAT_COOL:
@@ -170,7 +176,10 @@ class NestThermostat(ClimateDevice):
         else:
             temp = kwargs.get(ATTR_TEMPERATURE)
         _LOGGER.debug("Nest set_temperature-output-value=%s", temp)
-        self.device.target = temp
+        try:
+            self.device.target = temp
+        except nest.nest.APIError:
+            _LOGGER.error("An error occured while setting the temperature")
 
     def set_operation_mode(self, operation_mode):
         """Set operation mode."""
@@ -205,11 +214,14 @@ class NestThermostat(ClimateDevice):
     @property
     def fan_list(self):
         """List of available fan modes."""
-        return self._fan_list
+        if self._has_fan:
+            return self._fan_list
+        return None
 
     def set_fan_mode(self, fan_mode):
         """Turn fan on/off."""
-        self.device.fan = fan_mode.lower()
+        if self._has_fan:
+            self.device.fan = fan_mode.lower()
 
     @property
     def min_temp(self):

homeassistant/components/climate/sensibo.py

@@ -29,7 +29,7 @@ REQUIREMENTS = ['pysensibo==1.0.2']
 
 _LOGGER = logging.getLogger(__name__)
 
-ALL = 'all'
+ALL = ['all']
 TIMEOUT = 10
 
 SERVICE_ASSUME_STATE = 'sensibo_assume_state'
@@ -240,13 +240,18 @@ class SensiboClimate(ClimateDevice):
     def min_temp(self):
         """Return the minimum temperature."""
         return self._temperatures_list[0] \
-            if self._temperatures_list else super().min_temp()
+            if self._temperatures_list else super().min_temp
 
     @property
     def max_temp(self):
         """Return the maximum temperature."""
         return self._temperatures_list[-1] \
-            if self._temperatures_list else super().max_temp()
+            if self._temperatures_list else super().max_temp
+
+    @property
+    def unique_id(self):
+        """Return unique ID based on Sensibo ID."""
+        return self._id
 
     @asyncio.coroutine
     def async_set_temperature(self, **kwargs):

homeassistant/components/cloud/__init__.py

@@ -15,12 +15,12 @@ import async_timeout
 import voluptuous as vol
 
 from homeassistant.const import (
-    EVENT_HOMEASSISTANT_START, CONF_REGION, CONF_MODE, CONF_NAME, CONF_TYPE)
+    EVENT_HOMEASSISTANT_START, CONF_REGION, CONF_MODE, CONF_NAME)
 from homeassistant.helpers import entityfilter, config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util import dt as dt_util
 from homeassistant.components.alexa import smart_home as alexa_sh
-from homeassistant.components.google_assistant import smart_home as ga_sh
+from homeassistant.components.google_assistant import helpers as ga_h
 
 from . import http_api, iot
 from .const import CONFIG_DIR, DOMAIN, SERVERS
@@ -37,6 +37,7 @@ CONF_FILTER = 'filter'
 CONF_GOOGLE_ACTIONS = 'google_actions'
 CONF_RELAYER = 'relayer'
 CONF_USER_POOL_ID = 'user_pool_id'
+CONF_GOOGLE_ACTIONS_SYNC_URL = 'google_actions_sync_url'
 
 DEFAULT_MODE = 'production'
 DEPENDENCIES = ['http']
@@ -51,7 +52,6 @@ ALEXA_ENTITY_SCHEMA = vol.Schema({
 
 GOOGLE_ENTITY_SCHEMA = vol.Schema({
     vol.Optional(CONF_NAME): cv.string,
-    vol.Optional(CONF_TYPE): vol.In(ga_sh.MAPPING_COMPONENT),
     vol.Optional(CONF_ALIASES): vol.All(cv.ensure_list, [cv.string])
 })
 
@@ -76,6 +76,7 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_USER_POOL_ID): str,
         vol.Optional(CONF_REGION): str,
         vol.Optional(CONF_RELAYER): str,
+        vol.Optional(CONF_GOOGLE_ACTIONS_SYNC_URL): str,
         vol.Optional(CONF_ALEXA): ALEXA_SCHEMA,
         vol.Optional(CONF_GOOGLE_ACTIONS): GACTIONS_SCHEMA,
     }),
@@ -111,7 +112,7 @@ class Cloud:
 
     def __init__(self, hass, mode, alexa, google_actions,
                  cognito_client_id=None, user_pool_id=None, region=None,
-                 relayer=None):
+                 relayer=None, google_actions_sync_url=None):
         """Create an instance of Cloud."""
         self.hass = hass
         self.mode = mode
@@ -129,6 +130,7 @@ class Cloud:
             self.user_pool_id = user_pool_id
             self.region = region
             self.relayer = relayer
+            self.google_actions_sync_url = google_actions_sync_url
 
         else:
             info = SERVERS[mode]
@@ -137,6 +139,7 @@ class Cloud:
             self.user_pool_id = info['user_pool_id']
             self.region = info['region']
             self.relayer = info['relayer']
+            self.google_actions_sync_url = info['google_actions_sync_url']
 
     @property
     def is_logged_in(self):
@@ -175,7 +178,7 @@ class Cloud:
                 """If an entity should be exposed."""
                 return conf['filter'](entity.entity_id)
 
-            self._gactions_config = ga_sh.Config(
+            self._gactions_config = ga_h.Config(
                 should_expose=should_expose,
                 agent_user_id=self.claims['cognito:username'],
                 entity_config=conf.get(CONF_ENTITY_CONFIG),

homeassistant/components/cloud/auth_api.py

@@ -17,14 +17,6 @@ class UserNotConfirmed(CloudError):
     """Raised when a user has not confirmed email yet."""
 
 
-class ExpiredCode(CloudError):
-    """Raised when an expired code is encountered."""
-
-
-class InvalidCode(CloudError):
-    """Raised when an invalid code is submitted."""
-
-
 class PasswordChangeRequired(CloudError):
     """Raised when a password change is required."""
 
@@ -42,10 +34,8 @@ class UnknownError(CloudError):
 AWS_EXCEPTIONS = {
     'UserNotFoundException': UserNotFound,
     'NotAuthorizedException': Unauthenticated,
-    'ExpiredCodeException': ExpiredCode,
     'UserNotConfirmedException': UserNotConfirmed,
     'PasswordResetRequiredException': PasswordChangeRequired,
-    'CodeMismatchException': InvalidCode,
 }
 
 
@@ -69,17 +59,6 @@ def register(cloud, email, password):
         raise _map_aws_exception(err)
 
 
-def confirm_register(cloud, confirmation_code, email):
-    """Confirm confirmation code after registration."""
-    from botocore.exceptions import ClientError
-
-    cognito = _cognito(cloud)
-    try:
-        cognito.confirm_sign_up(confirmation_code, email)
-    except ClientError as err:
-        raise _map_aws_exception(err)
-
-
 def resend_email_confirm(cloud, email):
     """Resend email confirmation."""
     from botocore.exceptions import ClientError
@@ -107,18 +86,6 @@ def forgot_password(cloud, email):
         raise _map_aws_exception(err)
 
 
-def confirm_forgot_password(cloud, confirmation_code, email, new_password):
-    """Confirm forgotten password code and change password."""
-    from botocore.exceptions import ClientError
-
-    cognito = _cognito(cloud, username=email)
-
-    try:
-        cognito.confirm_forgot_password(confirmation_code, new_password)
-    except ClientError as err:
-        raise _map_aws_exception(err)
-
-
 def login(cloud, email, password):
     """Log user in and fetch certificate."""
     cognito = _authenticate(cloud, email, password)

homeassistant/components/cloud/const.py

@@ -8,7 +8,9 @@ SERVERS = {
         'cognito_client_id': '60i2uvhvbiref2mftj7rgcrt9u',
         'user_pool_id': 'us-east-1_87ll5WOP8',
         'region': 'us-east-1',
-        'relayer': 'wss://cloud.hass.io:8000/websocket'
+        'relayer': 'wss://cloud.hass.io:8000/websocket',
+        'google_actions_sync_url': ('https://24ab3v80xd.execute-api.us-east-1.'
+                                    'amazonaws.com/prod/smart_home_sync'),
     }
 }
 
@@ -16,3 +18,9 @@ MESSAGE_EXPIRATION = """
 It looks like your Home Assistant Cloud subscription has expired. Please check
 your [account page](/config/cloud/account) to continue using the service.
 """
+
+MESSAGE_AUTH_FAIL = """
+You have been logged out of Home Assistant Cloud because we have been unable
+to verify your credentials. Please [log in](/config/cloud) again to continue
+using the service.
+"""

homeassistant/components/cloud/http_api.py

@@ -16,17 +16,15 @@ from .const import DOMAIN, REQUEST_TIMEOUT
 _LOGGER = logging.getLogger(__name__)
 
 
-@asyncio.coroutine
-def async_setup(hass):
+async def async_setup(hass):
     """Initialize the HTTP API."""
+    hass.http.register_view(GoogleActionsSyncView)
     hass.http.register_view(CloudLoginView)
     hass.http.register_view(CloudLogoutView)
     hass.http.register_view(CloudAccountView)
     hass.http.register_view(CloudRegisterView)
-    hass.http.register_view(CloudConfirmRegisterView)
     hass.http.register_view(CloudResendConfirmView)
     hass.http.register_view(CloudForgotPasswordView)
-    hass.http.register_view(CloudConfirmForgotPasswordView)
 
 
 _CLOUD_ERRORS = {
@@ -34,20 +32,17 @@ _CLOUD_ERRORS = {
     auth_api.UserNotConfirmed: (400, 'Email not confirmed.'),
     auth_api.Unauthenticated: (401, 'Authentication failed.'),
     auth_api.PasswordChangeRequired: (400, 'Password change required.'),
-    auth_api.ExpiredCode: (400, 'Confirmation code has expired.'),
-    auth_api.InvalidCode: (400, 'Invalid confirmation code.'),
     asyncio.TimeoutError: (502, 'Unable to reach the Home Assistant cloud.')
 }
 
 
 def _handle_cloud_errors(handler):
     """Handle auth errors."""
-    @asyncio.coroutine
     @wraps(handler)
-    def error_handler(view, request, *args, **kwargs):
+    async def error_handler(view, request, *args, **kwargs):
         """Handle exceptions that raise from the wrapped request handler."""
         try:
-            result = yield from handler(view, request, *args, **kwargs)
+            result = await handler(view, request, *args, **kwargs)
             return result
 
         except (auth_api.CloudError, asyncio.TimeoutError) as err:
@@ -61,6 +56,31 @@ def _handle_cloud_errors(handler):
     return error_handler
 
 
+class GoogleActionsSyncView(HomeAssistantView):
+    """Trigger a Google Actions Smart Home Sync."""
+
+    url = '/api/cloud/google_actions/sync'
+    name = 'api:cloud:google_actions/sync'
+
+    @_handle_cloud_errors
+    async def post(self, request):
+        """Trigger a Google Actions sync."""
+        hass = request.app['hass']
+        cloud = hass.data[DOMAIN]
+        websession = hass.helpers.aiohttp_client.async_get_clientsession()
+
+        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
+            await hass.async_add_job(auth_api.check_token, cloud)
+
+        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
+            req = await websession.post(
+                cloud.google_actions_sync_url, headers={
+                    'authorization': cloud.id_token
+                })
+
+        return self.json({}, status_code=req.status)
+
+
 class CloudLoginView(HomeAssistantView):
     """Login to Home Assistant cloud."""
 
@@ -72,19 +92,18 @@ class CloudLoginView(HomeAssistantView):
         vol.Required('email'): str,
         vol.Required('password'): str,
     }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
         """Handle login request."""
         hass = request.app['hass']
         cloud = hass.data[DOMAIN]
 
         with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(auth_api.login, cloud, data['email'],
-                                          data['password'])
+            await hass.async_add_job(auth_api.login, cloud, data['email'],
+                                     data['password'])
 
         hass.async_add_job(cloud.iot.connect)
         # Allow cloud to start connecting.
-        yield from asyncio.sleep(0, loop=hass.loop)
+        await asyncio.sleep(0, loop=hass.loop)
         return self.json(_account_data(cloud))
 
 
@@ -95,14 +114,13 @@ class CloudLogoutView(HomeAssistantView):
     name = 'api:cloud:logout'
 
     @_handle_cloud_errors
-    @asyncio.coroutine
-    def post(self, request):
+    async def post(self, request):
         """Handle logout request."""
         hass = request.app['hass']
         cloud = hass.data[DOMAIN]
 
         with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from cloud.logout()
+            await cloud.logout()
 
         return self.json_message('ok')
 
@@ -113,8 +131,7 @@ class CloudAccountView(HomeAssistantView):
     url = '/api/cloud/account'
     name = 'api:cloud:account'
 
-    @asyncio.coroutine
-    def get(self, request):
+    async def get(self, request):
         """Get account info."""
         hass = request.app['hass']
         cloud = hass.data[DOMAIN]
@@ -136,44 +153,18 @@ class CloudRegisterView(HomeAssistantView):
         vol.Required('email'): str,
         vol.Required('password'): vol.All(str, vol.Length(min=6)),
     }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
         """Handle registration request."""
         hass = request.app['hass']
         cloud = hass.data[DOMAIN]
 
         with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
+            await hass.async_add_job(
                 auth_api.register, cloud, data['email'], data['password'])
 
         return self.json_message('ok')
 
 
-class CloudConfirmRegisterView(HomeAssistantView):
-    """Confirm registration on the Home Assistant cloud."""
-
-    url = '/api/cloud/confirm_register'
-    name = 'api:cloud:confirm_register'
-
-    @_handle_cloud_errors
-    @RequestDataValidator(vol.Schema({
-        vol.Required('confirmation_code'): str,
-        vol.Required('email'): str,
-    }))
-    @asyncio.coroutine
-    def post(self, request, data):
-        """Handle registration confirmation request."""
-        hass = request.app['hass']
-        cloud = hass.data[DOMAIN]
-
-        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
-                auth_api.confirm_register, cloud, data['confirmation_code'],
-                data['email'])
-
-        return self.json_message('ok')
-
-
 class CloudResendConfirmView(HomeAssistantView):
     """Resend email confirmation code."""
 
@@ -184,14 +175,13 @@ class CloudResendConfirmView(HomeAssistantView):
     @RequestDataValidator(vol.Schema({
         vol.Required('email'): str,
     }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
         """Handle resending confirm email code request."""
         hass = request.app['hass']
         cloud = hass.data[DOMAIN]
 
         with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
+            await hass.async_add_job(
                 auth_api.resend_email_confirm, cloud, data['email'])
 
         return self.json_message('ok')
@@ -207,46 +197,18 @@ class CloudForgotPasswordView(HomeAssistantView):
     @RequestDataValidator(vol.Schema({
         vol.Required('email'): str,
     }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
         """Handle forgot password request."""
         hass = request.app['hass']
         cloud = hass.data[DOMAIN]
 
         with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
+            await hass.async_add_job(
                 auth_api.forgot_password, cloud, data['email'])
 
         return self.json_message('ok')
 
 
-class CloudConfirmForgotPasswordView(HomeAssistantView):
-    """View to finish Forgot Password flow.."""
-
-    url = '/api/cloud/confirm_forgot_password'
-    name = 'api:cloud:confirm_forgot_password'
-
-    @_handle_cloud_errors
-    @RequestDataValidator(vol.Schema({
-        vol.Required('confirmation_code'): str,
-        vol.Required('email'): str,
-        vol.Required('new_password'): vol.All(str, vol.Length(min=6))
-    }))
-    @asyncio.coroutine
-    def post(self, request, data):
-        """Handle forgot password confirm request."""
-        hass = request.app['hass']
-        cloud = hass.data[DOMAIN]
-
-        with async_timeout.timeout(REQUEST_TIMEOUT, loop=hass.loop):
-            yield from hass.async_add_job(
-                auth_api.confirm_forgot_password, cloud,
-                data['confirmation_code'], data['email'],
-                data['new_password'])
-
-        return self.json_message('ok')
-
-
 def _account_data(cloud):
     """Generate the auth data JSON response."""
     claims = cloud.claims

homeassistant/components/cloud/iot.py

@@ -1,6 +1,7 @@
 """Module to handle messages from Home Assistant cloud."""
 import asyncio
 import logging
+import pprint
 
 from aiohttp import hdrs, client_exceptions, WSMsgType
 
@@ -10,7 +11,7 @@ from homeassistant.components.google_assistant import smart_home as ga
 from homeassistant.util.decorator import Registry
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from . import auth_api
-from .const import MESSAGE_EXPIRATION
+from .const import MESSAGE_EXPIRATION, MESSAGE_AUTH_FAIL
 
 HANDLERS = Registry()
 _LOGGER = logging.getLogger(__name__)
@@ -77,9 +78,9 @@ class CloudIoT:
             self.tries += 1
 
             try:
-                # Sleep 0, 5, 10, 15 ... 30 seconds between retries
+                # Sleep 2^tries seconds between retries
                 self.retry_task = hass.async_add_job(asyncio.sleep(
-                    min(30, (self.tries - 1) * 5), loop=hass.loop))
+                    2**min(9, self.tries), loop=hass.loop))
                 yield from self.retry_task
                 self.retry_task = None
             except asyncio.CancelledError:
@@ -97,13 +98,23 @@ class CloudIoT:
 
         try:
             yield from hass.async_add_job(auth_api.check_token, self.cloud)
+        except auth_api.Unauthenticated as err:
+            _LOGGER.error('Unable to refresh token: %s', err)
+
+            hass.components.persistent_notification.async_create(
+                MESSAGE_AUTH_FAIL, 'Home Assistant Cloud',
+                'cloud_subscription_expired')
+
+            # Don't await it because it will cancel this task
+            hass.async_add_job(self.cloud.logout())
+            return
         except auth_api.CloudError as err:
-            _LOGGER.warning("Unable to connect: %s", err)
+            _LOGGER.warning("Unable to refresh token: %s", err)
             return
 
         if self.cloud.subscription_expired:
             hass.components.persistent_notification.async_create(
-                MESSAGE_EXPIRATION, 'Subscription expired',
+                MESSAGE_EXPIRATION, 'Home Assistant Cloud',
                 'cloud_subscription_expired')
             self.close_requested = True
             return
@@ -144,7 +155,9 @@ class CloudIoT:
                     disconnect_warn = 'Received invalid JSON.'
                     break
 
-                _LOGGER.debug("Received message: %s", msg)
+                if _LOGGER.isEnabledFor(logging.DEBUG):
+                    _LOGGER.debug("Received message:\n%s\n",
+                                  pprint.pformat(msg))
 
                 response = {
                     'msgid': msg['msgid'],
@@ -166,7 +179,9 @@ class CloudIoT:
                     _LOGGER.exception("Error handling message")
                     response['error'] = 'exception'
 
-                _LOGGER.debug("Publishing message: %s", response)
+                if _LOGGER.isEnabledFor(logging.DEBUG):
+                    _LOGGER.debug("Publishing message:\n%s\n",
+                                  pprint.pformat(response))
                 yield from client.send_json(response)
 
         except client_exceptions.WSServerHandshakeError as err:

homeassistant/components/coinbase.py

@@ -14,9 +14,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.discovery import load_platform
 from homeassistant.util import Throttle
 
-REQUIREMENTS = [
-    'https://github.com/balloob/coinbase-python/archive/'
-    '3a35efe13ef728a1cc18204b4f25be1fcb1c6006.zip#coinbase==2.0.8a1']
+REQUIREMENTS = ['coinbase==2.1.0']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/config/__init__.py

@@ -13,7 +13,8 @@ from homeassistant.util.yaml import load_yaml, dump
 
 DOMAIN = 'config'
 DEPENDENCIES = ['http']
-SECTIONS = ('core', 'customize', 'group', 'hassbian', 'automation', 'script')
+SECTIONS = ('core', 'customize', 'group', 'hassbian', 'automation', 'script',
+            'entity_registry')
 ON_DEMAND = ('zwave',)
 FEATURE_FLAGS = ('config_entries',)
 

homeassistant/components/config/config_entries.py

@@ -97,10 +97,10 @@ class ConfigManagerFlowIndexView(HomeAssistantView):
             flow for flow in hass.config_entries.flow.async_progress()
             if flow['source'] != config_entries.SOURCE_USER])
 
-    @asyncio.coroutine
     @RequestDataValidator(vol.Schema({
         vol.Required('domain'): str,
     }))
+    @asyncio.coroutine
     def post(self, request, data):
         """Handle a POST request."""
         hass = request.app['hass']
@@ -139,8 +139,8 @@ class ConfigManagerFlowResourceView(HomeAssistantView):
 
         return self.json(result)
 
-    @asyncio.coroutine
     @RequestDataValidator(vol.Schema(dict), allow_empty=True)
+    @asyncio.coroutine
     def post(self, request, flow_id, data):
         """Handle a POST request."""
         hass = request.app['hass']
@@ -163,7 +163,7 @@ class ConfigManagerFlowResourceView(HomeAssistantView):
         hass = request.app['hass']
 
         try:
-            hass.config_entries.async_abort(flow_id)
+            hass.config_entries.flow.async_abort(flow_id)
         except config_entries.UnknownFlow:
             return self.json_message('Invalid flow specified', 404)
 

homeassistant/components/config/entity_registry.py

@@ -0,0 +1,55 @@
+"""HTTP views to interact with the entity registry."""
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.components.http import HomeAssistantView
+from homeassistant.components.http.data_validator import RequestDataValidator
+from homeassistant.helpers.entity_registry import async_get_registry
+
+
+async def async_setup(hass):
+    """Enable the Entity Registry views."""
+    hass.http.register_view(ConfigManagerEntityView)
+    return True
+
+
+class ConfigManagerEntityView(HomeAssistantView):
+    """View to interact with an entity registry entry."""
+
+    url = '/api/config/entity_registry/{entity_id}'
+    name = 'api:config:entity_registry:entity'
+
+    async def get(self, request, entity_id):
+        """Get the entity registry settings for an entity."""
+        hass = request.app['hass']
+        registry = await async_get_registry(hass)
+        entry = registry.entities.get(entity_id)
+
+        if entry is None:
+            return self.json_message('Entry not found', 404)
+
+        return self.json(_entry_dict(entry))
+
+    @RequestDataValidator(vol.Schema({
+        # If passed in, we update value. Passing None will remove old value.
+        vol.Optional('name'): vol.Any(str, None),
+    }))
+    async def post(self, request, entity_id, data):
+        """Update the entity registry settings for an entity."""
+        hass = request.app['hass']
+        registry = await async_get_registry(hass)
+
+        if entity_id not in registry.entities:
+            return self.json_message('Entry not found', 404)
+
+        entry = registry.async_update_entity(entity_id, **data)
+        return self.json(_entry_dict(entry))
+
+
+@callback
+def _entry_dict(entry):
+    """Helper to convert entry to API format."""
+    return {
+        'entity_id': entry.entity_id,
+        'name': entry.name
+    }

homeassistant/components/config_entry_example/.translations/de.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "Ung\u00fcltige Objekt-ID"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "Objekt-ID"
+                },
+                "description": "Bitte gib eine Objekt_ID f\u00fcr das Test-Entity ein.",
+                "title": "W\u00e4hle eine Objekt-ID"
+            },
+            "name": {
+                "data": {
+                    "name": "Name"
+                },
+                "description": "Bitte gib einen Namen f\u00fcr das Test-Entity ein",
+                "title": "Name des Test-Entity"
+            }
+        },
+        "title": "Beispiel Konfig-Eintrag"
+    }
+}

homeassistant/components/config_entry_example/.translations/en.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "Invalid object ID"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "Object ID"
+                },
+                "description": "Please enter an object_id for the test entity.",
+                "title": "Pick object id"
+            },
+            "name": {
+                "data": {
+                    "name": "Name"
+                },
+                "description": "Please enter a name for the test entity.",
+                "title": "Name of the entity"
+            }
+        },
+        "title": "Config Entry Example"
+    }
+}

homeassistant/components/config_entry_example/.translations/fi.json

@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "name": {
+                "data": {
+                    "name": "Nimi"
+                }
+            }
+        }
+    }
+}

homeassistant/components/config_entry_example/.translations/ko.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "\uc624\ube0c\uc81d\ud2b8 ID\uac00 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "\uc624\ube0c\uc81d\ud2b8 ID"
+                },
+                "description": "\ud14c\uc2a4\ud2b8 \uad6c\uc131\uc694\uc18c\uc758 \uc624\ube0c\uc81d\ud2b8 ID \ub97c \uc785\ub825\ud558\uc138\uc694",
+                "title": "\uc624\ube0c\uc81d\ud2b8 ID \uc120\ud0dd"
+            },
+            "name": {
+                "data": {
+                    "name": "\uc774\ub984"
+                },
+                "description": "\ud14c\uc2a4\ud2b8 \uad6c\uc131\uc694\uc18c\uc758 \uc774\ub984\uc744 \uc785\ub825\ud558\uc138\uc694.",
+                "title": "\uad6c\uc131\uc694\uc18c \uc774\ub984"
+            }
+        },
+        "title": "\uc785\ub825 \uc608\uc81c \uad6c\uc131"
+    }
+}

homeassistant/components/config_entry_example/.translations/nl.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "Ongeldig object ID"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "Object ID"
+                },
+                "description": "Voer een object_id in voor het testen van de entiteit.",
+                "title": "Kies object id"
+            },
+            "name": {
+                "data": {
+                    "name": "Naam"
+                },
+                "description": "Voer een naam in voor het testen van de entiteit.",
+                "title": "Naam van de entiteit"
+            }
+        },
+        "title": "Voorbeeld van de config vermelding"
+    }
+}

homeassistant/components/config_entry_example/.translations/no.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "Ugyldig objekt ID"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "Objekt ID"
+                },
+                "description": "Vennligst skriv inn en object_id for testenheten.",
+                "title": "Velg objekt ID"
+            },
+            "name": {
+                "data": {
+                    "name": "Navn"
+                },
+                "description": "Vennligst skriv inn et navn for testenheten.",
+                "title": "Navn p\u00e5 enheten"
+            }
+        },
+        "title": "Konfigureringseksempel"
+    }
+}

homeassistant/components/config_entry_example/.translations/pl.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "Nieprawid\u0142owy identyfikator obiektu"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "Identyfikator obiektu"
+                },
+                "description": "Prosz\u0119 wprowadzi\u0107 identyfikator obiektu (object_id) dla jednostki testowej.",
+                "title": "Wybierz identyfikator obiektu"
+            },
+            "name": {
+                "data": {
+                    "name": "Nazwa"
+                },
+                "description": "Prosz\u0119 wprowadzi\u0107 nazw\u0119 dla jednostki testowej.",
+                "title": "Nazwa jednostki"
+            }
+        },
+        "title": "Przyk\u0142ad wpisu do konfiguracji"
+    }
+}

homeassistant/components/config_entry_example/.translations/ro.json

@@ -0,0 +1,15 @@
+{
+    "config": {
+        "step": {
+            "init": {
+                "description": "Introduce\u021bi un obiect_id pentru entitatea testat\u0103.",
+                "title": "Alege\u021bi id-ul obiectului"
+            },
+            "name": {
+                "data": {
+                    "name": "Nume"
+                }
+            }
+        }
+    }
+}

homeassistant/components/config_entry_example/.translations/sl.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "Neveljaven ID objekta"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "ID objekta"
+                },
+                "description": "Prosimo, vnesite Id_objekta za testni subjekt.",
+                "title": "Izberite ID objekta"
+            },
+            "name": {
+                "data": {
+                    "name": "Ime"
+                },
+                "description": "Vnesite ime za testni subjekt.",
+                "title": "Ime subjekta"
+            }
+        },
+        "title": "Primer nastavitve"
+    }
+}

homeassistant/components/config_entry_example/.translations/vi.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "ID \u0111\u1ed1i t\u01b0\u1ee3ng kh\u00f4ng h\u1ee3p l\u1ec7"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "ID \u0111\u1ed1i t\u01b0\u1ee3ng"
+                },
+                "description": "Xin vui l\u00f2ng nh\u1eadp m\u1ed9t object_id cho th\u1eed nghi\u1ec7m th\u1ef1c th\u1ec3.",
+                "title": "Ch\u1ecdn id \u0111\u1ed1i t\u01b0\u1ee3ng"
+            },
+            "name": {
+                "data": {
+                    "name": "T\u00ean"
+                },
+                "description": "Xin vui l\u00f2ng nh\u1eadp t\u00ean cho th\u1eed nghi\u1ec7m th\u1ef1c th\u1ec3.",
+                "title": "T\u00ean c\u1ee7a th\u1ef1c th\u1ec3"
+            }
+        },
+        "title": "V\u00ed d\u1ee5 v\u1ec1 c\u1ea5u h\u00ecnh th\u1ef1c th\u1ec3"
+    }
+}

homeassistant/components/config_entry_example/.translations/zh-Hans.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+        "error": {
+            "invalid_object_id": "\u65e0\u6548\u7684\u5bf9\u8c61 ID"
+        },
+        "step": {
+            "init": {
+                "data": {
+                    "object_id": "\u5bf9\u8c61 ID"
+                },
+                "description": "\u8bf7\u4e3a\u6d4b\u8bd5\u8bbe\u5907\u8f93\u5165\u5bf9\u8c61 ID",
+                "title": "\u8bf7\u9009\u62e9\u5bf9\u8c61 ID"
+            },
+            "name": {
+                "data": {
+                    "name": "\u540d\u79f0"
+                },
+                "description": "\u8bf7\u4e3a\u6d4b\u8bd5\u8bbe\u5907\u8f93\u5165\u540d\u79f0",
+                "title": "\u8bbe\u5907\u540d\u79f0"
+            }
+        },
+        "title": "\u6837\u4f8b\u914d\u7f6e\u6761\u76ee"
+    }
+}

homeassistant/components/config_entry_example/__init__.py

@@ -62,13 +62,11 @@ class ExampleConfigFlow(config_entries.ConfigFlowHandler):
                 return (yield from self.async_step_name())
 
             errors = {
-                'object_id': 'Invalid object id.'
+                'object_id': 'invalid_object_id'
             }
 
         return self.async_show_form(
-            title='Pick object id',
             step_id='init',
-            description="Please enter an object_id for the test entity.",
             data_schema=vol.Schema({
                 'object_id': str
             }),
@@ -92,9 +90,7 @@ class ExampleConfigFlow(config_entries.ConfigFlowHandler):
                 )
 
         return self.async_show_form(
-            title='Name of the entity',
             step_id='name',
-            description="Please enter a name for the test entity.",
             data_schema=vol.Schema({
                 'name': str
             }),

homeassistant/components/config_entry_example/strings.json

@@ -0,0 +1,24 @@
+{
+  "config": {
+    "title": "Config Entry Example",
+    "step": {
+      "init": {
+        "title": "Pick object id",
+        "description": "Please enter an object_id for the test entity.",
+        "data": {
+          "object_id": "Object ID"
+        }
+      },
+      "name": {
+        "title": "Name of the entity",
+        "description": "Please enter a name for the test entity.",
+        "data": {
+          "name": "Name"
+        }
+      }
+    },
+    "error": {
+      "invalid_object_id": "Invalid object ID"
+    }
+  }
+}

homeassistant/components/configurator.py

@@ -15,7 +15,7 @@ from homeassistant.const import EVENT_TIME_CHANGED, ATTR_FRIENDLY_NAME, \
     ATTR_ENTITY_PICTURE
 from homeassistant.loader import bind_hass
 from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.util.async import run_callback_threadsafe
+from homeassistant.util.async_ import run_callback_threadsafe
 
 _LOGGER = logging.getLogger(__name__)
 _KEY_INSTANCE = 'configurator'

homeassistant/components/conversation.py

@@ -4,7 +4,6 @@ Support for functionality to have conversations with Home Assistant.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/conversation/
 """
-import asyncio
 import logging
 import re
 
@@ -67,8 +66,7 @@ def async_register(hass, intent_type, utterances):
             conf.append(_create_matcher(utterance))
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Register the process service."""
     config = config.get(DOMAIN, {})
     intents = hass.data.get(DOMAIN)
@@ -84,49 +82,73 @@ def async_setup(hass, config):
 
         conf.extend(_create_matcher(utterance) for utterance in utterances)
 
-    @asyncio.coroutine
-    def process(service):
+    async def process(service):
         """Parse text into commands."""
         text = service.data[ATTR_TEXT]
-        yield from _process(hass, text)
+        try:
+            await _process(hass, text)
+        except intent.IntentHandleError as err:
+            _LOGGER.error('Error processing %s: %s', text, err)
 
     hass.services.async_register(
         DOMAIN, SERVICE_PROCESS, process, schema=SERVICE_PROCESS_SCHEMA)
 
     hass.http.register_view(ConversationProcessView)
 
-    async_register(hass, intent.INTENT_TURN_ON,
-                   ['Turn {name} on', 'Turn on {name}'])
-    async_register(hass, intent.INTENT_TURN_OFF,
-                   ['Turn {name} off', 'Turn off {name}'])
-    async_register(hass, intent.INTENT_TOGGLE,
-                   ['Toggle {name}', '{name} toggle'])
+    # We strip trailing 's' from name because our state matcher will fail
+    # if a letter is not there. By removing 's' we can match singular and
+    # plural names.
+
+    async_register(hass, intent.INTENT_TURN_ON, [
+        'Turn [the] [a] {name}[s] on',
+        'Turn on [the] [a] [an] {name}[s]',
+    ])
+    async_register(hass, intent.INTENT_TURN_OFF, [
+        'Turn [the] [a] [an] {name}[s] off',
+        'Turn off [the] [a] [an] {name}[s]',
+    ])
+    async_register(hass, intent.INTENT_TOGGLE, [
+        'Toggle [the] [a] [an] {name}[s]',
+        '[the] [a] [an] {name}[s] toggle',
+    ])
 
     return True
 
 
 def _create_matcher(utterance):
     """Create a regex that matches the utterance."""
-    parts = re.split(r'({\w+})', utterance)
+    # Split utterance into parts that are type: NORMAL, GROUP or OPTIONAL
+    # Pattern matches (GROUP|OPTIONAL): Change light to [the color] {name}
+    parts = re.split(r'({\w+}|\[[\w\s]+\] *)', utterance)
+    # Pattern to extract name from GROUP part. Matches {name}
     group_matcher = re.compile(r'{(\w+)}')
+    # Pattern to extract text from OPTIONAL part. Matches [the color]
+    optional_matcher = re.compile(r'\[([\w ]+)\] *')
 
     pattern = ['^']
-
     for part in parts:
-        match = group_matcher.match(part)
+        group_match = group_matcher.match(part)
+        optional_match = optional_matcher.match(part)
 
-        if match is None:
+        # Normal part
+        if group_match is None and optional_match is None:
             pattern.append(part)
             continue
 
-        pattern.append('(?P<{}>{})'.format(match.groups()[0], r'[\w ]+'))
+        # Group part
+        if group_match is not None:
+            pattern.append(
+                r'(?P<{}>[\w ]+?)\s*'.format(group_match.groups()[0]))
+
+        # Optional part
+        elif optional_match is not None:
+            pattern.append(r'(?:{} *)?'.format(optional_match.groups()[0]))
 
     pattern.append('$')
     return re.compile(''.join(pattern), re.I)
 
 
-@asyncio.coroutine
-def _process(hass, text):
+async def _process(hass, text):
     """Process a line of text."""
     intents = hass.data.get(DOMAIN, {})
 
@@ -137,7 +159,7 @@ def _process(hass, text):
             if not match:
                 continue
 
-            response = yield from hass.helpers.intent.async_handle(
+            response = await hass.helpers.intent.async_handle(
                 DOMAIN, intent_type,
                 {key: {'value': value} for key, value
                  in match.groupdict().items()}, text)
@@ -153,12 +175,15 @@ class ConversationProcessView(http.HomeAssistantView):
     @RequestDataValidator(vol.Schema({
         vol.Required('text'): str,
     }))
-    @asyncio.coroutine
-    def post(self, request, data):
+    async def post(self, request, data):
         """Send a request for processing."""
         hass = request.app['hass']
 
-        intent_result = yield from _process(hass, data['text'])
+        try:
+            intent_result = await _process(hass, data['text'])
+        except intent.IntentHandleError as err:
+            intent_result = intent.IntentResponse()
+            intent_result.async_set_speech(str(err))
 
         if intent_result is None:
             intent_result = intent.IntentResponse()

homeassistant/components/cover/__init__.py

@@ -150,16 +150,14 @@ def stop_cover_tilt(hass, entity_id=None):
     hass.services.call(DOMAIN, SERVICE_STOP_COVER_TILT, data)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Track states and offer events for covers."""
     component = EntityComponent(
         _LOGGER, DOMAIN, hass, SCAN_INTERVAL, GROUP_NAME_ALL_COVERS)
 
-    yield from component.async_setup(config)
+    await component.async_setup(config)
 
-    @asyncio.coroutine
-    def async_handle_cover_service(service):
+    async def async_handle_cover_service(service):
         """Handle calls to the cover services."""
         covers = component.async_extract_from_service(service)
         method = SERVICE_TO_METHOD.get(service.service)
@@ -169,13 +167,13 @@ def async_setup(hass, config):
         # call method
         update_tasks = []
         for cover in covers:
-            yield from getattr(cover, method['method'])(**params)
+            await getattr(cover, method['method'])(**params)
             if not cover.should_poll:
                 continue
             update_tasks.append(cover.async_update_ha_state(True))
 
         if update_tasks:
-            yield from asyncio.wait(update_tasks, loop=hass.loop)
+            await asyncio.wait(update_tasks, loop=hass.loop)
 
     for service_name in SERVICE_TO_METHOD:
         schema = SERVICE_TO_METHOD[service_name].get(

homeassistant/components/cover/group.py

@@ -0,0 +1,271 @@
+"""
+This platform allows several cover to be grouped into one cover.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/cover.group/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.components.cover import (
+    DOMAIN, PLATFORM_SCHEMA, CoverDevice, ATTR_POSITION,
+    ATTR_CURRENT_POSITION, ATTR_TILT_POSITION, ATTR_CURRENT_TILT_POSITION,
+    SUPPORT_OPEN, SUPPORT_CLOSE, SUPPORT_STOP, SUPPORT_SET_POSITION,
+    SUPPORT_OPEN_TILT, SUPPORT_CLOSE_TILT,
+    SUPPORT_STOP_TILT, SUPPORT_SET_TILT_POSITION,
+    SERVICE_OPEN_COVER, SERVICE_CLOSE_COVER, SERVICE_SET_COVER_POSITION,
+    SERVICE_STOP_COVER, SERVICE_OPEN_COVER_TILT, SERVICE_CLOSE_COVER_TILT,
+    SERVICE_STOP_COVER_TILT, SERVICE_SET_COVER_TILT_POSITION)
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES,
+    CONF_ENTITIES, CONF_NAME, STATE_CLOSED)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.event import async_track_state_change
+
+_LOGGER = logging.getLogger(__name__)
+
+KEY_OPEN_CLOSE = 'open_close'
+KEY_STOP = 'stop'
+KEY_POSITION = 'position'
+
+DEFAULT_NAME = 'Cover Group'
+
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Required(CONF_ENTITIES): cv.entities_domain(DOMAIN),
+})
+
+
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
+    """Set up the Group Cover platform."""
+    async_add_devices(
+        [CoverGroup(config[CONF_NAME], config[CONF_ENTITIES])])
+
+
+class CoverGroup(CoverDevice):
+    """Representation of a CoverGroup."""
+
+    def __init__(self, name, entities):
+        """Initialize a CoverGroup entity."""
+        self._name = name
+        self._is_closed = False
+        self._cover_position = 100
+        self._tilt_position = None
+        self._supported_features = 0
+        self._assumed_state = True
+
+        self._entities = entities
+        self._covers = {KEY_OPEN_CLOSE: set(), KEY_STOP: set(),
+                        KEY_POSITION: set()}
+        self._tilts = {KEY_OPEN_CLOSE: set(), KEY_STOP: set(),
+                       KEY_POSITION: set()}
+
+    @callback
+    def update_supported_features(self, entity_id, old_state, new_state,
+                                  update_state=True):
+        """Update dictionaries with supported features."""
+        if not new_state:
+            for values in self._covers.values():
+                values.discard(entity_id)
+            for values in self._tilts.values():
+                values.discard(entity_id)
+            if update_state:
+                self.async_schedule_update_ha_state(True)
+            return
+
+        features = new_state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
+
+        if features & (SUPPORT_OPEN | SUPPORT_CLOSE):
+            self._covers[KEY_OPEN_CLOSE].add(entity_id)
+        else:
+            self._covers[KEY_OPEN_CLOSE].discard(entity_id)
+        if features & (SUPPORT_STOP):
+            self._covers[KEY_STOP].add(entity_id)
+        else:
+            self._covers[KEY_STOP].discard(entity_id)
+        if features & (SUPPORT_SET_POSITION):
+            self._covers[KEY_POSITION].add(entity_id)
+        else:
+            self._covers[KEY_POSITION].discard(entity_id)
+
+        if features & (SUPPORT_OPEN_TILT | SUPPORT_CLOSE_TILT):
+            self._tilts[KEY_OPEN_CLOSE].add(entity_id)
+        else:
+            self._tilts[KEY_OPEN_CLOSE].discard(entity_id)
+        if features & (SUPPORT_STOP_TILT):
+            self._tilts[KEY_STOP].add(entity_id)
+        else:
+            self._tilts[KEY_STOP].discard(entity_id)
+        if features & (SUPPORT_SET_TILT_POSITION):
+            self._tilts[KEY_POSITION].add(entity_id)
+        else:
+            self._tilts[KEY_POSITION].discard(entity_id)
+
+        if update_state:
+            self.async_schedule_update_ha_state(True)
+
+    async def async_added_to_hass(self):
+        """Register listeners."""
+        for entity_id in self._entities:
+            new_state = self.hass.states.get(entity_id)
+            self.update_supported_features(entity_id, None, new_state,
+                                           update_state=False)
+        async_track_state_change(self.hass, self._entities,
+                                 self.update_supported_features)
+        await self.async_update()
+
+    @property
+    def name(self):
+        """Return the name of the cover."""
+        return self._name
+
+    @property
+    def assumed_state(self):
+        """Enable buttons even if at end position."""
+        return self._assumed_state
+
+    @property
+    def should_poll(self):
+        """Disable polling for cover group."""
+        return False
+
+    @property
+    def supported_features(self):
+        """Flag supported features for the cover."""
+        return self._supported_features
+
+    @property
+    def is_closed(self):
+        """Return if all covers in group are closed."""
+        return self._is_closed
+
+    @property
+    def current_cover_position(self):
+        """Return current position for all covers."""
+        return self._cover_position
+
+    @property
+    def current_cover_tilt_position(self):
+        """Return current tilt position for all covers."""
+        return self._tilt_position
+
+    async def async_open_cover(self, **kwargs):
+        """Move the covers up."""
+        data = {ATTR_ENTITY_ID: self._covers[KEY_OPEN_CLOSE]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_OPEN_COVER, data, blocking=True)
+
+    async def async_close_cover(self, **kwargs):
+        """Move the covers down."""
+        data = {ATTR_ENTITY_ID: self._covers[KEY_OPEN_CLOSE]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_CLOSE_COVER, data, blocking=True)
+
+    async def async_stop_cover(self, **kwargs):
+        """Fire the stop action."""
+        data = {ATTR_ENTITY_ID: self._covers[KEY_STOP]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_STOP_COVER, data, blocking=True)
+
+    async def async_set_cover_position(self, **kwargs):
+        """Set covers position."""
+        data = {ATTR_ENTITY_ID: self._covers[KEY_POSITION],
+                ATTR_POSITION: kwargs[ATTR_POSITION]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_SET_COVER_POSITION, data, blocking=True)
+
+    async def async_open_cover_tilt(self, **kwargs):
+        """Tilt covers open."""
+        data = {ATTR_ENTITY_ID: self._tilts[KEY_OPEN_CLOSE]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_OPEN_COVER_TILT, data, blocking=True)
+
+    async def async_close_cover_tilt(self, **kwargs):
+        """Tilt covers closed."""
+        data = {ATTR_ENTITY_ID: self._tilts[KEY_OPEN_CLOSE]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_CLOSE_COVER_TILT, data, blocking=True)
+
+    async def async_stop_cover_tilt(self, **kwargs):
+        """Stop cover tilt."""
+        data = {ATTR_ENTITY_ID: self._tilts[KEY_STOP]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_STOP_COVER_TILT, data, blocking=True)
+
+    async def async_set_cover_tilt_position(self, **kwargs):
+        """Set tilt position."""
+        data = {ATTR_ENTITY_ID: self._tilts[KEY_POSITION],
+                ATTR_TILT_POSITION: kwargs[ATTR_TILT_POSITION]}
+        await self.hass.services.async_call(
+            DOMAIN, SERVICE_SET_COVER_TILT_POSITION, data, blocking=True)
+
+    async def async_update(self):
+        """Update state and attributes."""
+        self._assumed_state = False
+
+        self._is_closed = True
+        for entity_id in self._entities:
+            state = self.hass.states.get(entity_id)
+            if not state:
+                continue
+            if state.state != STATE_CLOSED:
+                self._is_closed = False
+                break
+
+        self._cover_position = None
+        if self._covers[KEY_POSITION]:
+            position = -1
+            self._cover_position = 0 if self.is_closed else 100
+            for entity_id in self._covers[KEY_POSITION]:
+                state = self.hass.states.get(entity_id)
+                pos = state.attributes.get(ATTR_CURRENT_POSITION)
+                if position == -1:
+                    position = pos
+                elif position != pos:
+                    self._assumed_state = True
+                    break
+            else:
+                if position != -1:
+                    self._cover_position = position
+
+        self._tilt_position = None
+        if self._tilts[KEY_POSITION]:
+            position = -1
+            self._tilt_position = 100
+            for entity_id in self._tilts[KEY_POSITION]:
+                state = self.hass.states.get(entity_id)
+                pos = state.attributes.get(ATTR_CURRENT_TILT_POSITION)
+                if position == -1:
+                    position = pos
+                elif position != pos:
+                    self._assumed_state = True
+                    break
+            else:
+                if position != -1:
+                    self._tilt_position = position
+
+        supported_features = 0
+        supported_features |= SUPPORT_OPEN | SUPPORT_CLOSE \
+            if self._covers[KEY_OPEN_CLOSE] else 0
+        supported_features |= SUPPORT_STOP \
+            if self._covers[KEY_STOP] else 0
+        supported_features |= SUPPORT_SET_POSITION \
+            if self._covers[KEY_POSITION] else 0
+        supported_features |= SUPPORT_OPEN_TILT | SUPPORT_CLOSE_TILT \
+            if self._tilts[KEY_OPEN_CLOSE] else 0
+        supported_features |= SUPPORT_STOP_TILT \
+            if self._tilts[KEY_STOP] else 0
+        supported_features |= SUPPORT_SET_TILT_POSITION \
+            if self._tilts[KEY_POSITION] else 0
+        self._supported_features = supported_features
+
+        if not self._assumed_state:
+            for entity_id in self._entities:
+                state = self.hass.states.get(entity_id)
+                if state and state.attributes.get(ATTR_ASSUMED_STATE):
+                    self._assumed_state = True
+                    break

homeassistant/components/cover/knx.py

@@ -4,7 +4,6 @@ Support for KNX/IP covers.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/cover.knx/
 """
-import asyncio
 
 import voluptuous as vol
 
@@ -50,8 +49,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-@asyncio.coroutine
-def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_devices,
+                               discovery_info=None):
     """Set up cover(s) for KNX platform."""
     if discovery_info is not None:
         async_add_devices_discovery(hass, discovery_info, async_add_devices)
@@ -106,11 +105,10 @@ class KNXCover(CoverDevice):
     @callback
     def async_register_callbacks(self):
         """Register callbacks to update hass after device was changed."""
-        @asyncio.coroutine
-        def after_update_callback(device):
+        async def after_update_callback(device):
             """Call after device was updated."""
             # pylint: disable=unused-argument
-            yield from self.async_update_ha_state()
+            await self.async_update_ha_state()
         self.device.register_device_updated_cb(after_update_callback)
 
     @property
@@ -147,32 +145,28 @@ class KNXCover(CoverDevice):
         """Return if the cover is closed."""
         return self.device.is_closed()
 
-    @asyncio.coroutine
-    def async_close_cover(self, **kwargs):
+    async def async_close_cover(self, **kwargs):
         """Close the cover."""
         if not self.device.is_closed():
-            yield from self.device.set_down()
+            await self.device.set_down()
             self.start_auto_updater()
 
-    @asyncio.coroutine
-    def async_open_cover(self, **kwargs):
+    async def async_open_cover(self, **kwargs):
         """Open the cover."""
         if not self.device.is_open():
-            yield from self.device.set_up()
+            await self.device.set_up()
             self.start_auto_updater()
 
-    @asyncio.coroutine
-    def async_set_cover_position(self, **kwargs):
+    async def async_set_cover_position(self, **kwargs):
         """Move the cover to a specific position."""
         if ATTR_POSITION in kwargs:
             position = kwargs[ATTR_POSITION]
-            yield from self.device.set_position(position)
+            await self.device.set_position(position)
             self.start_auto_updater()
 
-    @asyncio.coroutine
-    def async_stop_cover(self, **kwargs):
+    async def async_stop_cover(self, **kwargs):
         """Stop the cover."""
-        yield from self.device.stop()
+        await self.device.stop()
         self.stop_auto_updater()
 
     @property
@@ -182,12 +176,11 @@ class KNXCover(CoverDevice):
             return None
         return self.device.current_angle()
 
-    @asyncio.coroutine
-    def async_set_cover_tilt_position(self, **kwargs):
+    async def async_set_cover_tilt_position(self, **kwargs):
         """Move the cover tilt to a specific position."""
         if ATTR_TILT_POSITION in kwargs:
             tilt_position = kwargs[ATTR_TILT_POSITION]
-            yield from self.device.set_angle(tilt_position)
+            await self.device.set_angle(tilt_position)
 
     def start_auto_updater(self):
         """Start the autoupdater to update HASS while cover is moving."""

homeassistant/components/cover/template.py

@@ -234,7 +234,9 @@ class CoverTemplate(CoverDevice):
 
         None is unknown, 0 is closed, 100 is fully open.
         """
-        return self._position
+        if self._position_template or self._position_script:
+            return self._position
+        return None
 
     @property
     def current_cover_tilt_position(self):

homeassistant/components/deconz/__init__.py

@@ -4,8 +4,6 @@ Support for deCONZ devices.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/deconz/
 """
-
-import asyncio
 import logging
 
 import voluptuous as vol
@@ -19,7 +17,7 @@ from homeassistant.helpers import discovery
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.json import load_json, save_json
 
-REQUIREMENTS = ['pydeconz==30']
+REQUIREMENTS = ['pydeconz==32']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -57,30 +55,28 @@ Unlock your deCONZ gateway to register with Home Assistant.
 """
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Set up services and configuration for deCONZ component."""
     result = False
-    config_file = yield from hass.async_add_job(
+    config_file = await hass.async_add_job(
         load_json, hass.config.path(CONFIG_FILE))
 
-    @asyncio.coroutine
-    def async_deconz_discovered(service, discovery_info):
+    async def async_deconz_discovered(service, discovery_info):
         """Call when deCONZ gateway has been found."""
         deconz_config = {}
         deconz_config[CONF_HOST] = discovery_info.get(CONF_HOST)
         deconz_config[CONF_PORT] = discovery_info.get(CONF_PORT)
-        yield from async_request_configuration(hass, config, deconz_config)
+        await async_request_configuration(hass, config, deconz_config)
 
     if config_file:
-        result = yield from async_setup_deconz(hass, config, config_file)
+        result = await async_setup_deconz(hass, config, config_file)
 
     if not result and DOMAIN in config and CONF_HOST in config[DOMAIN]:
         deconz_config = config[DOMAIN]
         if CONF_API_KEY in deconz_config:
-            result = yield from async_setup_deconz(hass, config, deconz_config)
+            result = await async_setup_deconz(hass, config, deconz_config)
         else:
-            yield from async_request_configuration(hass, config, deconz_config)
+            await async_request_configuration(hass, config, deconz_config)
             return True
 
     if not result:
@@ -89,8 +85,7 @@ def async_setup(hass, config):
     return True
 
 
-@asyncio.coroutine
-def async_setup_deconz(hass, config, deconz_config):
+async def async_setup_deconz(hass, config, deconz_config):
     """Set up a deCONZ session.
 
     Load config, group, light and sensor data for server information.
@@ -100,7 +95,7 @@ def async_setup_deconz(hass, config, deconz_config):
     from pydeconz import DeconzSession
     websession = async_get_clientsession(hass)
     deconz = DeconzSession(hass.loop, websession, **deconz_config)
-    result = yield from deconz.async_load_parameters()
+    result = await deconz.async_load_parameters()
     if result is False:
         _LOGGER.error("Failed to communicate with deCONZ")
         return False
@@ -113,8 +108,7 @@ def async_setup_deconz(hass, config, deconz_config):
             hass, component, DOMAIN, {}, config))
     deconz.start()
 
-    @asyncio.coroutine
-    def async_configure(call):
+    async def async_configure(call):
         """Set attribute of device in deCONZ.
 
         Field is a string representing a specific device in deCONZ
@@ -140,7 +134,7 @@ def async_setup_deconz(hass, config, deconz_config):
             if field is None:
                 _LOGGER.error('Could not find the entity %s', entity_id)
                 return
-        yield from deconz.async_put_state(field, data)
+        await deconz.async_put_state(field, data)
     hass.services.async_register(
         DOMAIN, 'configure', async_configure, schema=SERVICE_SCHEMA)
 
@@ -159,21 +153,19 @@ def async_setup_deconz(hass, config, deconz_config):
     return True
 
 
-@asyncio.coroutine
-def async_request_configuration(hass, config, deconz_config):
+async def async_request_configuration(hass, config, deconz_config):
     """Request configuration steps from the user."""
     configurator = hass.components.configurator
 
-    @asyncio.coroutine
-    def async_configuration_callback(data):
+    async def async_configuration_callback(data):
         """Set up actions to do when our configuration callback is called."""
         from pydeconz.utils import async_get_api_key
-        api_key = yield from async_get_api_key(hass.loop, **deconz_config)
+        api_key = await async_get_api_key(hass.loop, **deconz_config)
         if api_key:
             deconz_config[CONF_API_KEY] = api_key
-            result = yield from async_setup_deconz(hass, config, deconz_config)
+            result = await async_setup_deconz(hass, config, deconz_config)
             if result:
-                yield from hass.async_add_job(
+                await hass.async_add_job(
                     save_json, hass.config.path(CONFIG_FILE), deconz_config)
                 configurator.async_request_done(request_id)
                 return

homeassistant/components/demo.py

@@ -118,6 +118,17 @@ def async_setup(hass, config):
 
     tasks2 = []
 
+    # Set up history graph
+    tasks2.append(bootstrap.async_setup_component(
+        hass, 'history_graph',
+        {'history_graph': {'switches': {
+            'name': 'Recent Switches',
+            'entities': switches,
+            'hours_to_show': 1,
+            'refresh': 60
+        }}}
+    ))
+
     # Set up scripts
     tasks2.append(bootstrap.async_setup_component(
         hass, 'script',

homeassistant/components/device_tracker/__init__.py

@@ -28,7 +28,7 @@ from homeassistant.helpers.typing import GPSType, ConfigType, HomeAssistantType
 import homeassistant.helpers.config_validation as cv
 from homeassistant.loader import get_component
 import homeassistant.util as util
-from homeassistant.util.async import run_coroutine_threadsafe
+from homeassistant.util.async_ import run_coroutine_threadsafe
 import homeassistant.util.dt as dt_util
 from homeassistant.util.yaml import dump
 
@@ -77,11 +77,14 @@ ATTR_MAC = 'mac'
 ATTR_NAME = 'name'
 ATTR_SOURCE_TYPE = 'source_type'
 ATTR_VENDOR = 'vendor'
+ATTR_CONSIDER_HOME = 'consider_home'
 
 SOURCE_TYPE_GPS = 'gps'
 SOURCE_TYPE_ROUTER = 'router'
 SOURCE_TYPE_BLUETOOTH = 'bluetooth'
 SOURCE_TYPE_BLUETOOTH_LE = 'bluetooth_le'
+SOURCE_TYPES = (SOURCE_TYPE_GPS, SOURCE_TYPE_ROUTER,
+                SOURCE_TYPE_BLUETOOTH, SOURCE_TYPE_BLUETOOTH_LE)
 
 NEW_DEVICE_DEFAULTS_SCHEMA = vol.Any(None, vol.Schema({
     vol.Optional(CONF_TRACK_NEW, default=DEFAULT_TRACK_NEW): cv.boolean,
@@ -96,6 +99,22 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NEW_DEVICE_DEFAULTS,
                  default={}): NEW_DEVICE_DEFAULTS_SCHEMA
 })
+SERVICE_SEE_PAYLOAD_SCHEMA = vol.Schema(vol.All(
+    cv.has_at_least_one_key(ATTR_MAC, ATTR_DEV_ID), {
+        ATTR_MAC: cv.string,
+        ATTR_DEV_ID: cv.string,
+        ATTR_HOST_NAME: cv.string,
+        ATTR_LOCATION_NAME: cv.string,
+        ATTR_GPS: cv.gps,
+        ATTR_GPS_ACCURACY: cv.positive_int,
+        ATTR_BATTERY: cv.positive_int,
+        ATTR_ATTRIBUTES: dict,
+        ATTR_SOURCE_TYPE: vol.In(SOURCE_TYPES),
+        ATTR_CONSIDER_HOME: cv.time_period,
+        # Temp workaround for iOS app introduced in 0.65
+        vol.Optional('battery_status'): str,
+        vol.Optional('hostname'): str,
+    }))
 
 
 @bind_hass
@@ -109,7 +128,7 @@ def is_on(hass: HomeAssistantType, entity_id: str = None):
 def see(hass: HomeAssistantType, mac: str = None, dev_id: str = None,
         host_name: str = None, location_name: str = None,
         gps: GPSType = None, gps_accuracy=None,
-        battery=None, attributes: dict = None):
+        battery: int = None, attributes: dict = None):
     """Call service to notify you see device."""
     data = {key: value for key, value in
             ((ATTR_MAC, mac),
@@ -203,12 +222,14 @@ def async_setup(hass: HomeAssistantType, config: ConfigType):
     @asyncio.coroutine
     def async_see_service(call):
         """Service to see a device."""
-        args = {key: value for key, value in call.data.items() if key in
-                (ATTR_MAC, ATTR_DEV_ID, ATTR_HOST_NAME, ATTR_LOCATION_NAME,
-                 ATTR_GPS, ATTR_GPS_ACCURACY, ATTR_BATTERY, ATTR_ATTRIBUTES)}
-        yield from tracker.async_see(**args)
+        # Temp workaround for iOS, introduced in 0.65
+        data = dict(call.data)
+        data.pop('hostname', None)
+        data.pop('battery_status', None)
+        yield from tracker.async_see(**data)
 
-    hass.services.async_register(DOMAIN, SERVICE_SEE, async_see_service)
+    hass.services.async_register(
+        DOMAIN, SERVICE_SEE, async_see_service, SERVICE_SEE_PAYLOAD_SCHEMA)
 
     # restore
     yield from tracker.async_setup_tracked_device()
@@ -240,23 +261,26 @@ class DeviceTracker(object):
                                 dev.mac)
 
     def see(self, mac: str = None, dev_id: str = None, host_name: str = None,
-            location_name: str = None, gps: GPSType = None, gps_accuracy=None,
-            battery: str = None, attributes: dict = None,
-            source_type: str = SOURCE_TYPE_GPS, picture: str = None,
-            icon: str = None):
+            location_name: str = None, gps: GPSType = None,
+            gps_accuracy: int = None, battery: int = None,
+            attributes: dict = None, source_type: str = SOURCE_TYPE_GPS,
+            picture: str = None, icon: str = None,
+            consider_home: timedelta = None):
         """Notify the device tracker that you see a device."""
         self.hass.add_job(
             self.async_see(mac, dev_id, host_name, location_name, gps,
                            gps_accuracy, battery, attributes, source_type,
-                           picture, icon)
+                           picture, icon, consider_home)
         )
 
     @asyncio.coroutine
-    def async_see(self, mac: str = None, dev_id: str = None,
-                  host_name: str = None, location_name: str = None,
-                  gps: GPSType = None, gps_accuracy=None, battery: str = None,
-                  attributes: dict = None, source_type: str = SOURCE_TYPE_GPS,
-                  picture: str = None, icon: str = None):
+    def async_see(
+            self, mac: str = None, dev_id: str = None, host_name: str = None,
+            location_name: str = None, gps: GPSType = None,
+            gps_accuracy: int = None, battery: int = None,
+            attributes: dict = None, source_type: str = SOURCE_TYPE_GPS,
+            picture: str = None, icon: str = None,
+            consider_home: timedelta = None):
         """Notify the device tracker that you see a device.
 
         This method is a coroutine.
@@ -275,7 +299,7 @@ class DeviceTracker(object):
         if device:
             yield from device.async_seen(
                 host_name, location_name, gps, gps_accuracy, battery,
-                attributes, source_type)
+                attributes, source_type, consider_home)
             if device.track:
                 yield from device.async_update_ha_state()
             return
@@ -283,7 +307,7 @@ class DeviceTracker(object):
         # If no device can be found, create it
         dev_id = util.ensure_unique_string(dev_id, self.devices.keys())
         device = Device(
-            self.hass, self.consider_home, self.track_new,
+            self.hass, consider_home or self.consider_home, self.track_new,
             dev_id, mac, (host_name or dev_id).replace('_', ' '),
             picture=picture, icon=icon,
             hide_if_away=self.defaults.get(CONF_AWAY_HIDE, DEFAULT_AWAY_HIDE))
@@ -384,9 +408,10 @@ class Device(Entity):
     host_name = None  # type: str
     location_name = None  # type: str
     gps = None  # type: GPSType
-    gps_accuracy = 0
+    gps_accuracy = 0  # type: int
     last_seen = None  # type: dt_util.dt.datetime
-    battery = None  # type: str
+    consider_home = None  # type: dt_util.dt.timedelta
+    battery = None  # type: int
     attributes = None  # type: dict
     vendor = None  # type: str
     icon = None  # type: str
@@ -476,14 +501,16 @@ class Device(Entity):
 
     @asyncio.coroutine
     def async_seen(self, host_name: str = None, location_name: str = None,
-                   gps: GPSType = None, gps_accuracy=0, battery: str = None,
+                   gps: GPSType = None, gps_accuracy=0, battery: int = None,
                    attributes: dict = None,
-                   source_type: str = SOURCE_TYPE_GPS):
+                   source_type: str = SOURCE_TYPE_GPS,
+                   consider_home: timedelta = None):
         """Mark the device as seen."""
         self.source_type = source_type
         self.last_seen = dt_util.utcnow()
         self.host_name = host_name
         self.location_name = location_name
+        self.consider_home = consider_home or self.consider_home
 
         if battery:
             self.battery = battery

homeassistant/components/device_tracker/asuswrt.py

@@ -283,15 +283,15 @@ class SshConnection(_Connection):
             lines = self._ssh.before.split(b'\n')[1:-1]
             return [line.decode('utf-8') for line in lines]
         except exceptions.EOF as err:
-            _LOGGER.error("Connection refused. SSH enabled?")
+            _LOGGER.error("Connection refused. %s", self._ssh.before)
             self.disconnect()
             return None
         except pxssh.ExceptionPxssh as err:
-            _LOGGER.error("Unexpected SSH error: %s", str(err))
+            _LOGGER.error("Unexpected SSH error: %s", err)
             self.disconnect()
             return None
         except AssertionError as err:
-            _LOGGER.error("Connection to router unavailable: %s", str(err))
+            _LOGGER.error("Connection to router unavailable: %s", err)
             self.disconnect()
             return None
 
@@ -301,10 +301,10 @@ class SshConnection(_Connection):
 
         self._ssh = pxssh.pxssh()
         if self._ssh_key:
-            self._ssh.login(self._host, self._username,
+            self._ssh.login(self._host, self._username, quiet=False,
                             ssh_key=self._ssh_key, port=self._port)
         else:
-            self._ssh.login(self._host, self._username,
+            self._ssh.login(self._host, self._username, quiet=False,
                             password=self._password, port=self._port)
 
         super().connect()

homeassistant/components/device_tracker/icloud.py

@@ -189,10 +189,12 @@ class Icloud(DeviceScanner):
             for device in self.api.devices:
                 status = device.status(DEVICESTATUSSET)
                 devicename = slugify(status['name'].replace(' ', '', 99))
-                if devicename not in self.devices:
-                    self.devices[devicename] = device
-                    self._intervals[devicename] = 1
-                    self._overridestates[devicename] = None
+                if devicename in self.devices:
+                    _LOGGER.error('Multiple devices with name: %s', devicename)
+                    continue
+                self.devices[devicename] = device
+                self._intervals[devicename] = 1
+                self._overridestates[devicename] = None
         except PyiCloudNoDevicesException:
             _LOGGER.error('No iCloud Devices found!')
 
@@ -319,14 +321,6 @@ class Icloud(DeviceScanner):
 
     def determine_interval(self, devicename, latitude, longitude, battery):
         """Calculate new interval."""
-        distancefromhome = None
-        zone_state = self.hass.states.get('zone.home')
-        zone_state_lat = zone_state.attributes['latitude']
-        zone_state_long = zone_state.attributes['longitude']
-        distancefromhome = distance(
-            latitude, longitude, zone_state_lat, zone_state_long)
-        distancefromhome = round(distancefromhome / 1000, 1)
-
         currentzone = active_zone(self.hass, latitude, longitude)
 
         if ((currentzone is not None and
@@ -335,22 +329,48 @@ class Icloud(DeviceScanner):
                  self._overridestates.get(devicename) == 'away')):
             return
 
+        zones = (self.hass.states.get(entity_id) for entity_id
+                 in sorted(self.hass.states.entity_ids('zone')))
+
+        distances = []
+        for zone_state in zones:
+            zone_state_lat = zone_state.attributes['latitude']
+            zone_state_long = zone_state.attributes['longitude']
+            zone_distance = distance(
+                latitude, longitude, zone_state_lat, zone_state_long)
+            distances.append(round(zone_distance / 1000, 1))
+
+        if distances:
+            mindistance = min(distances)
+        else:
+            mindistance = None
+
         self._overridestates[devicename] = None
 
         if currentzone is not None:
             self._intervals[devicename] = 30
             return
 
-        if distancefromhome is None:
+        if mindistance is None:
             return
-        if distancefromhome > 25:
-            self._intervals[devicename] = round(distancefromhome / 2, 0)
-        elif distancefromhome > 10:
-            self._intervals[devicename] = 5
-        else:
-            self._intervals[devicename] = 1
-        if battery is not None and battery <= 33 and distancefromhome > 3:
-            self._intervals[devicename] = self._intervals[devicename] * 2
+
+        # Calculate out how long it would take for the device to drive to the
+        # nearest zone at 120 km/h:
+        interval = round(mindistance / 2, 0)
+
+        # Never poll more than once per minute
+        interval = max(interval, 1)
+
+        if interval > 180:
+            # Three hour drive?  This is far enough that they might be flying
+            # home - check every half hour
+            interval = 30
+
+        if battery is not None and battery <= 33 and mindistance > 3:
+            # Low battery - let's check half as often
+            interval = interval * 2
+
+        self._intervals[devicename] = interval
 
     def update_device(self, devicename):
         """Update the device_tracker entity."""

homeassistant/components/device_tracker/mikrotik.py

@@ -73,7 +73,8 @@ class MikrotikScanner(DeviceScanner):
                 self.host,
                 self.username,
                 self.password,
-                port=int(self.port)
+                port=int(self.port),
+                encoding='utf-8'
             )
 
             try:

homeassistant/components/device_tracker/tado.py

@@ -68,22 +68,18 @@ class TadoDeviceScanner(DeviceScanner):
         self.websession = async_create_clientsession(
             hass, cookie_jar=aiohttp.CookieJar(unsafe=True, loop=hass.loop))
 
-        self.success_init = self._update_info()
+        self.success_init = asyncio.run_coroutine_threadsafe(
+            self._async_update_info(), hass.loop
+        ).result()
+
         _LOGGER.info("Scanner initialized")
 
-    @asyncio.coroutine
-    def async_scan_devices(self):
+    async def async_scan_devices(self):
         """Scan for devices and return a list containing found device ids."""
-        info = self._update_info()
-
-        # Don't yield if we got None
-        if info is not None:
-            yield from info
-
+        await self._async_update_info()
         return [device.mac for device in self.last_results]
 
-    @asyncio.coroutine
-    def async_get_device_name(self, device):
+    async def async_get_device_name(self, device):
         """Return the name of the given device or None if we don't know."""
         filter_named = [result.name for result in self.last_results
                         if result.mac == device]
@@ -93,7 +89,7 @@ class TadoDeviceScanner(DeviceScanner):
         return None
 
     @Throttle(MIN_TIME_BETWEEN_SCANS)
-    def _update_info(self):
+    async def _async_update_info(self):
         """
         Query Tado for device marked as at home.
 
@@ -104,21 +100,21 @@ class TadoDeviceScanner(DeviceScanner):
         last_results = []
 
         try:
-            with async_timeout.timeout(10, loop=self.hass.loop):
+            with async_timeout.timeout(10):
                 # Format the URL here, so we can log the template URL if
                 # anything goes wrong without exposing username and password.
                 url = self.tadoapiurl.format(
                     home_id=self.home_id, username=self.username,
                     password=self.password)
 
-                response = yield from self.websession.get(url)
+                response = await self.websession.get(url)
 
                 if response.status != 200:
                     _LOGGER.warning(
                         "Error %d on %s.", response.status, self.tadoapiurl)
-                    return
+                    return False
 
-                tado_json = yield from response.json()
+                tado_json = await response.json()
 
         except (asyncio.TimeoutError, aiohttp.ClientError):
             _LOGGER.error("Cannot load Tado data")
@@ -139,7 +135,7 @@ class TadoDeviceScanner(DeviceScanner):
 
         self.last_results = last_results
 
-        _LOGGER.info(
+        _LOGGER.debug(
             "Tado presence query successful, %d device(s) at home",
             len(self.last_results)
         )

homeassistant/components/device_tracker/tesla.py

@@ -44,14 +44,15 @@ class TeslaDeviceTracker(object):
             _LOGGER.debug("Updating device position: %s", name)
             dev_id = slugify(device.uniq_name)
             location = device.get_location()
-            lat = location['latitude']
-            lon = location['longitude']
-            attrs = {
-                'trackr_id': dev_id,
-                'id': dev_id,
-                'name': name
-            }
-            self.see(
-                dev_id=dev_id, host_name=name,
-                gps=(lat, lon), attributes=attrs
-            )
+            if location:
+                lat = location['latitude']
+                lon = location['longitude']
+                attrs = {
+                    'trackr_id': dev_id,
+                    'id': dev_id,
+                    'name': name
+                }
+                self.see(
+                    dev_id=dev_id, host_name=name,
+                    gps=(lat, lon), attributes=attrs
+                )

homeassistant/components/device_tracker/ubus.py

@@ -23,7 +23,8 @@ CONF_DHCP_SOFTWARE = 'dhcp_software'
 DEFAULT_DHCP_SOFTWARE = 'dnsmasq'
 DHCP_SOFTWARES = [
     'dnsmasq',
-    'odhcpd'
+    'odhcpd',
+    'none'
 ]
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -40,8 +41,10 @@ def get_scanner(hass, config):
     dhcp_sw = config[DOMAIN][CONF_DHCP_SOFTWARE]
     if dhcp_sw == 'dnsmasq':
         scanner = DnsmasqUbusDeviceScanner(config[DOMAIN])
-    else:
+    elif dhcp_sw == 'odhcpd':
         scanner = OdhcpdUbusDeviceScanner(config[DOMAIN])
+    else:
+        scanner = UbusDeviceScanner(config[DOMAIN])
 
     return scanner if scanner.success_init else None
 
@@ -92,8 +95,8 @@ class UbusDeviceScanner(DeviceScanner):
         return self.last_results
 
     def _generate_mac2name(self):
-        """Must be implemented depending on the software."""
-        raise NotImplementedError
+        """Return empty MAC to name dict. Overriden if DHCP server is set."""
+        self.mac2name = dict()
 
     @_refresh_on_access_denied
     def get_device_name(self, device):

homeassistant/components/device_tracker/unifi.py

@@ -98,7 +98,8 @@ class UnifiScanner(DeviceScanner):
         # Filter clients to provided SSID list
         if self._ssid_filter:
             clients = [client for client in clients
-                       if client['essid'] in self._ssid_filter]
+                       if 'essid' in client and
+                       client['essid'] in self._ssid_filter]
 
         self._clients = {
             client['mac']: client

homeassistant/components/discovery.py

@@ -6,7 +6,6 @@ Will emit EVENT_PLATFORM_DISCOVERED whenever a new service has been discovered.
 Knows which components handle certain types, will make sure they are
 loaded before the EVENT_PLATFORM_DISCOVERED is fired.
 """
-import asyncio
 import json
 from datetime import timedelta
 import logging
@@ -21,7 +20,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.discovery import async_load_platform, async_discover
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['netdisco==1.2.4']
+REQUIREMENTS = ['netdisco==1.3.0']
 
 DOMAIN = 'discovery'
 
@@ -39,6 +38,7 @@ SERVICE_TELLDUSLIVE = 'tellstick'
 SERVICE_HUE = 'philips_hue'
 SERVICE_DECONZ = 'deconz'
 SERVICE_DAIKIN = 'daikin'
+SERVICE_SAMSUNG_PRINTER = 'samsung_printer'
 
 SERVICE_HANDLERS = {
     SERVICE_HASS_IOS_APP: ('ios', None),
@@ -54,6 +54,7 @@ SERVICE_HANDLERS = {
     SERVICE_HUE: ('hue', None),
     SERVICE_DECONZ: ('deconz', None),
     SERVICE_DAIKIN: ('daikin', None),
+    SERVICE_SAMSUNG_PRINTER: ('sensor', 'syncthru'),
     'google_cast': ('media_player', 'cast'),
     'panasonic_viera': ('media_player', 'panasonic_viera'),
     'plex_mediaserver': ('media_player', 'plex'),
@@ -71,6 +72,7 @@ SERVICE_HANDLERS = {
     'sabnzbd': ('sensor', 'sabnzbd'),
     'bose_soundtouch': ('media_player', 'soundtouch'),
     'bluesound': ('media_player', 'bluesound'),
+    'songpal': ('media_player', 'songpal'),
 }
 
 CONF_IGNORE = 'ignore'
@@ -83,8 +85,7 @@ CONFIG_SCHEMA = vol.Schema({
 }, extra=vol.ALLOW_EXTRA)
 
 
-@asyncio.coroutine
-def async_setup(hass, config):
+async def async_setup(hass, config):
     """Start a discovery service."""
     from netdisco.discovery import NetworkDiscovery
 
@@ -98,8 +99,7 @@ def async_setup(hass, config):
     # Platforms ignore by config
     ignored_platforms = config[DOMAIN][CONF_IGNORE]
 
-    @asyncio.coroutine
-    def new_service_found(service, info):
+    async def new_service_found(service, info):
         """Handle a new service if one is found."""
         if service in ignored_platforms:
             logger.info("Ignoring service: %s %s", service, info)
@@ -123,15 +123,14 @@ def async_setup(hass, config):
         component, platform = comp_plat
 
         if platform is None:
-            yield from async_discover(hass, service, info, component, config)
+            await async_discover(hass, service, info, component, config)
         else:
-            yield from async_load_platform(
+            await async_load_platform(
                 hass, component, platform, info, config)
 
-    @asyncio.coroutine
-    def scan_devices(now):
+    async def scan_devices(now):
         """Scan for devices."""
-        results = yield from hass.async_add_job(_discover, netdisco)
+        results = await hass.async_add_job(_discover, netdisco)
 
         for result in results:
             hass.async_add_job(new_service_found(*result))

homeassistant/components/doorbird.py

@@ -13,7 +13,7 @@ from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD
 from homeassistant.components.http import HomeAssistantView
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['DoorBirdPy==0.1.2']
+REQUIREMENTS = ['DoorBirdPy==0.1.3']
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/downloader.py

@@ -25,6 +25,8 @@ ATTR_OVERWRITE = 'overwrite'
 CONF_DOWNLOAD_DIR = 'download_dir'
 
 DOMAIN = 'downloader'
+DOWNLOAD_FAILED_EVENT = 'download_failed'
+DOWNLOAD_COMPLETED_EVENT = 'download_completed'
 
 SERVICE_DOWNLOAD_FILE = 'download_file'
 
@@ -133,9 +135,19 @@ def setup(hass, config):
                             fil.write(chunk)
 
                     _LOGGER.debug("Downloading of %s done", url)
+                    hass.bus.fire(
+                        "{}_{}".format(DOMAIN, DOWNLOAD_COMPLETED_EVENT), {
+                            'url': url,
+                            'filename': filename
+                            })
 
             except requests.exceptions.ConnectionError:
                 _LOGGER.exception("ConnectionError occurred for %s", url)
+                hass.bus.fire(
+                    "{}_{}".format(DOMAIN, DOWNLOAD_FAILED_EVENT), {
+                        'url': url,
+                        'filename': filename
+                        })
 
                 # Remove file if we started downloading but failed
                 if final_path and os.path.isfile(final_path):

homeassistant/components/ecobee.py

@@ -16,7 +16,7 @@ from homeassistant.const import CONF_API_KEY
 from homeassistant.util import Throttle
 from homeassistant.util.json import save_json
 
-REQUIREMENTS = ['python-ecobee-api==0.0.15']
+REQUIREMENTS = ['python-ecobee-api==0.0.17']
 
 _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/egardia.py

@@ -0,0 +1,123 @@
+"""
+Interfaces with Egardia/Woonveilig alarm control panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/egardia/
+"""
+import logging
+
+import requests
+import voluptuous as vol
+
+from homeassistant.helpers import discovery
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (
+    CONF_PORT, CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_NAME,
+    EVENT_HOMEASSISTANT_STOP)
+
+REQUIREMENTS = ['pythonegardia==1.0.39']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_REPORT_SERVER_CODES = 'report_server_codes'
+CONF_REPORT_SERVER_ENABLED = 'report_server_enabled'
+CONF_REPORT_SERVER_PORT = 'report_server_port'
+REPORT_SERVER_CODES_IGNORE = 'ignore'
+CONF_VERSION = 'version'
+
+DEFAULT_NAME = 'Egardia'
+DEFAULT_PORT = 80
+DEFAULT_REPORT_SERVER_ENABLED = False
+DEFAULT_REPORT_SERVER_PORT = 52010
+DEFAULT_VERSION = 'GATE-01'
+DOMAIN = 'egardia'
+EGARDIA_SERVER = 'egardia_server'
+EGARDIA_DEVICE = 'egardiadevice'
+EGARDIA_NAME = 'egardianame'
+EGARDIA_REPORT_SERVER_ENABLED = 'egardia_rs_enabled'
+EGARDIA_REPORT_SERVER_CODES = 'egardia_rs_codes'
+NOTIFICATION_ID = 'egardia_notification'
+NOTIFICATION_TITLE = 'Egardia'
+ATTR_DISCOVER_DEVICES = 'egardia_sensor'
+
+SERVER_CODE_SCHEMA = vol.Schema({
+    vol.Optional('arm'): vol.All(cv.ensure_list_csv, [cv.string]),
+    vol.Optional('disarm'): vol.All(cv.ensure_list_csv, [cv.string]),
+    vol.Optional('armhome'): vol.All(cv.ensure_list_csv, [cv.string]),
+    vol.Optional('triggered'): vol.All(cv.ensure_list_csv, [cv.string]),
+    vol.Optional('ignore'): vol.All(cv.ensure_list_csv, [cv.string])
+})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Optional(CONF_VERSION, default=DEFAULT_VERSION): cv.string,
+        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        vol.Optional(CONF_REPORT_SERVER_CODES, default={}): SERVER_CODE_SCHEMA,
+        vol.Optional(CONF_REPORT_SERVER_ENABLED,
+                     default=DEFAULT_REPORT_SERVER_ENABLED): cv.boolean,
+        vol.Optional(CONF_REPORT_SERVER_PORT,
+                     default=DEFAULT_REPORT_SERVER_PORT): cv.port,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+def setup(hass, config):
+    """Set up the Egardia platform."""
+    from pythonegardia import egardiadevice
+    from pythonegardia import egardiaserver
+    conf = config[DOMAIN]
+    username = conf.get(CONF_USERNAME)
+    password = conf.get(CONF_PASSWORD)
+    host = conf.get(CONF_HOST)
+    port = conf.get(CONF_PORT)
+    version = conf.get(CONF_VERSION)
+    rs_enabled = conf.get(CONF_REPORT_SERVER_ENABLED)
+    rs_port = conf.get(CONF_REPORT_SERVER_PORT)
+    try:
+        device = hass.data[EGARDIA_DEVICE] = egardiadevice.EgardiaDevice(
+            host, port, username, password, '', version)
+    except requests.exceptions.RequestException:
+        _LOGGER.error("An error occurred accessing your Egardia device. " +
+                      "Please check config.")
+        return False
+    except egardiadevice.UnauthorizedError:
+        _LOGGER.error("Unable to authorize. Wrong password or username.")
+        return False
+    # Set up the egardia server if enabled
+    if rs_enabled:
+        _LOGGER.debug("Setting up EgardiaServer")
+        try:
+            if EGARDIA_SERVER not in hass.data:
+                server = egardiaserver.EgardiaServer('', rs_port)
+                bound = server.bind()
+                if not bound:
+                    raise IOError("Binding error occurred while " +
+                                  "starting EgardiaServer.")
+                hass.data[EGARDIA_SERVER] = server
+                server.start()
+
+            def handle_stop_event(event):
+                """Callback function for HA stop event."""
+                server.stop()
+
+            # listen to home assistant stop event
+            hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, handle_stop_event)
+
+        except IOError:
+            _LOGGER.error("Binding error occurred while starting " +
+                          "EgardiaServer.")
+            return False
+
+    discovery.load_platform(hass, 'alarm_control_panel', DOMAIN,
+                            discovered=conf, hass_config=config)
+
+    # get the sensors from the device and add those
+    sensors = device.getsensors()
+    discovery.load_platform(hass, 'binary_sensor', DOMAIN,
+                            {ATTR_DISCOVER_DEVICES: sensors}, config)
+
+    return True

homeassistant/components/emulated_hue/__init__.py

@@ -4,7 +4,6 @@ Support for local control of entities by emulating the Phillips Hue bridge.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/emulated_hue/
 """
-import asyncio
 import logging
 
 import voluptuous as vol
@@ -111,17 +110,15 @@ def setup(hass, yaml_config):
         config.upnp_bind_multicast, config.advertise_ip,
         config.advertise_port)
 
-    @asyncio.coroutine
-    def stop_emulated_hue_bridge(event):
+    async def stop_emulated_hue_bridge(event):
         """Stop the emulated hue bridge."""
         upnp_listener.stop()
-        yield from server.stop()
+        await server.stop()
 
-    @asyncio.coroutine
-    def start_emulated_hue_bridge(event):
+    async def start_emulated_hue_bridge(event):
         """Start the emulated hue bridge."""
         upnp_listener.start()
-        yield from server.start()
+        await server.start()
         hass.bus.async_listen_once(
             EVENT_HOMEASSISTANT_STOP, stop_emulated_hue_bridge)
 

homeassistant/components/fan/insteon_plm.py

@@ -0,0 +1,96 @@
+"""
+Support for INSTEON fans via PowerLinc Modem.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/fan.insteon_plm/
+"""
+import asyncio
+import logging
+
+from homeassistant.components.fan import (SPEED_OFF,
+                                          SPEED_LOW,
+                                          SPEED_MEDIUM,
+                                          SPEED_HIGH,
+                                          FanEntity,
+                                          SUPPORT_SET_SPEED)
+from homeassistant.const import STATE_OFF
+from homeassistant.components.insteon_plm import InsteonPLMEntity
+
+DEPENDENCIES = ['insteon_plm']
+
+SPEED_TO_HEX = {SPEED_OFF: 0x00,
+                SPEED_LOW: 0x3f,
+                SPEED_MEDIUM: 0xbe,
+                SPEED_HIGH: 0xff}
+
+FAN_SPEEDS = [STATE_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@asyncio.coroutine
+def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
+    """Set up the INSTEON PLM device class for the hass platform."""
+    plm = hass.data['insteon_plm']
+
+    address = discovery_info['address']
+    device = plm.devices[address]
+    state_key = discovery_info['state_key']
+
+    _LOGGER.debug('Adding device %s entity %s to Fan platform',
+                  device.address.hex, device.states[state_key].name)
+
+    new_entity = InsteonPLMFan(device, state_key)
+
+    async_add_devices([new_entity])
+
+
+class InsteonPLMFan(InsteonPLMEntity, FanEntity):
+    """An INSTEON fan component."""
+
+    @property
+    def speed(self) -> str:
+        """Return the current speed."""
+        return self._hex_to_speed(self._insteon_device_state.value)
+
+    @property
+    def speed_list(self) -> list:
+        """Get the list of available speeds."""
+        return FAN_SPEEDS
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        return SUPPORT_SET_SPEED
+
+    @asyncio.coroutine
+    def async_turn_on(self, speed: str = None, **kwargs) -> None:
+        """Turn on the entity."""
+        if speed is None:
+            speed = SPEED_MEDIUM
+        yield from self.async_set_speed(speed)
+
+    @asyncio.coroutine
+    def async_turn_off(self, **kwargs) -> None:
+        """Turn off the entity."""
+        yield from self.async_set_speed(SPEED_OFF)
+
+    @asyncio.coroutine
+    def async_set_speed(self, speed: str) -> None:
+        """Set the speed of the fan."""
+        fan_speed = SPEED_TO_HEX[speed]
+        if fan_speed == 0x00:
+            self._insteon_device_state.off()
+        else:
+            self._insteon_device_state.set_level(fan_speed)
+
+    @staticmethod
+    def _hex_to_speed(speed: int):
+        hex_speed = SPEED_OFF
+        if speed > 0xfe:
+            hex_speed = SPEED_HIGH
+        elif speed > 0x7f:
+            hex_speed = SPEED_MEDIUM
+        elif speed > 0:
+            hex_speed = SPEED_LOW
+        return hex_speed

homeassistant/components/fan/xiaomi_miio.py

@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
-REQUIREMENTS = ['python-miio==0.3.7']
+REQUIREMENTS = ['python-miio==0.3.8']
 
 ATTR_TEMPERATURE = 'temperature'
 ATTR_HUMIDITY = 'humidity'