diff --git a/homeassistant/components/assist_pipeline/__init__.py b/homeassistant/components/assist_pipeline/__init__.py index e9394a8ac5d..8addca9fbce 100644 --- a/homeassistant/components/assist_pipeline/__init__.py +++ b/homeassistant/components/assist_pipeline/__init__.py @@ -41,6 +41,8 @@ from .pipeline import ( async_setup_pipeline_store, async_update_pipeline, ) +from .select import AssistPipelineSelect, VadSensitivitySelect +from .vad import VadSensitivity from .websocket_api import async_register_websocket_api __all__ = ( @@ -51,11 +53,14 @@ __all__ = ( "SAMPLE_CHANNELS", "SAMPLE_RATE", "SAMPLE_WIDTH", + "AssistPipelineSelect", "AudioSettings", "Pipeline", "PipelineEvent", "PipelineEventType", "PipelineNotFound", + "VadSensitivity", + "VadSensitivitySelect", "WakeWordSettings", "async_create_default_pipeline", "async_get_pipelines", diff --git a/homeassistant/components/esphome/select.py b/homeassistant/components/esphome/select.py index 65494e06a36..db16ad40105 100644 --- a/homeassistant/components/esphome/select.py +++ b/homeassistant/components/esphome/select.py @@ -6,7 +6,7 @@ from dataclasses import replace from aioesphomeapi import EntityInfo, SelectInfo, SelectState -from homeassistant.components.assist_pipeline.select import ( +from homeassistant.components.assist_pipeline import ( AssistPipelineSelect, VadSensitivitySelect, ) diff --git a/homeassistant/components/voip/repairs.py b/homeassistant/components/voip/repairs.py index 11cacbb7486..600ea4d66fb 100644 --- a/homeassistant/components/voip/repairs.py +++ b/homeassistant/components/voip/repairs.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.assist_pipeline.repair_flows import ( +from homeassistant.components.assist_pipeline.repair_flows import ( # pylint: disable=hass-component-root-import AssistInProgressDeprecatedRepairFlow, ) from homeassistant.components.repairs import RepairsFlow diff --git a/homeassistant/components/voip/select.py b/homeassistant/components/voip/select.py index bfce112d0c5..8c9668b09ef 100644 --- a/homeassistant/components/voip/select.py +++ b/homeassistant/components/voip/select.py @@ -4,7 +4,7 @@ from __future__ import annotations from typing import TYPE_CHECKING -from homeassistant.components.assist_pipeline.select import ( +from homeassistant.components.assist_pipeline import ( AssistPipelineSelect, VadSensitivitySelect, ) diff --git a/homeassistant/components/wyoming/devices.py b/homeassistant/components/wyoming/devices.py index 2e00b31fd34..dec5d066f4d 100644 --- a/homeassistant/components/wyoming/devices.py +++ b/homeassistant/components/wyoming/devices.py @@ -5,7 +5,7 @@ from __future__ import annotations from collections.abc import Callable from dataclasses import dataclass -from homeassistant.components.assist_pipeline.vad import VadSensitivity +from homeassistant.components.assist_pipeline import VadSensitivity from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import entity_registry as er diff --git a/homeassistant/components/wyoming/select.py b/homeassistant/components/wyoming/select.py index 2af0438e35f..b3af22a4c16 100644 --- a/homeassistant/components/wyoming/select.py +++ b/homeassistant/components/wyoming/select.py @@ -4,11 +4,11 @@ from __future__ import annotations from typing import TYPE_CHECKING, Final -from homeassistant.components.assist_pipeline.select import ( +from homeassistant.components.assist_pipeline import ( AssistPipelineSelect, + VadSensitivity, VadSensitivitySelect, ) -from homeassistant.components.assist_pipeline.vad import VadSensitivity from homeassistant.components.select import SelectEntity, SelectEntityDescription from homeassistant.config_entries import ConfigEntry from homeassistant.const import EntityCategory diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index 4da2b3b6e2f..95f7b0a0feb 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -126,7 +126,6 @@ _OBSOLETE_IMPORT: dict[str, list[ObsoleteImportMatch]] = { } _IGNORE_ROOT_IMPORT = ( - "assist_pipeline", "automation", "bluetooth", "camera", diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py index 5256ff8a509..dd63c716575 100644 --- a/tests/components/cloud/test_http_api.py +++ b/tests/components/cloud/test_http_api.py @@ -28,7 +28,9 @@ from homeassistant.components.alexa import errors as alexa_errors # pylint: disable-next=hass-component-root-import from homeassistant.components.alexa.entities import LightCapabilities -from homeassistant.components.assist_pipeline.pipeline import STORAGE_KEY +from homeassistant.components.assist_pipeline.pipeline import ( # pylint: disable=hass-component-root-import + STORAGE_KEY, +) from homeassistant.components.cloud.const import DEFAULT_EXPOSED_DOMAINS, DOMAIN from homeassistant.components.cloud.http_api import validate_language_voice from homeassistant.components.google_assistant.helpers import GoogleEntity diff --git a/tests/components/cloud/test_stt.py b/tests/components/cloud/test_stt.py index 02acda1450e..a817820ae2d 100644 --- a/tests/components/cloud/test_stt.py +++ b/tests/components/cloud/test_stt.py @@ -9,7 +9,9 @@ from unittest.mock import AsyncMock, MagicMock, patch from hass_nabucasa.voice import STTResponse, VoiceError import pytest -from homeassistant.components.assist_pipeline.pipeline import STORAGE_KEY +from homeassistant.components.assist_pipeline.pipeline import ( # pylint: disable=hass-component-root-import + STORAGE_KEY, +) from homeassistant.components.cloud.const import DOMAIN from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN from homeassistant.core import HomeAssistant diff --git a/tests/components/cloud/test_tts.py b/tests/components/cloud/test_tts.py index 44430f9c39a..f830cb27259 100644 --- a/tests/components/cloud/test_tts.py +++ b/tests/components/cloud/test_tts.py @@ -13,7 +13,9 @@ from hass_nabucasa.voice_data import TTS_VOICES import pytest import voluptuous as vol -from homeassistant.components.assist_pipeline.pipeline import STORAGE_KEY +from homeassistant.components.assist_pipeline.pipeline import ( # pylint: disable=hass-component-root-import + STORAGE_KEY, +) from homeassistant.components.cloud.const import DEFAULT_TTS_DEFAULT_VOICE, DOMAIN from homeassistant.components.cloud.tts import ( DEFAULT_VOICES, diff --git a/tests/components/esphome/test_assist_satellite.py b/tests/components/esphome/test_assist_satellite.py index d6643c17d45..fe5ac70d687 100644 --- a/tests/components/esphome/test_assist_satellite.py +++ b/tests/components/esphome/test_assist_satellite.py @@ -28,7 +28,9 @@ from homeassistant.components import ( tts, ) from homeassistant.components.assist_pipeline import PipelineEvent, PipelineEventType -from homeassistant.components.assist_pipeline.pipeline import KEY_ASSIST_PIPELINE +from homeassistant.components.assist_pipeline.pipeline import ( # pylint: disable=hass-component-root-import + KEY_ASSIST_PIPELINE, +) from homeassistant.components.assist_satellite import ( AssistSatelliteConfiguration, AssistSatelliteEntityFeature, diff --git a/tests/components/wyoming/test_devices.py b/tests/components/wyoming/test_devices.py index d03f2622c71..299f5f57216 100644 --- a/tests/components/wyoming/test_devices.py +++ b/tests/components/wyoming/test_devices.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.assist_pipeline.select import OPTION_PREFERRED +from homeassistant.components.assist_pipeline import OPTION_PREFERRED from homeassistant.components.wyoming import DOMAIN from homeassistant.components.wyoming.devices import SatelliteDevice from homeassistant.config_entries import ConfigEntry diff --git a/tests/components/wyoming/test_select.py b/tests/components/wyoming/test_select.py index 2438d25b838..e929f92f652 100644 --- a/tests/components/wyoming/test_select.py +++ b/tests/components/wyoming/test_select.py @@ -3,9 +3,10 @@ from unittest.mock import Mock, patch from homeassistant.components import assist_pipeline -from homeassistant.components.assist_pipeline.pipeline import PipelineData -from homeassistant.components.assist_pipeline.select import OPTION_PREFERRED -from homeassistant.components.assist_pipeline.vad import VadSensitivity +from homeassistant.components.assist_pipeline import OPTION_PREFERRED, VadSensitivity +from homeassistant.components.assist_pipeline.pipeline import ( # pylint: disable=hass-component-root-import + PipelineData, +) from homeassistant.components.wyoming.devices import SatelliteDevice from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant