Skip to content

Bug: 添加 HTTP 客户端会话上下文检查 #2632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanyongyu merged 2 commits into from
Apr 8, 2024
Merged

Bug: 添加 HTTP 客户端会话上下文检查 #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d611f29
:sparkles: add session context check
yanyongyu Apr 6, 2024
3f5e4f0
Update tests/test_driver.py
yanyongyu Apr 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nonebot/drivers/aiohttp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ async def request(self, setup: Request) -> Response:

@override
async def setup(self) -> None:
if self._client is not None:
raise RuntimeError("Session has already been initialized")
self._client = aiohttp.ClientSession(
cookies=self._cookies,
headers=self._headers,
Expand Down
2 changes: 2 additions & 0 deletions nonebot/drivers/httpx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ async def request(self, setup: Request) -> Response:

@override
async def setup(self) -> None:
if self._client is not None:
raise RuntimeError("Session has already been initialized")
self._client = httpx.AsyncClient(
params=self._params,
headers=self._headers,
Expand Down
5 changes: 5 additions & 0 deletions tests/test_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,11 @@ async def test_http_client_session(driver: Driver, server_url: URL):
with pytest.raises(RuntimeError):
await session.request(request)

with pytest.raises(RuntimeError): # noqa: PT012
async with session:
async with session:
...

async with session as session:
# simple post with query, headers, cookies and content
request = Request(
Expand Down