jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-21 20:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

2023.1.7 (#86389)

Browse Source
This commit is contained in:
Franck Nijhof 2023-01-22 19:16:56 +01:00 committed by GitHub
commit a22041c9be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 143 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ CONF_NOISE_PSK = "noise_psk"
_LOGGER = logging.getLogger(__name__)
_R = TypeVar("_R")
STABLE_BLE_VERSION_STR = "2022.12.0"
STABLE_BLE_VERSION_STR = "2022.12.4"
STABLE_BLE_VERSION = AwesomeVersion(STABLE_BLE_VERSION_STR)
PROJECT_URLS = {
"esphome.bluetooth-proxy": "https://esphome.github.io/bluetooth-proxies/",

2
homeassistant/components/garages_amsterdam/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Garages Amsterdam",
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/garages_amsterdam",
"requirements": ["odp-amsterdam==5.0.0"],
"requirements": ["odp-amsterdam==5.0.1"],
"codeowners": ["@klaasnicolaas"],
"iot_class": "cloud_polling"
}

4
homeassistant/components/pi_hole/__init__.py
View File

@ -117,10 +117,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry_data.pop(CONF_STATISTICS_ONLY)
hass.config_entries.async_update_entry(entry, data=entry_data)
# start reauth to force api key is present
if CONF_API_KEY not in entry.data:
raise ConfigEntryAuthFailed
_LOGGER.debug("Setting up %s integration with host %s", DOMAIN, host)
session = async_get_clientsession(hass, verify_tls)

26
homeassistant/components/pi_hole/config_flow.py
View File

@ -56,7 +56,6 @@ class PiHoleFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
CONF_LOCATION: user_input[CONF_LOCATION],
CONF_SSL: user_input[CONF_SSL],
CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
CONF_API_KEY: user_input[CONF_API_KEY],
}
self._async_abort_entries_match(
@ -71,6 +70,9 @@ class PiHoleFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
title=user_input[CONF_NAME], data=self._config
)
if CONF_API_KEY in errors:
return await self.async_step_api_key()
user_input = user_input or {}
return self.async_show_form(
step_id="user",
@ -80,7 +82,6 @@ class PiHoleFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
vol.Required(
CONF_PORT, default=user_input.get(CONF_PORT, 80)
): vol.Coerce(int),
vol.Required(CONF_API_KEY): str,
vol.Required(
CONF_NAME, default=user_input.get(CONF_NAME, DEFAULT_NAME)
): str,
@ -101,6 +102,25 @@ class PiHoleFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
errors=errors,
)
async def async_step_api_key(
self, user_input: dict[str, Any] | None = None
) -> FlowResult:
"""Handle step to setup API key."""
errors = {}
if user_input is not None:
self._config[CONF_API_KEY] = user_input[CONF_API_KEY]
if not (errors := await self._async_try_connect()):
return self.async_create_entry(
title=self._config[CONF_NAME],
data=self._config,
)
return self.async_show_form(
step_id="api_key",
data_schema=vol.Schema({vol.Required(CONF_API_KEY): str}),
errors=errors,
)
async def async_step_import(self, user_input: dict[str, Any]) -> FlowResult:
"""Handle a flow initiated by import."""
@ -178,7 +198,7 @@ class PiHoleFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
session,
location=self._config[CONF_LOCATION],
tls=self._config[CONF_SSL],
api_token=self._config[CONF_API_KEY],
api_token=self._config.get(CONF_API_KEY),
)
try:
await pi_hole.get_data()

6
homeassistant/components/pi_hole/strings.json
View File

