Skip to content

Commit 738eb2c

Browse files
feat(client): add support for aiohttp
1 parent e7d0d02 commit 738eb2c

File tree

9 files changed

+157
-9
lines changed

9 files changed

+157
-9
lines changed

README.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,40 @@ asyncio.run(main())
6868

6969
Functionality between the synchronous and asynchronous clients is otherwise identical.
7070

71+
### With aiohttp
72+
73+
By default, the async client uses `httpx` for HTTP requests. However, for improved concurrency performance you may also use `aiohttp` as the HTTP backend.
74+
75+
You can enable this by installing `aiohttp`:
76+
77+
```sh
78+
# install from PyPI
79+
pip install youdotcom[aiohttp]
80+
```
81+
82+
Then you can enable it by instantiating the client with `http_client=DefaultAioHttpClient()`:
83+
84+
```python
85+
import os
86+
import asyncio
87+
from ydc_search_api import DefaultAioHttpClient
88+
from ydc_search_api import AsyncYdcSearchAPI
89+
90+
91+
async def main() -> None:
92+
async with AsyncYdcSearchAPI(
93+
api_key=os.environ.get("YDC_SEARCH_API_API_KEY"), # This is the default and can be omitted
94+
http_client=DefaultAioHttpClient(),
95+
) as client:
96+
response = await client.search.query(
97+
query="REPLACE_ME",
98+
)
99+
print(response.hits)
100+
101+
102+
asyncio.run(main())
103+
```
104+
71105
## Using types
72106

