From 743bbae5d1c3573b7104a7b589e76c7cdc385ed1 Mon Sep 17 00:00:00 2001 From: Entaigner Date: Sun, 21 Apr 2024 11:54:30 +0200 Subject: [PATCH 1/7] Bugfix: FileReader can't be resused so init one per image --- src/lib/components/chat/MessageInput.svelte | 47 ++++++++++----------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte index ebf8e9713..2793a8d4b 100644 --- a/src/lib/components/chat/MessageInput.svelte +++ b/src/lib/components/chat/MessageInput.svelte @@ -316,24 +316,22 @@ console.log(e); if (e.dataTransfer?.files) { - let reader = new FileReader(); - - reader.onload = (event) => { - files = [ - ...files, - { - type: 'image', - url: `${event.target.result}` - } - ]; - }; - const inputFiles = Array.from(e.dataTransfer?.files); if (inputFiles && inputFiles.length > 0) { inputFiles.forEach((file) => { console.log(file, file.name.split('.').at(-1)); if (['image/gif', 'image/jpeg', 'image/png'].includes(file['type'])) { + let reader = new FileReader(); + reader.onload = (event) => { + files = [ + ...files, + { + type: 'image', + url: `${event.target.result}` + } + ]; + }; reader.readAsDataURL(file); } else if ( SUPPORTED_FILE_TYPE.includes(file['type']) || @@ -470,23 +468,22 @@ hidden multiple on:change={async () => { - let reader = new FileReader(); - reader.onload = (event) => { - files = [ - ...files, - { - type: 'image', - url: `${event.target.result}` - } - ]; - inputFiles = null; - filesInputElement.value = ''; - }; - if (inputFiles && inputFiles.length > 0) { const _inputFiles = Array.from(inputFiles); _inputFiles.forEach((file) => { if (['image/gif', 'image/jpeg', 'image/png'].includes(file['type'])) { + let reader = new FileReader(); + reader.onload = (event) => { + files = [ + ...files, + { + type: 'image', + url: `${event.target.result}` + } + ]; + inputFiles = null; + filesInputElement.value = ''; + }; reader.readAsDataURL(file); } else if ( SUPPORTED_FILE_TYPE.includes(file['type']) || From 489c45ffdf33ef9c9b97e3c52a016d6bf40b09cb Mon Sep 17 00:00:00 2001 From: dyamagishi Date: Mon, 22 Apr 2024 01:19:34 +0900 Subject: [PATCH 2/7] fix: Update websocket protocol based on the original schema. --- backend/apps/images/utils/comfyui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/apps/images/utils/comfyui.py b/backend/apps/images/utils/comfyui.py index 393333255..05df1c166 100644 --- a/backend/apps/images/utils/comfyui.py +++ b/backend/apps/images/utils/comfyui.py @@ -195,7 +195,7 @@ class ImageGenerationPayload(BaseModel): def comfyui_generate_image( model: str, payload: ImageGenerationPayload, client_id, base_url ): - host = base_url.replace("http://", "").replace("https://", "") + ws_url = base_url.replace("http://", "ws://").replace("https://", "wss://") comfyui_prompt = json.loads(COMFYUI_DEFAULT_PROMPT) @@ -217,7 +217,7 @@ def comfyui_generate_image( try: ws = websocket.WebSocket() - ws.connect(f"ws://{host}/ws?clientId={client_id}") + ws.connect(f"{ws_url}/ws?clientId={client_id}") log.info("WebSocket connection established.") except Exception as e: log.exception(f"Failed to connect to WebSocket server: {e}") From 302c5074e9e6cbfaa7fb47c46fd646d59596c29f Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Sun, 21 Apr 2024 12:50:14 -0500 Subject: [PATCH 3/7] revert: litellm bump --- backend/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/requirements.txt b/backend/requirements.txt index 5f41137c9..c815d93da 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -17,7 +17,7 @@ peewee peewee-migrate bcrypt -litellm==1.35.17 +litellm==1.30.7 boto3 argon2-cffi From bfdefbf6e773ebf2ee4cde536b67ef7196d37647 Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Sun, 21 Apr 2024 13:02:26 -0500 Subject: [PATCH 4/7] fix: archived chats modal styling --- src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte index b8f6c4b56..70cb0676c 100644 --- a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte +++ b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte @@ -75,7 +75,7 @@ > {$i18n.t('Name')} - {$i18n.t('Created At')} + {$i18n.t('Created At')} @@ -93,7 +93,7 @@ - + {dayjs(chat.created_at * 1000).format($i18n.t('MMMM DD, YYYY HH:mm'))} From 6f6be2c03f152b5c91f35b1cd7100094b8d871aa Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Sun, 21 Apr 2024 13:16:45 -0500 Subject: [PATCH 5/7] fix: styling --- .../layout/Sidebar/ArchivedChatsModal.svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte index 70cb0676c..32ec9c6b0 100644 --- a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte +++ b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte @@ -67,7 +67,7 @@
{#if chats.length > 0} -
+
- {#each chats as chat, idx} + {#each [...chats, ...chats, ...chats] as chat, idx} - - {#each [...chats, ...chats, ...chats] as chat, idx} + {#each chats as chat, idx} Date: Sun, 21 Apr 2024 13:24:46 -0500 Subject: [PATCH 7/7] refac: styling --- src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte index 6ae5286b4..51bcf1ad6 100644 --- a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte +++ b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte @@ -67,7 +67,7 @@
{#if chats.length > 0} -
+
From 4148d70ec029401b152ccbb7da4ad887489dd68c Mon Sep 17 00:00:00 2001 From: "Timothy J. Baek" Date: Sun, 21 Apr 2024 13:19:48 -0500 Subject: [PATCH 6/7] fix --- src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte index 32ec9c6b0..6ae5286b4 100644 --- a/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte +++ b/src/lib/components/layout/Sidebar/ArchivedChatsModal.svelte @@ -80,7 +80,7 @@