@ -7,11 +7,15 @@
"port": "[%key:common::config_flow::data::port%]",
"name": "[%key:common::config_flow::data::name%]",
"location": "[%key:common::config_flow::data::location%]",
"api_key": "[%key:common::config_flow::data::api_key%]",
"ssl": "[%key:common::config_flow::data::ssl%]",
"verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
}
},
"api_key": {
"data": {
"api_key": "[%key:common::config_flow::data::api_key%]"
}
},
"reauth_confirm": {
"title": "PI-Hole [%key:common::config_flow::title::reauth%]",
"description": "Please enter a new api key for PI-Hole at {host}/{location}",

6
homeassistant/components/pi_hole/translations/en.json
View File

@ -9,6 +9,11 @@
"invalid_auth": "Invalid authentication"
},
"step": {
"api_key": {
"data": {
"api_key": "API Key"
}
},
"reauth_confirm": {
"data": {
"api_key": "API Key"
@ -18,7 +23,6 @@
},
"user": {
"data": {
"api_key": "API Key",
"host": "Host",
"location": "Location",
"name": "Name",

3
homeassistant/components/shelly/coordinator.py
View File

@ -660,7 +660,8 @@ async def async_reconnect_soon(
) -> None:
"""Try to reconnect soon."""
if (
not hass.is_stopping
not entry.data.get(CONF_SLEEP_PERIOD)
and not hass.is_stopping
and entry.state == config_entries.ConfigEntryState.LOADED
and (entry_data := get_entry_data(hass).get(entry.entry_id))
and (coordinator := entry_data.rpc)

2
homeassistant/components/stream/worker.py
View File

@ -192,7 +192,7 @@ class StreamMuxer:
# of the range, hoping that the parts stay pretty well bounded, and we adjust the part
# durations a bit in the hls metadata so that everything "looks" ok.
"frag_duration": str(
self._stream_settings.part_target_duration * 9e5
int(self._stream_settings.part_target_duration * 9e5)
),
}
if self._stream_settings.ll_hls

2
homeassistant/components/tibber/manifest.json
View File

@ -3,7 +3,7 @@
"domain": "tibber",
"name": "Tibber",
"documentation": "https://www.home-assistant.io/integrations/tibber",
"requirements": ["pyTibber==0.26.9"],
"requirements": ["pyTibber==0.26.11"],
"codeowners": ["@danielhiversen"],
"quality_scale": "silver",
"config_flow": true,

2
homeassistant/const.py
View File

@ -8,7 +8,7 @@ from .backports.enum import StrEnum
APPLICATION_NAME: Final = "HomeAssistant"
MAJOR_VERSION: Final = 2023
MINOR_VERSION: Final = 1
PATCH_VERSION: Final = "6"
PATCH_VERSION: Final = "7"
__short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
__version__: Final = f"{__short_version__}.{PATCH_VERSION}"
REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 9, 0)

2
pyproject.toml
View File

@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "homeassistant"
version = "2023.1.6"
version = "2023.1.7"
license = {text = "Apache-2.0"}
description = "Open-source home automation platform running on Python 3."
readme = "README.rst"

4
requirements_all.txt
View File

@ -1220,7 +1220,7 @@ oauth2client==4.1.3
objgraph==3.5.0
# homeassistant.components.garages_amsterdam
odp-amsterdam==5.0.0
odp-amsterdam==5.0.1
# homeassistant.components.oem
oemthermostat==1.1.1
@ -1439,7 +1439,7 @@ pyRFXtrx==0.30.0
pySwitchmate==0.5.1
# homeassistant.components.tibber
pyTibber==0.26.9
pyTibber==0.26.11
# homeassistant.components.dlink
pyW215==0.7.0

4
requirements_test_all.txt
View File

@ -892,7 +892,7 @@ oauth2client==4.1.3
objgraph==3.5.0
# homeassistant.components.garages_amsterdam
odp-amsterdam==5.0.0
odp-amsterdam==5.0.1
# homeassistant.components.omnilogic
omnilogic==0.4.5
@ -1039,7 +1039,7 @@ pyMetno==0.9.0
pyRFXtrx==0.30.0
# homeassistant.components.tibber
pyTibber==0.26.9
pyTibber==0.26.11
# homeassistant.components.nextbus
py_nextbusnext==0.1.5

19
tests/components/pi_hole/__init__.py
View File

@ -74,7 +74,6 @@ CONFIG_DATA = {
CONFIG_FLOW_USER = {
CONF_HOST: HOST,
CONF_PORT: PORT,
CONF_API_KEY: API_KEY,
CONF_LOCATION: LOCATION,
CONF_NAME: NAME,
CONF_SSL: SSL,
@ -85,7 +84,7 @@ CONFIG_FLOW_API_KEY = {
CONF_API_KEY: API_KEY,
}
CONFIG_ENTRY = {
CONFIG_ENTRY_WITH_API_KEY = {
CONF_HOST: f"{HOST}:{PORT}",
CONF_LOCATION: LOCATION,
CONF_NAME: NAME,
@ -94,7 +93,15 @@ CONFIG_ENTRY = {
CONF_VERIFY_SSL: VERIFY_SSL,
}
CONFIG_ENTRY_IMPORTED = {**CONFIG_ENTRY, CONF_STATISTICS_ONLY: False}
CONFIG_ENTRY_WITHOUT_API_KEY = {
CONF_HOST: f"{HOST}:{PORT}",
CONF_LOCATION: LOCATION,
CONF_NAME: NAME,
CONF_SSL: SSL,
CONF_VERIFY_SSL: VERIFY_SSL,
}
CONFIG_ENTRY_IMPORTED = {**CONFIG_ENTRY_WITH_API_KEY, CONF_STATISTICS_ONLY: False}
SWITCH_ENTITY_ID = "switch.pi_hole"
@ -128,3 +135,9 @@ def _patch_config_flow_hole(mocked_hole):
return patch(
"homeassistant.components.pi_hole.config_flow.Hole", return_value=mocked_hole
)
def _patch_setup_hole():
return patch(
"homeassistant.components.pi_hole.async_setup_entry", return_value=True
)

64
tests/components/pi_hole/test_config_flow.py
View File

@ -1,6 +1,5 @@
"""Test pi_hole config flow."""
import logging
from unittest.mock import patch
from homeassistant.components.pi_hole.const import DOMAIN
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
@ -11,30 +10,26 @@ from homeassistant.data_entry_flow import FlowResultType
from . import (
CONFIG_DATA,
CONFIG_DATA_DEFAULTS,
CONFIG_ENTRY,
CONFIG_ENTRY_IMPORTED,
CONFIG_ENTRY_WITH_API_KEY,
CONFIG_ENTRY_WITHOUT_API_KEY,
CONFIG_FLOW_API_KEY,
CONFIG_FLOW_USER,
NAME,
ZERO_DATA,
_create_mocked_hole,
_patch_config_flow_hole,
_patch_init_hole,
_patch_setup_hole,
)
from tests.common import MockConfigEntry
def _patch_setup():
return patch(
"homeassistant.components.pi_hole.async_setup_entry",
return_value=True,
)
async def test_flow_import(hass: HomeAssistant, caplog):
"""Test import flow."""
mocked_hole = _create_mocked_hole()
with _patch_config_flow_hole(mocked_hole), _patch_setup():
with _patch_config_flow_hole(mocked_hole), _patch_setup_hole():
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_IMPORT}, data=CONFIG_DATA
)
@ -53,7 +48,7 @@ async def test_flow_import(hass: HomeAssistant, caplog):
async def test_flow_import_invalid(hass: HomeAssistant, caplog):
"""Test import flow with invalid server."""
mocked_hole = _create_mocked_hole(True)
with _patch_config_flow_hole(mocked_hole), _patch_setup():
with _patch_config_flow_hole(mocked_hole), _patch_setup_hole():
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_IMPORT}, data=CONFIG_DATA
)
@ -62,10 +57,10 @@ async def test_flow_import_invalid(hass: HomeAssistant, caplog):
assert len([x for x in caplog.records if x.levelno == logging.ERROR]) == 1
async def test_flow_user(hass: HomeAssistant):
"""Test user initialized flow."""
async def test_flow_user_with_api_key(hass: HomeAssistant):
"""Test user initialized flow with api key needed."""
mocked_hole = _create_mocked_hole(has_data=False)
with _patch_config_flow_hole(mocked_hole), _patch_init_hole(mocked_hole):
with _patch_config_flow_hole(mocked_hole), _patch_setup_hole() as mock_setup:
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": SOURCE_USER},
@ -79,17 +74,26 @@ async def test_flow_user(hass: HomeAssistant):
user_input=CONFIG_FLOW_USER,
)
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["step_id"] == "api_key"
assert result["errors"] == {}
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input={CONF_API_KEY: "some_key"},
)
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "api_key"
assert result["errors"] == {CONF_API_KEY: "invalid_auth"}
mocked_hole.data = ZERO_DATA
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input=CONFIG_FLOW_USER,
user_input=CONFIG_FLOW_API_KEY,
)
assert result["type"] == FlowResultType.CREATE_ENTRY
assert result["title"] == NAME
assert result["data"] == CONFIG_ENTRY
assert result["data"] == CONFIG_ENTRY_WITH_API_KEY
mock_setup.assert_called_once()
# duplicated server
result = await hass.config_entries.flow.async_init(
@ -101,10 +105,32 @@ async def test_flow_user(hass: HomeAssistant):
assert result["reason"] == "already_configured"
async def test_flow_user_invalid(hass):
async def test_flow_user_without_api_key(hass: HomeAssistant):
"""Test user initialized flow without api key needed."""
mocked_hole = _create_mocked_hole()
with _patch_config_flow_hole(mocked_hole), _patch_setup_hole() as mock_setup:
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": SOURCE_USER},
)
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"] == {}
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input=CONFIG_FLOW_USER,
)
assert result["type"] == FlowResultType.CREATE_ENTRY
assert result["title"] == NAME
assert result["data"] == CONFIG_ENTRY_WITHOUT_API_KEY
mock_setup.assert_called_once()
async def test_flow_user_invalid(hass: HomeAssistant):
"""Test user initialized flow with invalid server."""
mocked_hole = _create_mocked_hole(True)
with _patch_config_flow_hole(mocked_hole), _patch_setup():
with _patch_config_flow_hole(mocked_hole):
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_USER}, data=CONFIG_FLOW_USER
)