73107
Nested request parameters are [TypedDicts](https://docs.python.org/3/library/typing.html#typing.TypedDict). Responses are [Pydantic models](https://docs.pydantic.dev) which also provide helper methods for things like:

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ classifiers = [
3737
Homepage = "https://github.com/You-OpenSource/You-Python"
3838
Repository = "https://github.com/You-OpenSource/You-Python"
3939

40+
[project.optional-dependencies]
41+
aiohttp = ["aiohttp", "httpx_aiohttp>=0.1.6"]
4042

4143
[tool.rye]
4244
managed = true

requirements-dev.lock

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,24 @@
1010
# universal: false
1111

1212
-e file:.
13+
aiohappyeyeballs==2.6.1
14+
# via aiohttp
15+
aiohttp==3.12.8
16+
# via httpx-aiohttp
17+
# via youdotcom
18+
aiosignal==1.3.2
19+
# via aiohttp
1320
annotated-types==0.6.0
1421
# via pydantic
1522
anyio==4.4.0
1623
# via httpx
1724
# via youdotcom
1825
argcomplete==3.1.2
1926
# via nox
27+
async-timeout==5.0.1
28+
# via aiohttp
29+
attrs==25.3.0
30+
# via aiohttp
2031
certifi==2023.7.22
2132
# via httpcore
2233
# via httpx
@@ -34,23 +45,33 @@ execnet==2.1.1
3445
# via pytest-xdist
3546
filelock==3.12.4
3647
# via virtualenv
48+
frozenlist==1.6.2
49+
# via aiohttp
50+
# via aiosignal
3751
h11==0.14.0
3852
# via httpcore
3953
httpcore==1.0.2
4054
# via httpx
4155
httpx==0.28.1
56+
# via httpx-aiohttp
4257
# via respx
4358
# via youdotcom
59+
httpx-aiohttp==0.1.6
60+
# via youdotcom
4461
idna==3.4
4562
# via anyio
4663
# via httpx
64+
# via yarl
4765
importlib-metadata==7.0.0
4866
iniconfig==2.0.0
4967
# via pytest
5068
markdown-it-py==3.0.0
5169
# via rich
5270
mdurl==0.1.2
5371
# via markdown-it-py
72+
multidict==6.4.4
73+
# via aiohttp
74+
# via yarl
5475
mypy==1.14.1
5576
mypy-extensions==1.0.0
5677
# via mypy
@@ -65,6 +86,9 @@ platformdirs==3.11.0
6586
# via virtualenv
6687
pluggy==1.5.0
6788
# via pytest
89+
propcache==0.3.1
90+
# via aiohttp
91+
# via yarl
6892
pydantic==2.10.3
6993
# via youdotcom
7094
pydantic-core==2.27.1
@@ -97,12 +121,15 @@ tomli==2.0.2
97121
# via pytest
98122
typing-extensions==4.12.2
99123
# via anyio
124+
# via multidict
100125
# via mypy
101126
# via pydantic
102127
# via pydantic-core
103128
# via pyright
104129
# via youdotcom
105130
virtualenv==20.24.5
106131
# via nox
132+
yarl==1.20.0
133+
# via aiohttp
107134
zipp==3.17.0
108135
# via importlib-metadata

requirements.lock

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,51 @@
1010
# universal: false
1111

1212
-e file:.
13+
aiohappyeyeballs==2.6.1
14+
# via aiohttp
15+
aiohttp==3.12.8
16+
# via httpx-aiohttp
17+
# via youdotcom
18+
aiosignal==1.3.2
19+
# via aiohttp
1320
annotated-types==0.6.0
1421
# via pydantic
1522
anyio==4.4.0
1623
# via httpx
1724
# via youdotcom
25+
async-timeout==5.0.1
26+
# via aiohttp
27+
attrs==25.3.0
28+
# via aiohttp
1829
certifi==2023.7.22
1930
# via httpcore
2031
# via httpx
2132
distro==1.8.0
2233
# via youdotcom
2334
exceptiongroup==1.2.2
2435
# via anyio
36+
frozenlist==1.6.2
37+
# via aiohttp
38+
# via aiosignal
2539
h11==0.14.0
2640
# via httpcore
2741
httpcore==1.0.2
2842
# via httpx
2943
httpx==0.28.1
44+
# via httpx-aiohttp
45+
# via youdotcom
46+
httpx-aiohttp==0.1.6
3047
# via youdotcom
3148
idna==3.4
3249
# via anyio
3350
# via httpx
51+
# via yarl
52+
multidict==6.4.4
53+
# via aiohttp
54+
# via yarl
55+
propcache==0.3.1
56+
# via aiohttp
57+
# via yarl
3458
pydantic==2.10.3
3559
# via youdotcom
3660
pydantic-core==2.27.1
@@ -40,6 +64,9 @@ sniffio==1.3.0
4064
# via youdotcom
4165
typing-extensions==4.12.2
4266
# via anyio
67+
# via multidict
4368
# via pydantic
4469
# via pydantic-core
4570
# via youdotcom
71+
yarl==1.20.0
72+
# via aiohttp

src/ydc_search_api/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
UnprocessableEntityError,
3737
APIResponseValidationError,
3838
)
39-
from ._base_client import DefaultHttpxClient, DefaultAsyncHttpxClient
39+
from ._base_client import DefaultHttpxClient, DefaultAioHttpClient, DefaultAsyncHttpxClient
4040
from ._utils._logs import setup_logging as _setup_logging
4141

4242
__all__ = [
@@ -78,6 +78,7 @@
7878
"DEFAULT_CONNECTION_LIMITS",
7979
"DefaultHttpxClient",
8080
"DefaultAsyncHttpxClient",
81+
"DefaultAioHttpClient",
8182
]
8283

8384
if not _t.TYPE_CHECKING:

src/ydc_search_api/_base_client.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,6 +1289,24 @@ def __init__(self, **kwargs: Any) -> None:
12891289
super().__init__(**kwargs)
12901290

12911291

1292+
try:
1293+
import httpx_aiohttp
1294+
except ImportError:
1295+
1296+
class _DefaultAioHttpClient(httpx.AsyncClient):
1297+
def __init__(self, **_kwargs: Any) -> None:
1298+
raise RuntimeError("To use the aiohttp client you must have installed the package with the `aiohttp` extra")
1299+
else:
1300+
1301+
class _DefaultAioHttpClient(httpx_aiohttp.HttpxAiohttpClient): # type: ignore
1302+
def __init__(self, **kwargs: Any) -> None:
1303+
kwargs.setdefault("timeout", DEFAULT_TIMEOUT)
1304+
kwargs.setdefault("limits", DEFAULT_CONNECTION_LIMITS)
1305+
kwargs.setdefault("follow_redirects", True)
1306+
1307+
super().__init__(**kwargs)
1308+
1309+
12921310
if TYPE_CHECKING:
12931311
DefaultAsyncHttpxClient = httpx.AsyncClient
12941312
"""An alias to `httpx.AsyncClient` that provides the same defaults that this SDK
@@ -1297,8 +1315,12 @@ def __init__(self, **kwargs: Any) -> None:
12971315
This is useful because overriding the `http_client` with your own instance of
12981316
`httpx.AsyncClient` will result in httpx's defaults being used, not ours.
12991317
"""
1318+
1319+
DefaultAioHttpClient = httpx.AsyncClient
1320+
"""An alias to `httpx.AsyncClient` that changes the default HTTP transport to `aiohttp`."""
13001321
else:
13011322
DefaultAsyncHttpxClient = _DefaultAsyncHttpxClient
1323+
DefaultAioHttpClient = _DefaultAioHttpClient
13021324

13031325

13041326
class AsyncHttpxClientWrapper(DefaultAsyncHttpxClient):

tests/api_resources/test_news.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ def test_streaming_response_list(self, client: YdcSearchAPI) -> None:
6969

7070

7171
class TestAsyncNews:
72-
parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
72+
parametrize = pytest.mark.parametrize(
73+
"async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
74+
)
7375

7476
@pytest.mark.skip()
7577
@parametrize

tests/api_resources/test_search.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ def test_streaming_response_query(self, client: YdcSearchAPI) -> None:
6666

6767

6868
class TestAsyncSearch:
69-
parametrize = pytest.mark.parametrize("async_client", [False, True], indirect=True, ids=["loose", "strict"])
69+
parametrize = pytest.mark.parametrize(
70+
"async_client", [False, True, {"http_client": "aiohttp"}], indirect=True, ids=["loose", "strict", "aiohttp"]
71+
)
7072

7173
@pytest.mark.skip()
7274
@parametrize

tests/conftest.py

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
import logging
77
from typing import TYPE_CHECKING, Iterator, AsyncIterator
88

9+
import httpx
910
import pytest
1011
from pytest_asyncio import is_async_test
1112

12-
from ydc_search_api import YdcSearchAPI, AsyncYdcSearchAPI
13+
from ydc_search_api import YdcSearchAPI, AsyncYdcSearchAPI, DefaultAioHttpClient
14+
from ydc_search_api._utils import is_dict
1315

1416
if TYPE_CHECKING:
1517
from _pytest.fixtures import FixtureRequest # pyright: ignore[reportPrivateImportUsage]
@@ -27,6 +29,19 @@ def pytest_collection_modifyitems(items: list[pytest.Function]) -> None:
2729
for async_test in pytest_asyncio_tests:
2830
async_test.add_marker(session_scope_marker, append=False)
2931

32+
# We skip tests that use both the aiohttp client and respx_mock as respx_mock
33+
# doesn't support custom transports.
34+
for item in items:
35+
if "async_client" not in item.fixturenames or "respx_mock" not in item.fixturenames:
36+
continue
37+
38+
if not hasattr(item, "callspec"):
39+
continue
40+
41+
async_client_param = item.callspec.params.get("async_client")
42+
if is_dict(async_client_param) and async_client_param.get("http_client") == "aiohttp":
43+
item.add_marker(pytest.mark.skip(reason="aiohttp client is not compatible with respx_mock"))
44+
3045

3146
base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010")
3247

@@ -45,9 +60,25 @@ def client(request: FixtureRequest) -> Iterator[YdcSearchAPI]:
4560

4661
@pytest.fixture(scope="session")
4762
async def async_client(request: FixtureRequest) -> AsyncIterator[AsyncYdcSearchAPI]:
48-
strict = getattr(request, "param", True)
49-
if not isinstance(strict, bool):
50-
raise TypeError(f"Unexpected fixture parameter type {type(strict)}, expected {bool}")
51-
52-
async with AsyncYdcSearchAPI(base_url=base_url, api_key=api_key, _strict_response_validation=strict) as client:
63+
param = getattr(request, "param", True)
64+
65+
# defaults
66+
strict = True
67+
http_client: None | httpx.AsyncClient = None
68+
69+
if isinstance(param, bool):
70+
strict = param
71+
elif is_dict(param):
72+
strict = param.get("strict", True)
73+
assert isinstance(strict, bool)
74+
75+
http_client_type = param.get("http_client", "httpx")
76+
if http_client_type == "aiohttp":
77+
http_client = DefaultAioHttpClient()
78+
else:
79+
raise TypeError(f"Unexpected fixture parameter type {type(param)}, expected bool or dict")
80+
81+
async with AsyncYdcSearchAPI(
82+
base_url=base_url, api_key=api_key, _strict_response_validation=strict, http_client=http_client
83+
) as client:
5384
yield client

0 commit comments

Comments
 (0)