From 55caf8e7def645145504b68f34f43600a4a31f5d Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sat, 24 Feb 2024 14:52:23 +0100 Subject: Add FlowGpt provider, Fix issue with None values in api --- g4f/Provider/FlowGpt.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ g4f/Provider/__init__.py | 1 + 2 files changed, 76 insertions(+) create mode 100644 g4f/Provider/FlowGpt.py (limited to 'g4f/Provider') diff --git a/g4f/Provider/FlowGpt.py b/g4f/Provider/FlowGpt.py new file mode 100644 index 00000000..89d44c6c --- /dev/null +++ b/g4f/Provider/FlowGpt.py @@ -0,0 +1,75 @@ +from __future__ import annotations + +import json +from aiohttp import ClientSession + +from ..typing import AsyncResult, Messages +from .base_provider import AsyncGeneratorProvider, ProviderModelMixin + +class FlowGpt(AsyncGeneratorProvider, ProviderModelMixin): + url = "https://flowgpt.com/chat" + working = True + supports_gpt_35_turbo = True + supports_gpt_4 = True + supports_message_history = True + default_model = "gpt-3.5-turbo" + models = [ + "gpt-4", + "gpt-3.5-turbo", + "gpt-3.5-long", + "google-gemini", + "claude-v2", + "llama2-13b" + ] + model_aliases = { + "gemini": "google-gemini", + "gemini-pro": "google-gemini" + } + + @classmethod + async def create_async_generator( + cls, + model: str, + messages: Messages, + proxy: str = None, + **kwargs + ) -> AsyncResult: + model = cls.get_model(model) + headers = { + "User-Agent": "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:122.0) Gecko/20100101 Firefox/122.0", + "Accept": "*/*", + "Accept-Language": "en-US;q=0.7,en;q=0.3", + "Accept-Encoding": "gzip, deflate, br", + "Referer": "https://flowgpt.com/", + "Content-Type": "application/json", + "Authorization": "Bearer null", + "Origin": "https://flowgpt.com", + "Connection": "keep-alive", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-site", + "TE": "trailers" + } + async with ClientSession(headers=headers) as session: + data = { + "model": model, + "nsfw": False, + "question": messages[-1]["content"], + "history": [{"role": "assistant", "content": "Hello, how can I help you today?"}, *messages[:-1]], + "system": "You are helpful assitant. Follow the user's instructions carefully. Respond using markdown", + "temperature": kwargs.get("temperature", 0.7), + "promptId": f"model-{model}", + "documentIds": [], + "chatFileDocumentIds": [], + "generateImage": False, + "generateAudio": False + } + async with session.post("https://backend-k8s.flowgpt.com/v2/chat-anonymous", json=data, proxy=proxy) as response: + response.raise_for_status() + async for chunk in response.content: + if chunk.strip(): + message = json.loads(chunk) + if "event" not in message: + continue + if message["event"] == "text": + yield message["data"] \ No newline at end of file diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 270b6356..6cdc8806 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -31,6 +31,7 @@ from .ChatgptX import ChatgptX from .Chatxyz import Chatxyz from .DeepInfra import DeepInfra from .FakeGpt import FakeGpt +from .FlowGpt import FlowGpt from .FreeChatgpt import FreeChatgpt from .FreeGpt import FreeGpt from .GeekGpt import GeekGpt -- cgit v1.2.3 From dd2264b616feae91642d5f430827db7cee1cf7a8 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 25 Feb 2024 07:16:54 +0100 Subject: Fix cookies is None bug --- g4f/Provider/needs_auth/OpenaiChat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g4f/Provider') diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py index 001f5a3c..556c3d9b 100644 --- a/g4f/Provider/needs_auth/OpenaiChat.py +++ b/g4f/Provider/needs_auth/OpenaiChat.py @@ -336,7 +336,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin): if cls._args is None and cookies is None: cookies = get_cookies("chat.openai.com", False) api_key = kwargs["access_token"] if "access_token" in kwargs else api_key - if api_key is None: + if api_key is None and cookies is not None: api_key = cookies["access_token"] if "access_token" in cookies else api_key if cls._args is None: cls._args = { -- cgit v1.2.3 From 140a1736b94cbcb16e3e65c36e2692101f4d01b3 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Sun, 25 Feb 2024 07:19:23 +0100 Subject: Fix typo in system_message in FlowGpt --- g4f/Provider/FlowGpt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g4f/Provider') diff --git a/g4f/Provider/FlowGpt.py b/g4f/Provider/FlowGpt.py index 89d44c6c..39192bf9 100644 --- a/g4f/Provider/FlowGpt.py +++ b/g4f/Provider/FlowGpt.py @@ -56,7 +56,7 @@ class FlowGpt(AsyncGeneratorProvider, ProviderModelMixin): "nsfw": False, "question": messages[-1]["content"], "history": [{"role": "assistant", "content": "Hello, how can I help you today?"}, *messages[:-1]], - "system": "You are helpful assitant. Follow the user's instructions carefully. Respond using markdown", + "system": kwargs.get("system_message", "You are helpful assistant. Follow the user's instructions carefully."), "temperature": kwargs.get("temperature", 0.7), "promptId": f"model-{model}", "documentIds": [], -- cgit v1.2.3