summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Lohaus <hlohaus@users.noreply.github.com>2024-02-24 14:52:23 +0100
committerHeiner Lohaus <hlohaus@users.noreply.github.com>2024-02-24 14:52:23 +0100
commit55caf8e7def645145504b68f34f43600a4a31f5d (patch)
treeab5762c444649ffcc4012460713439d1cd6154bc
parentAdd remove messages from history (diff)
downloadgpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.tar
gpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.tar.gz
gpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.tar.bz2
gpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.tar.lz
gpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.tar.xz
gpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.tar.zst
gpt4free-55caf8e7def645145504b68f34f43600a4a31f5d.zip
-rw-r--r--g4f/Provider/FlowGpt.py75
-rw-r--r--g4f/Provider/__init__.py1
-rw-r--r--g4f/api/__init__.py5
-rw-r--r--g4f/gui/client/js/chat.v1.js2
4 files changed, 79 insertions, 4 deletions
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
diff --git a/g4f/api/__init__.py b/g4f/api/__init__.py
index abfe3b04..f8d0b4af 100644
--- a/g4f/api/__init__.py
+++ b/g4f/api/__init__.py
@@ -86,9 +86,8 @@ class Api:
auth_header = request.headers.get("Authorization")
if auth_header is not None:
config.api_key = auth_header.split(None, 1)[-1]
-
response = self.client.chat.completions.create(
- **dict(config),
+ **config.dict(exclude_none=True),
ignored=self.list_ignored_providers
)
except Exception as e:
@@ -121,7 +120,7 @@ class Api:
def format_exception(e: Exception, config: ChatCompletionsConfig) -> str:
last_provider = g4f.get_last_provider(True)
return json.dumps({
- "error": {"message": f"ChatCompletionsError: {e.__class__.__name__}: {e}"},
+ "error": {"message": f"{e.__class__.__name__}: {e}"},
"model": last_provider.get("model") if last_provider else config.model,
"provider": last_provider.get("name") if last_provider else config.provider
})
diff --git a/g4f/gui/client/js/chat.v1.js b/g4f/gui/client/js/chat.v1.js
index 57af298b..37775fbb 100644
--- a/g4f/gui/client/js/chat.v1.js
+++ b/g4f/gui/client/js/chat.v1.js
@@ -11,7 +11,7 @@ const imageInput = document.querySelector('#image');
const cameraInput = document.querySelector('#camera');
const fileInput = document.querySelector('#file');
-let prompt_lock = false;
+let prompt_lock = false;
hljs.addPlugin(new CopyButtonPlugin());