From d44b39b31c83c6a4bc636bea931275702c700feb Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sat, 6 Apr 2024 01:05:00 +0200 Subject: Add Groq and Openai interfaces, Add integration tests --- g4f/requests/aiohttp.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'g4f/requests') diff --git a/g4f/requests/aiohttp.py b/g4f/requests/aiohttp.py index 16b052eb..71e7bde7 100644 --- a/g4f/requests/aiohttp.py +++ b/g4f/requests/aiohttp.py @@ -15,11 +15,19 @@ class StreamResponse(ClientResponse): async for chunk in self.content.iter_any(): yield chunk - async def json(self) -> Any: - return await super().json(content_type=None) + async def json(self, content_type: str = None) -> Any: + return await super().json(content_type=content_type) class StreamSession(ClientSession): - def __init__(self, headers: dict = {}, timeout: int = None, proxies: dict = {}, impersonate = None, **kwargs): + def __init__( + self, + headers: dict = {}, + timeout: int = None, + connector: BaseConnector = None, + proxies: dict = {}, + impersonate = None, + **kwargs + ): if impersonate: headers = { **DEFAULT_HEADERS, @@ -29,7 +37,7 @@ class StreamSession(ClientSession): **kwargs, timeout=ClientTimeout(timeout) if timeout else None, response_class=StreamResponse, - connector=get_connector(kwargs.get("connector"), proxies.get("https")), + connector=get_connector(connector, proxies.get("all", proxies.get("https"))), headers=headers ) -- cgit v1.2.3