diff options
author | H Lohaus <hlohaus@users.noreply.github.com> | 2024-04-21 07:45:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-21 07:45:23 +0200 |
commit | 0f3935f1c068c723342153dd040e0e72e95aa11b (patch) | |
tree | c4d1e9c9eb2ebfe13e2679afe8a23d7ffa45fa46 /g4f/gui | |
parent | Merge pull request #1865 from hlohaus/carst (diff) | |
parent | Add MissingRequirementsError to You (diff) | |
download | gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.tar gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.tar.gz gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.tar.bz2 gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.tar.lz gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.tar.xz gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.tar.zst gpt4free-0f3935f1c068c723342153dd040e0e72e95aa11b.zip |
Diffstat (limited to '')
-rw-r--r-- | g4f/gui/client/static/js/chat.v1.js | 8 | ||||
-rw-r--r-- | g4f/gui/server/api.py | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js index a043cb25..8b00eed2 100644 --- a/g4f/gui/client/static/js/chat.v1.js +++ b/g4f/gui/client/static/js/chat.v1.js @@ -41,7 +41,9 @@ appStorage = window.localStorage || { length: 0 } -const markdown = window.markdownit(); +const markdown = window.markdownit({ + html: true, +}); const markdown_render = (content) => { return markdown.render(content .replaceAll(/<!-- generated images start -->|<!-- generated images end -->/gm, "") @@ -312,6 +314,8 @@ async function add_message_chunk(message) { window.error = message.error console.error(message.error); content_inner.innerHTML += `<p><strong>An error occured:</strong> ${message.error}</p>`; + } else if (message.type == "preview") { + content_inner.innerHTML = markdown_render(message.preview); } else if (message.type == "content") { window.text += message.content; html = markdown_render(window.text); @@ -545,7 +549,7 @@ const load_conversation = async (conversation_id, scroll=true) => { last_model = item.provider?.model; let next_i = parseInt(i) + 1; let next_provider = item.provider ? item.provider : (messages.length > next_i ? messages[next_i].provider : null); - let provider_label = item.provider?.label ? item.provider?.label : item.provider?.name; + let provider_label = item.provider?.label ? item.provider.label : item.provider?.name; let provider_link = item.provider?.name ? `<a href="${item.provider.url}" target="_blank">${provider_label}</a>` : ""; let provider = provider_link ? ` <div class="provider"> diff --git a/g4f/gui/server/api.py b/g4f/gui/server/api.py index 211d40c6..47c25eb7 100644 --- a/g4f/gui/server/api.py +++ b/g4f/gui/server/api.py @@ -7,6 +7,7 @@ from typing import Iterator from g4f import version, models from g4f import get_last_provider, ChatCompletion from g4f.errors import VersionNotFoundError +from g4f.image import ImagePreview from g4f.Provider import ProviderType, __providers__, __map__ from g4f.providers.base_provider import ProviderModelMixin, FinishReason from g4f.providers.conversation import BaseConversation @@ -146,6 +147,8 @@ class Api(): elif isinstance(chunk, Exception): logging.exception(chunk) yield self._format_json("message", get_error_message(chunk)) + elif isinstance(chunk, ImagePreview): + yield self._format_json("preview", chunk.to_string()) elif not isinstance(chunk, FinishReason): yield self._format_json("content", str(chunk)) except Exception as e: |