From 731102781151f4165bb7de27a02c3d8b219ff0dd Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 27 May 2025 12:33:33 -0700 Subject: [PATCH] Multi-modality now working --- frontend/src/NewApp/Components/GenerateImage.tsx | 9 +++++++-- frontend/src/NewApp/Pages/GenerateCandidate.tsx | 7 ++++++- src/utils/agents/image_generator.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/frontend/src/NewApp/Components/GenerateImage.tsx b/frontend/src/NewApp/Components/GenerateImage.tsx index dc1facf..4a599f1 100644 --- a/frontend/src/NewApp/Components/GenerateImage.tsx +++ b/frontend/src/NewApp/Components/GenerateImage.tsx @@ -81,7 +81,12 @@ const GenerateImage = (props: GenerateImageProps) => { controllerRef.current = null; break; default: - const data = JSON.parse(msg.response || ''); + let data: any = {}; + try { + data = typeof msg.response === 'string' ? JSON.parse(msg.response) : msg.response; + } catch (e) { + data = { message: msg.response }; + } if (msg.status !== "heartbeat") { console.log(data); } @@ -112,7 +117,7 @@ const GenerateImage = (props: GenerateImageProps) => { maxWidth: { xs: '100%', md: '700px', lg: '1024px' }, minHeight: "max-content", }}> - {image !== '' && } + {image !== '' && {prompt}} { prompt && } diff --git a/frontend/src/NewApp/Pages/GenerateCandidate.tsx b/frontend/src/NewApp/Pages/GenerateCandidate.tsx index bee3872..cbfd8f5 100644 --- a/frontend/src/NewApp/Pages/GenerateCandidate.tsx +++ b/frontend/src/NewApp/Pages/GenerateCandidate.tsx @@ -215,7 +215,12 @@ const GenerateCandidate = (props: BackstoryElementProps) => { setShouldGenerateProfile(false); break; default: - const data = JSON.parse(msg.response || ''); + let data: any = {}; + try { + data = typeof msg.response === 'string' ? JSON.parse(msg.response) : msg.response; + } catch (e) { + data = { message: msg.response }; + } if (msg.status !== "heartbeat") { console.log(data); } diff --git a/src/utils/agents/image_generator.py b/src/utils/agents/image_generator.py index 3506d50..ed5efbc 100644 --- a/src/utils/agents/image_generator.py +++ b/src/utils/agents/image_generator.py @@ -166,7 +166,7 @@ class ImageGenerator(Agent): # Image generated message.status = "done" if self.filename != "profile.png": - message.response = f"/apu/u/{self.username}/images/{self.filename}" + message.response = f"/api/u/{self.username}/images/{self.filename}" else: message.response = f"/api/u/{self.username}/profile"