15
tests/components/pi_hole/test_init.py
View File

@ -10,8 +10,7 @@ from homeassistant.components.pi_hole.const import (
SERVICE_DISABLE,
SERVICE_DISABLE_ATTR_DURATION,
)
from homeassistant.config_entries import ConfigEntryState
from homeassistant.const import ATTR_ENTITY_ID, CONF_API_KEY, CONF_HOST
from homeassistant.const import ATTR_ENTITY_ID, CONF_HOST
from homeassistant.core import HomeAssistant
from homeassistant.setup import async_setup_component
@ -200,15 +199,3 @@ async def test_remove_obsolete(hass: HomeAssistant):
with _patch_init_hole(mocked_hole):
assert await hass.config_entries.async_setup(entry.entry_id)
assert CONF_STATISTICS_ONLY not in entry.data
async def test_missing_api_key(hass: HomeAssistant):
"""Tests start reauth flow if api key is missing."""
mocked_hole = _create_mocked_hole()
data = CONFIG_DATA_DEFAULTS.copy()
data.pop(CONF_API_KEY)
entry = MockConfigEntry(domain=pi_hole.DOMAIN, data=data)
entry.add_to_hass(hass)
with _patch_init_hole(mocked_hole):
assert not await hass.config_entries.async_setup(entry.entry_id)
assert entry.state == ConfigEntryState.SETUP_ERROR

