From 6a3ea036890d0e1ed137ba581aeecad24d9c801d Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Mon, 24 Mar 2025 14:31:10 -0500
Subject: [PATCH] Add language/country args for preferred lang

---
 homeassistant/components/conversation/http.py | 19 +++++++-
 tests/components/conversation/test_http.py    | 48 ++++++++++++++++---
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/conversation/http.py b/homeassistant/components/conversation/http.py
index 8a61d41a42a..efcdcb8d69b 100644
--- a/homeassistant/components/conversation/http.py
+++ b/homeassistant/components/conversation/http.py
@@ -340,7 +340,11 @@ def _get_unmatched_slots(
 
 
 @websocket_api.websocket_command(
-    {vol.Required("type"): "conversation/agent/homeassistant/language_scores"}
+    {
+        vol.Required("type"): "conversation/agent/homeassistant/language_scores",
+        vol.Optional("language"): str,
+        vol.Optional("country"): str,
+    }
 )
 @websocket_api.async_response
 async def websocket_hass_agent_language_scores(
@@ -349,8 +353,19 @@ async def websocket_hass_agent_language_scores(
     msg: dict[str, Any],
 ) -> None:
     """Get support scores per language."""
+    language = msg.get("language", hass.config.language)
+    country = msg.get("country", hass.config.country)
+
     scores = await hass.async_add_executor_job(get_language_scores)
-    result = {lang_key: asdict(lang_scores) for lang_key, lang_scores in scores.items()}
+    matching_langs = language_util.matches(language, scores.keys(), country=country)
+    preferred_lang = matching_langs[0] if matching_langs else language
+    result = {
+        "languages": {
+            lang_key: asdict(lang_scores) for lang_key, lang_scores in scores.items()
+        },
+        "preferred_language": preferred_lang,
+    }
+
     connection.send_result(msg["id"], result)
 
 
diff --git a/tests/components/conversation/test_http.py b/tests/components/conversation/test_http.py
index ec70c97f912..77fa97ad845 100644
--- a/tests/components/conversation/test_http.py
+++ b/tests/components/conversation/test_http.py
@@ -539,10 +539,7 @@ async def test_ws_hass_agent_debug_sentence_trigger(
 
 
 async def test_ws_hass_language_scores(
-    hass: HomeAssistant,
-    init_components,
-    hass_ws_client: WebSocketGenerator,
-    snapshot: SnapshotAssertion,
+    hass: HomeAssistant, init_components, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test getting language support scores."""
     client = await hass_ws_client(hass)
@@ -552,8 +549,47 @@ async def test_ws_hass_language_scores(
     )
 
     msg = await client.receive_json()
-
     assert msg["success"]
 
     # Sanity check
-    assert msg["result"]["en_US"] == {"cloud": 3, "focused_local": 2, "full_local": 3}
+    result = msg["result"]
+    assert result["languages"]["en-US"] == {
+        "cloud": 3,
+        "focused_local": 2,
+        "full_local": 3,
+    }
+
+
+async def test_ws_hass_language_scores_with_filter(
+    hass: HomeAssistant, init_components, hass_ws_client: WebSocketGenerator
+) -> None:
+    """Test getting language support scores with language/country filter."""
+    client = await hass_ws_client(hass)
+
+    # Language filter
+    await client.send_json_auto_id(
+        {"type": "conversation/agent/homeassistant/language_scores", "language": "de"}
+    )
+
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    # German should be preferred
+    result = msg["result"]
+    assert result["preferred_language"] == "de-DE"
+
+    # Language/country filter
+    await client.send_json_auto_id(
+        {
+            "type": "conversation/agent/homeassistant/language_scores",
+            "language": "en",
+            "country": "GB",
+        }
+    )
+
+    msg = await client.receive_json()
+    assert msg["success"]
+
+    # GB English should be preferred
+    result = msg["result"]
+    assert result["preferred_language"] == "en-GB"