From: Marcel van der Veldt Date: Fri, 19 Dec 2025 07:44:38 +0000 (+0100) Subject: A bit of cleanup X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=2e13759c3445d0ece163a9e892122aa0bc09ee3b;p=music-assistant-server.git A bit of cleanup --- diff --git a/music_assistant/controllers/webserver/helpers/auth_middleware.py b/music_assistant/controllers/webserver/helpers/auth_middleware.py index e9ddb8fe..c70e137b 100644 --- a/music_assistant/controllers/webserver/helpers/auth_middleware.py +++ b/music_assistant/controllers/webserver/helpers/auth_middleware.py @@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, cast from aiohttp import web from music_assistant_models.auth import AuthProviderType, User, UserRole -from music_assistant.constants import HOMEASSISTANT_SYSTEM_USER, MASS_LOGGER_NAME +from music_assistant.constants import HOMEASSISTANT_SYSTEM_USER, MASS_LOGGER_NAME, VERBOSE_LOG_LEVEL from .auth_providers import get_ha_user_details, get_ha_user_role @@ -75,7 +75,8 @@ async def get_authenticated_user(request: web.Request) -> User | None: # Fall back to ingress headers if API lookup doesn't return values _, ha_display_name, avatar_url = await get_ha_user_details(mass, ingress_user_id) final_display_name = ha_display_name or ingress_display_name - LOGGER.debug( + LOGGER.log( + VERBOSE_LOG_LEVEL, "Ingress auth for user %s: ha_display_name=%s, ingress_display_name=%s, " "final_display_name=%s, avatar_url=%s", user.username, @@ -90,7 +91,8 @@ async def get_authenticated_user(request: web.Request) -> User | None: display_name=final_display_name, avatar_url=avatar_url, ) - LOGGER.debug( + LOGGER.log( + VERBOSE_LOG_LEVEL, "Updated user %s: display_name=%s, avatar_url=%s", user.username, user.display_name, diff --git a/music_assistant/providers/hass/__init__.py b/music_assistant/providers/hass/__init__.py index 26742e37..73740548 100644 --- a/music_assistant/providers/hass/__init__.py +++ b/music_assistant/providers/hass/__init__.py @@ -29,7 +29,7 @@ from music_assistant_models.enums import ConfigEntryType, ProviderFeature from music_assistant_models.errors import LoginFailed, SetupFailedError from music_assistant_models.player_control import PlayerControl -from music_assistant.constants import MASS_LOGO_ONLINE +from music_assistant.constants import MASS_LOGO_ONLINE, VERBOSE_LOG_LEVEL from music_assistant.helpers.auth import AuthenticationHelper from music_assistant.helpers.util import try_parse_int from music_assistant.models.plugin import PluginProvider @@ -545,7 +545,7 @@ class HomeAssistantProvider(PluginProvider): display_name = user.get("name") break except Exception as err: - self.logger.warning("Failed to get HA user list: %s", err) + self.logger.log(VERBOSE_LOG_LEVEL, "Failed to get HA user list: %s", err) # Get external URL for building avatar URL ha_url: str | None = None @@ -554,7 +554,7 @@ class HomeAssistantProvider(PluginProvider): if network_urls: ha_url = network_urls.get("external") or network_urls.get("internal") except Exception as err: - self.logger.warning("Failed to get HA network URLs: %s", err) + self.logger.log(VERBOSE_LOG_LEVEL, "Failed to get HA network URLs: %s", err) # Find person linked to this HA user ID for display name and avatar try: @@ -570,9 +570,10 @@ class HomeAssistantProvider(PluginProvider): avatar_url = f"{ha_url.rstrip('/')}{person_picture}" break except Exception as err: - self.logger.warning("Failed to get HA person details: %s", err) + self.logger.log(VERBOSE_LOG_LEVEL, "Failed to get HA person details: %s", err) - self.logger.debug( + self.logger.log( + VERBOSE_LOG_LEVEL, "get_user_details for %s: username=%s, display_name=%s, avatar_url=%s", ha_user_id, username,