36
tests/components/shelly/test_config_flow.py
View File

@ -1187,3 +1187,39 @@ async def test_zeroconf_already_configured_triggers_refresh(
mock_rpc_device.mock_disconnected()
await hass.async_block_till_done()
assert len(mock_rpc_device.initialize.mock_calls) == 2
async def test_zeroconf_sleeping_device_not_triggers_refresh(
hass, mock_rpc_device, monkeypatch, caplog
):
"""Test zeroconf discovery does not triggers refresh for sleeping device."""
entry = MockConfigEntry(
domain="shelly",
unique_id="AABBCCDDEEFF",
data={"host": "1.1.1.1", "gen": 2, "sleep_period": 1000, "model": "SHSW-1"},
)
entry.add_to_hass(hass)
await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
mock_rpc_device.mock_update()
assert "online, resuming setup" in caplog.text
with patch(
"aioshelly.common.get_info",
return_value={"mac": "AABBCCDDEEFF", "type": "SHSW-1", "auth": False},
):
result = await hass.config_entries.flow.async_init(
DOMAIN,
data=DISCOVERY_INFO,
context={"source": config_entries.SOURCE_ZEROCONF},
)
assert result["type"] == data_entry_flow.FlowResultType.ABORT
assert result["reason"] == "already_configured"
monkeypatch.setattr(mock_rpc_device, "connected", False)
mock_rpc_device.mock_disconnected()
await hass.async_block_till_done()
assert len(mock_rpc_device.initialize.mock_calls) == 0
assert "device did not update" not in caplog.text