From e6702d2392fe0f47cddcf0e31e1f56ae94182298 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 10 Jul 2025 23:45:56 +0200
Subject: [PATCH] Serialize Object Selector correctly if a field is required
 (#148577)

---
 homeassistant/helpers/llm.py | 14 ++++++++++----
 tests/helpers/test_llm.py    |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/homeassistant/helpers/llm.py b/homeassistant/helpers/llm.py
index b239ad99119..784288375e9 100644
--- a/homeassistant/helpers/llm.py
+++ b/homeassistant/helpers/llm.py
@@ -779,13 +779,19 @@ def selector_serializer(schema: Any) -> Any:  # noqa: C901
     if isinstance(schema, selector.ObjectSelector):
         result = {"type": "object"}
         if fields := schema.config.get("fields"):
-            result["properties"] = {
-                field: convert(
+            properties = {}
+            required = []
+            for field, field_schema in fields.items():
+                properties[field] = convert(
                     selector.selector(field_schema["selector"]),
                     custom_serializer=selector_serializer,
                 )
-                for field, field_schema in fields.items()
-            }
+                if field_schema.get("required"):
+                    required.append(field)
+            result["properties"] = properties
+
+            if required:
+                result["required"] = required
         else:
             result["additionalProperties"] = True
         if schema.config.get("multiple"):
diff --git a/tests/helpers/test_llm.py b/tests/helpers/test_llm.py
index 78ff675f0b6..9ba93cef4ca 100644
--- a/tests/helpers/test_llm.py
+++ b/tests/helpers/test_llm.py
@@ -1161,6 +1161,7 @@ async def test_selector_serializer(
             "name": {"type": "string"},
             "percentage": {"type": "number", "minimum": 30, "maximum": 100},
         },
+        "required": ["name"],
     }
     assert selector_serializer(
         selector.ObjectSelector(
@@ -1190,6 +1191,7 @@ async def test_selector_serializer(
                     "maximum": 100,
                 },
             },
+            "required": ["name"],
         },
     }
     assert selector_serializer(