diff --git a/requirements.txt b/requirements.txt index d97fa02..a93634f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ aiohappyeyeballs==2.6.1 -aiohttp==3.13.5 +aiohttp==3.14.0 aiosignal==1.4.0 annotated-types==0.7.0 anyio==4.13.0 diff --git a/test/test_fetch.py b/test/test_fetch.py index 6f2ed50..1d84fa1 100644 --- a/test/test_fetch.py +++ b/test/test_fetch.py @@ -73,12 +73,24 @@ class TestFetchAvailableModels: async def test_returns_empty_on_connection_error(self): cfg = _make_cfg(ollama_eps=[MOCK_OLLAMA_EP], llama_eps=[]) + from aiohttp.connector import ConnectionKey import aiohttp with patch.object(router, "config", cfg), aioresponses() as m: + conn_key = ConnectionKey( + host="mock-ollama", + port=11434, + is_ssl=False, + ssl=None, + proxy=None, + proxy_host=None, + proxy_port=None, + proxy_auth=None, + connector_owner=True, + ) m.get( f"{MOCK_OLLAMA_EP}/api/tags", exception=aiohttp.ClientConnectorError( - connection_key=MagicMock(host="mock-ollama", port=11434), + connection_key=conn_key, os_error=OSError(111, "refused"), ), ) diff --git a/test/test_unit_helpers.py b/test/test_unit_helpers.py index d38eb37..56df219 100644 --- a/test/test_unit_helpers.py +++ b/test/test_unit_helpers.py @@ -4,6 +4,7 @@ import asyncio from unittest.mock import MagicMock, patch import aiohttp +from aiohttp.connector import ConnectionKey import pytest import router @@ -188,8 +189,19 @@ class TestDedupeOnKeys: class TestFormatConnectionIssue: def test_connector_error_message(self): + conn_key = ConnectionKey( + host="localhost", + port=11434, + is_ssl=False, + ssl=None, + proxy=None, + proxy_host=None, + proxy_port=None, + proxy_auth=None, + connector_owner=True, + ) err = aiohttp.ClientConnectorError( - connection_key=MagicMock(host="localhost", port=11434), + connection_key=conn_key, os_error=OSError(111, "Connection refused"), ) msg = router._format_connection_issue("http://localhost:11434", err)