diff options
Diffstat (limited to '')
| -rw-r--r-- | g4f/Provider/Koala.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/g4f/Provider/Koala.py b/g4f/Provider/Koala.py index 0e3ba13d..849bcdbe 100644 --- a/g4f/Provider/Koala.py +++ b/g4f/Provider/Koala.py @@ -1,17 +1,18 @@ from __future__ import annotations import json -from aiohttp import ClientSession +from aiohttp import ClientSession, BaseConnector from ..typing import AsyncResult, Messages from .base_provider import AsyncGeneratorProvider -from .helper import get_random_string +from .helper import get_random_string, get_connector +from ..requests import raise_for_status class Koala(AsyncGeneratorProvider): url = "https://koala.sh" + working = True supports_gpt_35_turbo = True supports_message_history = True - working = True @classmethod async def create_async_generator( @@ -19,35 +20,36 @@ class Koala(AsyncGeneratorProvider): model: str, messages: Messages, proxy: str = None, + connector: BaseConnector = None, **kwargs ) -> AsyncResult: if not model: model = "gpt-3.5-turbo" headers = { - "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/119.0", + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0", "Accept": "text/event-stream", "Accept-Language": "de,en-US;q=0.7,en;q=0.3", "Accept-Encoding": "gzip, deflate, br", "Referer": f"{cls.url}/chat", - "Content-Type": "application/json", "Flag-Real-Time-Data": "false", "Visitor-ID": get_random_string(20), "Origin": cls.url, "Alt-Used": "koala.sh", - "Connection": "keep-alive", "Sec-Fetch-Dest": "empty", "Sec-Fetch-Mode": "cors", "Sec-Fetch-Site": "same-origin", - "Pragma": "no-cache", - "Cache-Control": "no-cache", "TE": "trailers", } - async with ClientSession(headers=headers) as session: + async with ClientSession(headers=headers, connector=get_connector(connector, proxy)) as session: + input = messages[-1]["content"] + system_messages = [message["content"] for message in messages if message["role"] == "system"] + if system_messages: + input += " ".join(system_messages) data = { - "input": messages[-1]["content"], + "input": input, "inputHistory": [ message["content"] - for message in messages + for message in messages[:-1] if message["role"] == "user" ], "outputHistory": [ @@ -58,7 +60,7 @@ class Koala(AsyncGeneratorProvider): "model": model, } async with session.post(f"{cls.url}/api/gpt/", json=data, proxy=proxy) as response: - response.raise_for_status() + await raise_for_status(response) async for chunk in response.content: if chunk.startswith(b"data: "): yield json.loads(chunk[6:])
\ No newline at end of file |