Move WS commands to separate file

Author: droans

custom_components/mass_queue/__init__.py

@@ -29,7 +29,10 @@
 )
 from .const import DOMAIN, LOGGER
 from .services import register_actions
-from .utils import api_download_and_encode_image, download_images
+from .websocket_commands import (
+    api_download_and_encode_image,
+    api_download_images,
+)
 
 if TYPE_CHECKING:
     from homeassistant.core import HomeAssistant
@@ -121,7 +124,7 @@ async def on_hass_stop(event: Event) -> None:  # noqa: ARG001
     actions = await setup_controller_and_actions(hass, mass, entry)
     register_actions(hass)
     entry.runtime_data = MusicAssistantQueueEntryData(mass, actions, listen_task)
-    websocket_api.async_register_command(hass, download_images)
+    websocket_api.async_register_command(hass, api_download_images)
     websocket_api.async_register_command(hass, api_download_and_encode_image)
 
     # If the listen task is already failed, we need to raise ConfigEntryNotReady

custom_components/mass_queue/utils.py

@@ -6,8 +6,6 @@
 import urllib.parse
 from typing import TYPE_CHECKING
 
-import voluptuous as vol
-from homeassistant.components import websocket_api
 from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import callback
 from homeassistant.exceptions import ServiceValidationError
@@ -256,7 +254,7 @@ def generate_image_url_from_image_data(image_data: dict, client):
     return f"{base_url}/imageproxy?provider={provider}&size=256&format=png&path={img}"
 
 
-async def _download_single_image_from_image_data(
+async def download_single_image_from_image_data(
     image_data: dict,
     entity_id,
     hass,
@@ -275,62 +273,9 @@ async def _download_single_image_from_image_data(
         return None
 
 
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "mass_queue/encode_images",
-        vol.Required("entity_id"): str,
-        vol.Required("images"): list,
-    },
-)
-@websocket_api.async_response
-async def download_images(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict,
-) -> None:
-    """Download images and return them as b64 encoded."""
-    LOGGER.debug(f"Received message: {msg}")
-    session = aiohttp_client.async_get_clientsession(hass)
-    images = msg["images"]
-    LOGGER.debug("Pulled images from message")
-    LOGGER.debug(images)
-    result = []
-    entity_id = msg["entity_id"]
-    for image in images:
-        img = await _download_single_image_from_image_data(
-            image,
-            entity_id,
-            hass,
-            session,
-        )
-        image["encoded"] = img
-        result.append(image)
-    connection.send_result(msg["id"], result)
-
-
 async def download_and_encode_image(url: str, hass: HomeAssistant):
     """Downloads and encodes a single image from the given URL."""
     session = aiohttp_client.async_get_clientsession(hass)
     req = await session.get(url)
     read = await req.content.read()
     return f"data:image;base64,{base64.b64encode(read).decode('utf-8')}"
-
-
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "mass_queue/download_and_encode_image",
-        vol.Required("url"): str,
-    },
-)
-@websocket_api.async_response
-async def api_download_and_encode_image(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict,
-) -> None:
-    """Download images and return them as b64 encoded."""
-    LOGGER.debug(f"Got message: {msg}")
-    url = msg["url"]
-    LOGGER.debug(f"URL: {url}")
-    result = await download_and_encode_image(url, hass)
-    connection.send_result(msg["id"], result)

custom_components/mass_queue/websocket_commands.py

@@ -0,0 +1,71 @@
+"""Music Assistant Queue Actions Websocket Commands."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import voluptuous as vol
+from homeassistant.components import websocket_api
+from homeassistant.helpers import aiohttp_client
+
+if TYPE_CHECKING:
+    from homeassistant.core import HomeAssistant
+
+from .const import LOGGER
+from .utils import (
+    download_and_encode_image,
+    download_single_image_from_image_data,
+)
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "mass_queue/download_and_encode_image",
+        vol.Required("url"): str,
+    },
+)
+@websocket_api.async_response
+async def api_download_and_encode_image(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict,
+) -> None:
+    """Download images and return them as b64 encoded."""
+    LOGGER.debug(f"Got message: {msg}")
+    url = msg["url"]
+    LOGGER.debug(f"URL: {url}")
+    result = await download_and_encode_image(url, hass)
+    connection.send_result(msg["id"], result)
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "mass_queue/encode_images",
+        vol.Required("entity_id"): str,
+        vol.Required("images"): list,
+    },
+)
+@websocket_api.async_response
+async def api_download_images(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg: dict,
+) -> None:
+    """Download images and return them as b64 encoded."""
+    LOGGER.debug(f"Received message: {msg}")
+    session = aiohttp_client.async_get_clientsession(hass)
+    images = msg["images"]
+    LOGGER.debug("Pulled images from message")
+    LOGGER.debug(images)
+    result = []
+    entity_id = msg["entity_id"]
+    for image in images:
+        img = await download_single_image_from_image_data(
+            image,
+            entity_id,
+            hass,
+            session,
+        )
+        image["encoded"] = img
+        result.append(image)
+    connection.send_result(msg["id"], result)