home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-06 14:15:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40778 from home-assistant/rc

Browse Source
This commit is contained in:
Paulus Schoutsen
2020-09-30 11:39:39 +02:00
committed by GitHub
parent ef1c8c55f8 dbda9a520e
commit 3d2d56213c
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/components/google_assistant/trait.py
View File

@@ -29,6 +29,7 @@ from homeassistant.const import (
ATTR_ENTITY_ID, ATTR_ENTITY_ID,
ATTR_SUPPORTED_FEATURES, ATTR_SUPPORTED_FEATURES,
ATTR_TEMPERATURE, ATTR_TEMPERATURE,
CAST_APP_ID_HOMEASSISTANT,
SERVICE_ALARM_ARM_AWAY, SERVICE_ALARM_ARM_AWAY,
SERVICE_ALARM_ARM_CUSTOM_BYPASS, SERVICE_ALARM_ARM_CUSTOM_BYPASS,
SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_ARM_HOME,
@@ -287,7 +288,10 @@ class CameraStreamTrait(_Trait):
url = await self.hass.components.camera.async_request_stream( url = await self.hass.components.camera.async_request_stream(
self.state.entity_id, "hls" self.state.entity_id, "hls"
) )
self.stream_info = {"cameraStreamAccessUrl": f"{get_url(self.hass)}{url}"} self.stream_info = {
"cameraStreamAccessUrl": f"{get_url(self.hass)}{url}",
"cameraStreamReceiverAppId": CAST_APP_ID_HOMEASSISTANT,
}
@register_trait @register_trait

5
homeassistant/const.py
View File

@@ -1,7 +1,7 @@
"""Constants used by Home Assistant components.""" """Constants used by Home Assistant components."""
MAJOR_VERSION = 0 MAJOR_VERSION = 0
MINOR_VERSION = 115 MINOR_VERSION = 115
PATCH_VERSION = "5" PATCH_VERSION = "6"
__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}" __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
__version__ = f"{__short_version__}.{PATCH_VERSION}" __version__ = f"{__short_version__}.{PATCH_VERSION}"
REQUIRED_PYTHON_VER = (3, 7, 1) REQUIRED_PYTHON_VER = (3, 7, 1)
@@ -608,3 +608,6 @@ PRECISION_TENTHS = 0.1
# Static list of entities that will never be exposed to # Static list of entities that will never be exposed to
# cloud, alexa, or google_home components # cloud, alexa, or google_home components
CLOUD_NEVER_EXPOSED_ENTITIES = ["group.all_locks"] CLOUD_NEVER_EXPOSED_ENTITIES = ["group.all_locks"]
# The ID of the Home Assistant Cast App
CAST_APP_ID_HOMEASSISTANT = "B12CE3CA"

1
tests/components/google_assistant/test_smart_home.py
View File

@@ -976,6 +976,7 @@ async def test_trait_execute_adding_query_data(hass):
"states": { "states": {
"online": True, "online": True,
"cameraStreamAccessUrl": "https://example.com/api/streams/bla", "cameraStreamAccessUrl": "https://example.com/api/streams/bla",
"cameraStreamReceiverAppId": "B12CE3CA",
}, },
} }
] ]

3
tests/components/google_assistant/test_trait.py
View File

@@ -135,7 +135,8 @@ async def test_camera_stream(hass):
await trt.execute(trait.COMMAND_GET_CAMERA_STREAM, BASIC_DATA, {}, {}) await trt.execute(trait.COMMAND_GET_CAMERA_STREAM, BASIC_DATA, {}, {})
assert trt.query_attributes() == { assert trt.query_attributes() == {
"cameraStreamAccessUrl": "https://example.com/api/streams/bla" "cameraStreamAccessUrl": "https://example.com/api/streams/bla",
"cameraStreamReceiverAppId": "B12CE3CA",
} }