From 3593b874e070281eff937e470db013c4d19165b3 Mon Sep 17 00:00:00 2001
From: Denis Shulyaka <Shulyaka@gmail.com>
Date: Sun, 20 Sep 2026 18:29:21 +0300
Subject: [PATCH] Use `safety_identifier` instead of deprecated `user`
 parameter for openai_conversation (#182695)

---
 homeassistant/components/openai_conversation/entity.py    | 2 +-
 tests/components/openai_conversation/conftest.py          | 2 +-
 tests/components/openai_conversation/test_conversation.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/openai_conversation/entity.py b/homeassistant/components/openai_conversation/entity.py
index dfe6cf4e7fc4..b5d303ed7659 100644
--- a/homeassistant/components/openai_conversation/entity.py
+++ b/homeassistant/components/openai_conversation/entity.py
@@ -531,7 +531,7 @@ class OpenAIBaseLLMEntity(Entity):
             model=options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
             input=messages,
             max_output_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
-            user=chat_log.conversation_id,
+            safety_identifier=chat_log.conversation_id,
             prompt_cache_key=self.subentry.subentry_id,
             service_tier=options.get(CONF_SERVICE_TIER, RECOMMENDED_SERVICE_TIER),
             store=options.get(CONF_STORE_RESPONSES, RECOMMENDED_STORE_RESPONSES),
diff --git a/tests/components/openai_conversation/conftest.py b/tests/components/openai_conversation/conftest.py
index 06a6b316765d..97c5146ae952 100644
--- a/tests/components/openai_conversation/conftest.py
+++ b/tests/components/openai_conversation/conftest.py
@@ -170,7 +170,7 @@ def mock_create_stream() -> Generator[AsyncMock]:
             ),
             truncation=kwargs.get("truncation", "disabled"),
             usage=None,
-            user=kwargs.get("user"),
+            safety_identifier=kwargs.get("safety_identifier"),
             store=kwargs.get("store", True),
         )
         yield ResponseCreatedEvent(
diff --git a/tests/components/openai_conversation/test_conversation.py b/tests/components/openai_conversation/test_conversation.py
index 2817c269ffe5..723d3d03e8f1 100644
--- a/tests/components/openai_conversation/test_conversation.py
+++ b/tests/components/openai_conversation/test_conversation.py
@@ -917,6 +917,6 @@ async def test_model_args(
 
     model_args = mock_create_stream.call_args.kwargs.copy()
     model_args.pop("input")
-    assert model_args.pop("user") == result.conversation_id
+    assert model_args.pop("safety_identifier") == result.conversation_id
     assert model_args.pop("prompt_cache_key") == subentry.subentry_id
     assert model_args == snapshot