Skip to content

Commit f2baeb9

Browse files
committed
feat: run every provider's SDK on aiohttp
openai and fireworks get openai.DefaultAioHttpClient, anthropic gets anthropic.DefaultAioHttpClient, and genai (gemini, vertexai) picks aiohttp by itself once installed. The choice is an exhaustive match over ProviderName, so a new provider must pick a transport. A new test drops the connection unanswered and expects one request. gemini is a strict xfail: genai's aiohttp path retries a drop on its own (googleapis/python-genai#3160). The test server no longer reverse-DNS looks up its host, which stalled a run for 35 s. Claude-Session: https://claude.ai/code/session_01UeP5UCC9BNoDBzsUAkq2LC
1 parent 3438a4f commit f2baeb9

3 files changed

Lines changed: 53 additions & 7 deletions

File tree

‎llm_master/facade.py‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
"""The facade: one held any-llm client per provider, so every call reuses its connection pool."""
2+
from typing import Any, assert_never
3+
4+
import anthropic
5+
import openai
26
from any_llm import AnyLLM
37

48
from llm_master.providers import PROVIDERS, ProviderName
@@ -15,5 +19,23 @@ def client(self, provider: ProviderName) -> AnyLLM:
1519
if provider not in self._clients:
1620
if provider not in PROVIDERS:
1721
raise KeyError(provider) # unknown provider fails loud, as in registry.py
18-
self._clients[provider] = AnyLLM.create(provider, unified_exceptions=True, max_retries=0)
22+
self._clients[provider] = AnyLLM.create(provider, unified_exceptions=True, max_retries=0,
23+
**_transport(provider))
1924
return self._clients[provider]
25+
26+
27+
def _transport(provider: ProviderName) -> dict[str, Any]:
28+
"""Client kwargs that put the provider's SDK on aiohttp."""
29+
match provider:
30+
case "openai":
31+
return {"http_client": openai.DefaultAioHttpClient()}
32+
case "anthropic":
33+
return {"http_client": anthropic.DefaultAioHttpClient()}
34+
case "gemini":
35+
return {} # genai picks aiohttp by itself whenever it is installed
36+
case "vertexai":
37+
return {} # the same genai client as gemini
38+
case "fireworks":
39+
return {"http_client": openai.DefaultAioHttpClient()}
40+
case _:
41+
assert_never(provider)

‎pyproject.toml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@ name = "llm-master"
33
version = "2.0.0a0"
44
description = "Lite multi-provider LLM wrapper on any-llm"
55
requires-python = ">=3.11"
6-
dependencies = ["any-llm-sdk[gemini]==1.37.0"]
6+
dependencies = [
7+
"any-llm-sdk[gemini]==1.37.0",
8+
# aiohttp transports for the SDKs any-llm drives
9+
"openai[aiohttp]",
10+
"anthropic[aiohttp]",
11+
"google-genai[aiohttp]",
12+
]
713

814
[dependency-groups]
915
dev = ["pytest", "pytest-asyncio"]

‎tests/test_facade.py‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""The facade's held clients, driven against a local server standing in for each provider."""
22
import threading
3-
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
3+
from http.server import BaseHTTPRequestHandler
4+
from socketserver import ThreadingTCPServer
45
from typing import get_args
56

67
import pytest
@@ -25,14 +26,18 @@ def credentials(monkeypatch):
2526

2627
@pytest.fixture
2728
def serve(monkeypatch, request):
28-
"""Points every provider at a local server that answers each request with `status`; returns its hit log."""
29-
def start(status: int) -> list[str]:
29+
"""Points every provider at a local server that answers each request with `status`; returns its hit log.
30+
31+
A None status reads the request and hangs up without answering."""
32+
def start(status: int | None) -> list[str]:
3033
hits: list[str] = []
3134

3235
class Answer(BaseHTTPRequestHandler):
3336
def do_POST(self):
3437
hits.append(self.path)
3538
self.rfile.read(int(self.headers["Content-Length"]))
39+
if status is None:
40+
return
3641
self.send_response(status)
3742
self.send_header("Content-Type", "application/json")
3843
self.end_headers()
@@ -41,12 +46,12 @@ def do_POST(self):
4146
def log_message(self, format, *args):
4247
pass
4348

44-
server = ThreadingHTTPServer(("127.0.0.1", 0), Answer)
49+
server = ThreadingTCPServer(("127.0.0.1", 0), Answer) # HTTPServer would reverse-DNS the host
4550
threading.Thread(target=server.serve_forever, kwargs={"poll_interval": 0.01}, daemon=True).start()
4651
request.addfinalizer(server.server_close)
4752
request.addfinalizer(server.shutdown)
4853
for var in BASE_URL_VARS.values():
49-
monkeypatch.setenv(var, f"http://127.0.0.1:{server.server_port}")
54+
monkeypatch.setenv(var, f"http://127.0.0.1:{server.server_address[1]}")
5055
return hits
5156
return start
5257

@@ -85,3 +90,16 @@ async def test_errors_come_back_typed(provider, serve, monkeypatch):
8590
serve(401)
8691
with pytest.raises(AuthenticationError):
8792
await ask(provider)
93+
94+
95+
GENAI_RETRIES_DROPS = pytest.mark.xfail(strict=True, raises=AssertionError,
96+
reason="googleapis/python-genai#3160: genai on aiohttp retries a drop by itself")
97+
98+
99+
@pytest.mark.parametrize("provider", ["openai", "anthropic", "fireworks",
100+
pytest.param("gemini", marks=GENAI_RETRIES_DROPS)])
101+
async def test_dropped_connection_is_not_retried(provider, serve):
102+
hits = serve(None)
103+
with pytest.raises(ProviderError):
104+
await ask(provider)
105+
assert len(hits) == 1, hits

0 commit comments

Comments
 (0)