Merge branch 'master' of git.kaiyuancloud.cn:yumoqing/apppublic

This commit is contained in:
yumoqing 2025-06-19 17:54:58 +08:00
commit f3765f7b73

View File

@ -52,7 +52,7 @@ class StreamHttpClient:
data=None,
json=None,
files=None,
chunk_size=1024):
chunk_size=1024, **kw):
"""
Makes an HTTP request and yields response chunks (streamed).
"""
@ -64,7 +64,7 @@ class StreamHttpClient:
method, url,
headers=headers, params=params, data=data,
json=json, files=files,
use_socks=True, chunk_size=chunk_size
use_socks=True, chunk_size=chunk_size, **kw
):
yield chunk
else:
@ -73,7 +73,7 @@ class StreamHttpClient:
method, url,
headers=headers, params=params, data=data,
json=json, files=files,
use_socks=False, chunk_size=chunk_size
use_socks=False, chunk_size=chunk_size, **kw
):
yield chunk
except Exception as e:
@ -87,7 +87,7 @@ class StreamHttpClient:
method, url,
headers=headers, params=params, data=data,
json=json, files=files,
use_socks=True, chunk_size=chunk_size
use_socks=True, chunk_size=chunk_size, **kw
):
self._save_socks_url(url)
yield chunk
@ -97,16 +97,18 @@ class StreamHttpClient:
async def _request_with_connector(self, method, url,
headers=None, params=None, data=None,
json=None, files=None,
use_socks=False, chunk_size=1024):
use_socks=False,
chunk_size=1024,
**kw):
connector = ProxyConnector.from_url(self.socks5_url) if use_socks else None
async with aiohttp.ClientSession(connector=connector) as session:
req_args = {
req_args = kw
req_args.update({
"headers": headers,
"params": params,
"timeout": 30,
"ssl": self.ssl_context,
}
})
if files:
form = aiohttp.FormData()