🐛 Fix: httpx proxy 与 aiohttp timeout 参数新版本修改 (#3152)

nonebot/drivers/aiohttp.py

@@ -90,9 +90,7 @@ def client(self) -> aiohttp.ClientSession:
     @override
     async def request(self, setup: Request) -> Response:
         if self._params:
-            params = self._params.copy()
-            params.update(setup.url.query)
-            url = setup.url.with_query(params)
+            url = setup.url.with_query({**self._params, **setup.url.query})
         else:
             url = setup.url
 
@@ -172,11 +170,13 @@ async def websocket(self, setup: Request) -> AsyncGenerator["WebSocket", None]:
         else:
             raise RuntimeError(f"Unsupported HTTP version: {setup.version}")
 
+        timeout = aiohttp.ClientWSTimeout(ws_close=setup.timeout or 10.0)  # type: ignore
+
         async with aiohttp.ClientSession(version=version, trust_env=True) as session:
             async with session.ws_connect(
                 setup.url,
                 method=setup.method,
-                timeout=setup.timeout or 10,  # type: ignore
+                timeout=timeout,
                 headers=setup.headers,
                 proxy=setup.proxy,
             ) as ws:

nonebot/drivers/httpx.py

@@ -82,6 +82,8 @@ async def request(self, setup: Request) -> Response:
             data=setup.data,
             files=setup.files,
             json=setup.json,
+            # ensure the params priority
+            params=setup.url.raw_query_string,
             headers=tuple(setup.headers.items()),
             cookies=setup.cookies.jar,
             timeout=setup.timeout,
@@ -102,7 +104,7 @@ async def setup(self) -> None:
             headers=self._headers,
             cookies=self._cookies.jar,
             http2=self._version == HTTPVersion.H2,
-            proxies=self._proxy,
+            proxy=self._proxy,
             follow_redirects=True,
         )
         await self._client.__aenter__()

pyproject.toml

@@ -34,13 +34,13 @@ loguru = ">=0.6.0,<1.0.0"
 python-dotenv = ">=0.21.0,<2.0.0"
 typing-extensions = ">=4.4.0,<5.0.0"
 tomli = { version = "^2.0.1", python = "<3.11" }
-pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1,!=2.10.0"
+pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1,!=2.10.0,!=2.10.1"
 
 websockets = { version = ">=10.0", optional = true }
 Quart = { version = ">=0.18.0,<1.0.0", optional = true }
 fastapi = { version = ">=0.93.0,<1.0.0", optional = true }
-aiohttp = { version = "^3.9.0b0", extras = ["speedups"], optional = true }
-httpx = { version = ">=0.20.0,<1.0.0", extras = ["http2"], optional = true }
+aiohttp = { version = "^3.11.0", extras = ["speedups"], optional = true }
+httpx = { version = ">=0.26.0,<1.0.0", extras = ["http2"], optional = true }
 uvicorn = { version = ">=0.20.0,<1.0.0", extras = [
   "standard",
 ], optional = true }