diff options
| author | Heiner Lohaus <hlohaus@users.noreply.github.com> | 2024-04-21 07:22:59 +0200 |
|---|---|---|
| committer | Heiner Lohaus <hlohaus@users.noreply.github.com> | 2024-04-21 07:22:59 +0200 |
| commit | db2d6cffd9268e8842f0c2aa8e062c0e19d88d28 (patch) | |
| tree | 2b44e3ec6e21a8c1270f3d84a4a1f0efb360d37b /g4f/requests | |
| parent | Disable Bing integration test (diff) | |
| download | gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.tar gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.tar.gz gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.tar.bz2 gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.tar.lz gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.tar.xz gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.tar.zst gpt4free-db2d6cffd9268e8842f0c2aa8e062c0e19d88d28.zip | |
Diffstat (limited to 'g4f/requests')
| -rw-r--r-- | g4f/requests/aiohttp.py | 5 | ||||
| -rw-r--r-- | g4f/requests/defaults.py | 36 |
2 files changed, 25 insertions, 16 deletions
diff --git a/g4f/requests/aiohttp.py b/g4f/requests/aiohttp.py index cdbedef3..4b629963 100644 --- a/g4f/requests/aiohttp.py +++ b/g4f/requests/aiohttp.py @@ -24,6 +24,7 @@ class StreamSession(ClientSession): headers: dict = {}, timeout: int = None, connector: BaseConnector = None, + proxy: str = None, proxies: dict = {}, impersonate = None, **kwargs @@ -38,11 +39,13 @@ class StreamSession(ClientSession): connect, timeout = timeout; if timeout is not None: timeout = ClientTimeout(timeout, connect) + if proxy is None: + proxy = proxies.get("all", proxies.get("https")) super().__init__( **kwargs, timeout=timeout, response_class=StreamResponse, - connector=get_connector(connector, proxies.get("all", proxies.get("https"))), + connector=get_connector(connector, proxy), headers=headers ) diff --git a/g4f/requests/defaults.py b/g4f/requests/defaults.py index 3183eb5a..739839af 100644 --- a/g4f/requests/defaults.py +++ b/g4f/requests/defaults.py @@ -1,21 +1,27 @@ +try: + import brotli + has_brotli = True +except ImportError: + has_brotli = False + DEFAULT_HEADERS = { - "sec-ch-ua": '"Chromium";v="122", "Not(A:Brand";v="24", "Google Chrome";v="122"', - "sec-ch-ua-mobile": "?0", - "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36", - "ec-ch-ua-arch": '"x86"', - "sec-ch-ua-full-version": '"122.0.6261.69"', "accept": "*/*", - "sec-ch-ua-platform-version:": '"6.5.0"', - "sec-ch-ua-full-version-list": '"Chromium";v="122.0.6261.69", "Not(A:Brand";v="24.0.0.0", "Google Chrome";v="122.0.6261.69"', - "sec-ch-ua-bitness": '"64"', - "sec-ch-ua-model": '""', - "sec-ch-ua-platform": '"Windows"', - "sec-fetch-site": "same-site", - "sec-fetch-mode": "cors", - "sec-fetch-dest": "empty", - "referer": "", - "accept-encoding": "gzip, deflate, br", + "accept-encoding": "gzip, deflate" + (", br" if has_brotli else ""), "accept-language": "en-US", + "referer": "", + "sec-ch-ua": "\"Google Chrome\";v=\"123\", \"Not:A-Brand\";v=\"8\", \"Chromium\";v=\"123\"", + "sec-ch-ua-arch": "\"x86\"", + "sec-ch-ua-bitness": "\"64\"", + "sec-ch-ua-full-version": "\"123.0.6312.122\"", + "sec-ch-ua-full-version-list": "\"Google Chrome\";v=\"123.0.6312.122\", \"Not:A-Brand\";v=\"8.0.0.0\", \"Chromium\";v=\"123.0.6312.122\"", + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-model": "\"\"", + "sec-ch-ua-platform": "\"Windows\"", + "sec-ch-ua-platform-version": '"15.0.0"', + "sec-fetch-dest": "empty", + "sec-fetch-mode": "cors", + "sec-fetch-site": "same-origin", + "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36", } WEBVIEW_HAEDERS = { "Accept": "*/*", |