home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-13 17:45:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into single_history_query

Browse Source
This commit is contained in:
J. Nick Koston
2023-04-10 16:32:00 -10:00
committed by GitHub
parent 9b75f835cf 504cedaa87
commit add65e0e39
5 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,5 +7,5 @@
"integration_type": "hub",
"iot_class": "cloud_polling",
"loggers": ["pytile"],
"requirements": ["pytile==2022.02.0"]
"requirements": ["pytile==2023.04.0"]
}

59
homeassistant/components/voice_assistant/websocket_api.py
View File

@@ -10,6 +10,7 @@ import voluptuous as vol
from homeassistant.components import stt, websocket_api
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import config_validation as cv
from .pipeline import (
PipelineError,
@@ -30,23 +31,46 @@ _LOGGER = logging.getLogger(__name__)
@callback
def async_register_websocket_api(hass: HomeAssistant) -> None:
"""Register the websocket API."""
websocket_api.async_register_command(hass, websocket_run)
websocket_api.async_register_command(
hass,
"voice_assistant/run",
websocket_run,
vol.All(
websocket_api.BASE_COMMAND_MESSAGE_SCHEMA.extend(
{
vol.Required("type"): "voice_assistant/run",
# pylint: disable-next=unnecessary-lambda
vol.Required("start_stage"): lambda val: PipelineStage(val),
# pylint: disable-next=unnecessary-lambda
vol.Required("end_stage"): lambda val: PipelineStage(val),
vol.Optional("input"): dict,
vol.Optional("language"): str,
vol.Optional("pipeline"): str,
vol.Optional("conversation_id"): vol.Any(str, None),
vol.Optional("timeout"): vol.Any(float, int),
},
),
cv.key_value_schemas(
"start_stage",
{
PipelineStage.STT: vol.Schema(
{vol.Required("input"): {vol.Required("sample_rate"): int}},
extra=vol.ALLOW_EXTRA,
),
PipelineStage.INTENT: vol.Schema(
{vol.Required("input"): {"text": str}},
extra=vol.ALLOW_EXTRA,
),
PipelineStage.TTS: vol.Schema(
{vol.Required("input"): {"text": str}},
extra=vol.ALLOW_EXTRA,
),
},
),
),
)
@websocket_api.websocket_command(
{
vol.Required("type"): "voice_assistant/run",
# pylint: disable-next=unnecessary-lambda
vol.Required("start_stage"): lambda val: PipelineStage(val),
# pylint: disable-next=unnecessary-lambda
vol.Required("end_stage"): lambda val: PipelineStage(val),
vol.Optional("input"): {"text": str},
vol.Optional("language"): str,
vol.Optional("pipeline"): str,
vol.Optional("conversation_id"): vol.Any(str, None),
vol.Optional("timeout"): vol.Any(float, int),
}
)
@websocket_api.async_response
async def websocket_run(
hass: HomeAssistant,
@@ -88,6 +112,7 @@ async def websocket_run(
if start_stage == PipelineStage.STT:
# Audio pipeline that will receive audio as binary websocket messages
audio_queue: "asyncio.Queue[bytes]" = asyncio.Queue()
incoming_sample_rate = msg["input"]["sample_rate"]
async def stt_stream():
state = None
@@ -95,7 +120,9 @@ async def websocket_run(
# Yield until we receive an empty chunk
while chunk := await audio_queue.get():
chunk, state = audioop.ratecv(chunk, 2, 1, 44100, 16000, state)
chunk, state = audioop.ratecv(
chunk, 2, 1, incoming_sample_rate, 16000, state
)
if not segmenter.process(chunk):
# Voice command is finished
break

2
requirements_all.txt
View File

@@ -2127,7 +2127,7 @@ python_opendata_transport==0.3.0
pythonegardia==1.0.40
# homeassistant.components.tile
pytile==2022.02.0
pytile==2023.04.0
# homeassistant.components.tomorrowio
pytomorrowio==0.3.5

2
requirements_test_all.txt
View File

@@ -1523,7 +1523,7 @@ python-telegram-bot==13.1
python_awair==0.2.4
# homeassistant.components.tile
pytile==2022.02.0
pytile==2023.04.0
# homeassistant.components.tomorrowio
pytomorrowio==0.3.5

12
tests/components/voice_assistant/test_websocket.py
View File

@@ -70,6 +70,9 @@ async def test_audio_pipeline(
"type": "voice_assistant/run",
"start_stage": "stt",
"end_stage": "tts",
"input": {
"sample_rate": 44100,
},
}
)
@@ -263,6 +266,9 @@ async def test_audio_pipeline_timeout(
"type": "voice_assistant/run",
"start_stage": "stt",
"end_stage": "tts",
"input": {
"sample_rate": 44100,
},
"timeout": 0.0001,
}
)
@@ -295,6 +301,9 @@ async def test_stt_provider_missing(
"type": "voice_assistant/run",
"start_stage": "stt",
"end_stage": "tts",
"input": {
"sample_rate": 44100,
},
}
)
@@ -322,6 +331,9 @@ async def test_stt_stream_failed(
"type": "voice_assistant/run",
"start_stage": "stt",
"end_stage": "tts",
"input": {
"sample_rate": 44100,
},
}
)