From 1bd5aa0ab0e6991c1574cc5d7216484df0db030f Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 19 Aug 2025 22:17:30 +0200
Subject: [PATCH] Fix structured output object selector conversion for OpenAI
 (#150916)

---
 homeassistant/components/openai_conversation/entity.py | 4 ++--
 tests/components/openai_conversation/test_entity.py    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/openai_conversation/entity.py b/homeassistant/components/openai_conversation/entity.py
index 748c0c8f874..885832bb4ca 100644
--- a/homeassistant/components/openai_conversation/entity.py
+++ b/homeassistant/components/openai_conversation/entity.py
@@ -91,6 +91,8 @@ MAX_TOOL_ITERATIONS = 10
 def _adjust_schema(schema: dict[str, Any]) -> None:
     """Adjust the schema to be compatible with OpenAI API."""
     if schema["type"] == "object":
+        schema.setdefault("strict", True)
+        schema.setdefault("additionalProperties", False)
         if "properties" not in schema:
             return
 
@@ -124,8 +126,6 @@ def _format_structured_output(
 
     _adjust_schema(result)
 
-    result["strict"] = True
-    result["additionalProperties"] = False
     return result
 
 
diff --git a/tests/components/openai_conversation/test_entity.py b/tests/components/openai_conversation/test_entity.py
index 58187bd63e9..c24cb5b3d79 100644
--- a/tests/components/openai_conversation/test_entity.py
+++ b/tests/components/openai_conversation/test_entity.py
@@ -63,6 +63,8 @@ async def test_format_structured_output() -> None:
                         "item_value",
                     ],
                     "type": "object",
+                    "additionalProperties": False,
+                    "strict": True,
                 },
                 "type": "array",
             },