From f88b7bcdf63ad10a1a4e81bc94ef5214bcbfcbe1 Mon Sep 17 00:00:00 2001 From: Max Michels <6703026+maxmichels@users.noreply.github.com> Date: Sat, 23 May 2026 17:03:44 +0200 Subject: [PATCH] Replace duplicate constants in olama with homeassistant.const imports (#171949) Co-authored-by: Jan-Philipp Benecke --- homeassistant/components/ollama/__init__.py | 10 +++++++--- homeassistant/components/ollama/config_flow.py | 11 ++++++++--- homeassistant/components/ollama/const.py | 4 ---- homeassistant/components/ollama/conversation.py | 4 ++-- homeassistant/components/ollama/entity.py | 2 +- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/ollama/__init__.py b/homeassistant/components/ollama/__init__.py index 91cac7083e3..b0ad4d43341 100644 --- a/homeassistant/components/ollama/__init__.py +++ b/homeassistant/components/ollama/__init__.py @@ -8,7 +8,13 @@ import httpx import ollama from homeassistant.config_entries import ConfigEntry, ConfigSubentry -from homeassistant.const import CONF_API_KEY, CONF_URL, Platform +from homeassistant.const import ( + CONF_API_KEY, + CONF_MODEL, + CONF_PROMPT, + CONF_URL, + Platform, +) from homeassistant.core import HomeAssistant from homeassistant.exceptions import ( ConfigEntryAuthFailed, @@ -26,9 +32,7 @@ from homeassistant.util.ssl import get_default_context from .const import ( CONF_KEEP_ALIVE, CONF_MAX_HISTORY, - CONF_MODEL, CONF_NUM_CTX, - CONF_PROMPT, CONF_THINK, DEFAULT_AI_TASK_NAME, DEFAULT_NAME, diff --git a/homeassistant/components/ollama/config_flow.py b/homeassistant/components/ollama/config_flow.py index d899ff97a59..caa8366aff9 100644 --- a/homeassistant/components/ollama/config_flow.py +++ b/homeassistant/components/ollama/config_flow.py @@ -18,7 +18,14 @@ from homeassistant.config_entries import ( ConfigSubentryFlow, SubentryFlowResult, ) -from homeassistant.const import CONF_API_KEY, CONF_LLM_HASS_API, CONF_NAME, CONF_URL +from homeassistant.const import ( + CONF_API_KEY, + CONF_LLM_HASS_API, + CONF_MODEL, + CONF_NAME, + CONF_PROMPT, + CONF_URL, +) from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import config_validation as cv, llm from homeassistant.helpers.selector import ( @@ -40,9 +47,7 @@ from . import OllamaConfigEntry from .const import ( CONF_KEEP_ALIVE, CONF_MAX_HISTORY, - CONF_MODEL, CONF_NUM_CTX, - CONF_PROMPT, CONF_THINK, DEFAULT_AI_TASK_NAME, DEFAULT_CONVERSATION_NAME, diff --git a/homeassistant/components/ollama/const.py b/homeassistant/components/ollama/const.py index 0b540c0b373..5abf32baf9d 100644 --- a/homeassistant/components/ollama/const.py +++ b/homeassistant/components/ollama/const.py @@ -4,10 +4,6 @@ DOMAIN = "ollama" DEFAULT_NAME = "Ollama" -# pylint: disable-next=home-assistant-duplicate-const -CONF_MODEL = "model" -# pylint: disable-next=home-assistant-duplicate-const -CONF_PROMPT = "prompt" CONF_THINK = "think" CONF_KEEP_ALIVE = "keep_alive" diff --git a/homeassistant/components/ollama/conversation.py b/homeassistant/components/ollama/conversation.py index e59fc329d94..d1214ded0a2 100644 --- a/homeassistant/components/ollama/conversation.py +++ b/homeassistant/components/ollama/conversation.py @@ -4,12 +4,12 @@ from typing import Literal from homeassistant.components import conversation from homeassistant.config_entries import ConfigSubentry -from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL +from homeassistant.const import CONF_LLM_HASS_API, CONF_PROMPT, MATCH_ALL from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback from . import OllamaConfigEntry -from .const import CONF_PROMPT, DOMAIN +from .const import DOMAIN from .entity import OllamaBaseLLMEntity diff --git a/homeassistant/components/ollama/entity.py b/homeassistant/components/ollama/entity.py index 9948278c292..6e96b571546 100644 --- a/homeassistant/components/ollama/entity.py +++ b/homeassistant/components/ollama/entity.py @@ -11,6 +11,7 @@ from voluptuous_openapi import convert from homeassistant.components import conversation from homeassistant.config_entries import ConfigSubentry +from homeassistant.const import CONF_MODEL from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import device_registry as dr, llm from homeassistant.helpers.entity import Entity @@ -20,7 +21,6 @@ from . import OllamaConfigEntry from .const import ( CONF_KEEP_ALIVE, CONF_MAX_HISTORY, - CONF_MODEL, CONF_NUM_CTX, CONF_THINK, DEFAULT_KEEP_ALIVE,