evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ollama blocking on load_default_certs (#125012)

Browse source 
* Fix ollama blocking on load_default_certs

* Use get_default_context instead of client_context
This commit is contained in:
Richard Kroegel 2024-09-01 17:35:55 +02:00 • committed by GitHub
parent 56667ec2bc
commit ef8fc3913e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/components/ollama/__init__.py
View file

@ -13,6 +13,7 @@ from homeassistant.const import CONF_URL, Platform
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.util.ssl import get_default_context
from .const import ( from .const import (
CONF_KEEP_ALIVE, CONF_KEEP_ALIVE,
@ -43,7 +44,7 @@ PLATFORMS = (Platform.CONVERSATION,)
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up Ollama from a config entry.""" """Set up Ollama from a config entry."""
settings = {**entry.data, **entry.options} settings = {**entry.data, **entry.options}
client = ollama.AsyncClient(host=settings[CONF_URL]) client = ollama.AsyncClient(host=settings[CONF_URL], verify=get_default_context())
try: try:
async with asyncio.timeout(DEFAULT_TIMEOUT): async with asyncio.timeout(DEFAULT_TIMEOUT):
await client.list() await client.list()

5
homeassistant/components/ollama/config_flow.py
View file

@ -33,6 +33,7 @@ from homeassistant.helpers.selector import (
TextSelectorConfig, TextSelectorConfig,
TextSelectorType, TextSelectorType,
) )
from homeassistant.util.ssl import get_default_context
from .const import ( from .const import (
CONF_KEEP_ALIVE, CONF_KEEP_ALIVE,
@ -91,7 +92,9 @@ class OllamaConfigFlow(ConfigFlow, domain=DOMAIN):
errors = {} errors = {}
try: try:
self.client = ollama.AsyncClient(host=self.url) self.client = ollama.AsyncClient(
host=self.url, verify=get_default_context()
)
async with asyncio.timeout(DEFAULT_TIMEOUT): async with asyncio.timeout(DEFAULT_TIMEOUT):
response = await self.client.list() response = await self.client.list()