From eec28469f8ad492a5f3cc331b93d9e7223aa56f8 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 14 Dec 2023 21:21:37 +0200
Subject: [PATCH] Fix server crash if multimodal prompt contains no image

---
 public/index.html                  | 2 +-
 src/endpoints/prompt-converters.js | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 67bb1b96d..bd12da858 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1497,7 +1497,7 @@
                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="openai,openrouter">
+                                    <div class="range-block" data-source="openai,openrouter,makersuite">
                                         <label for="openai_image_inlining" class="checkbox_label flexWrap widthFreeExpand">
                                             <input id="openai_image_inlining" type="checkbox" />
                                             <span data-i18n="Send inline images">Send inline images</span>
diff --git a/src/endpoints/prompt-converters.js b/src/endpoints/prompt-converters.js
index a31a9be47..e564b2eb9 100644
--- a/src/endpoints/prompt-converters.js
+++ b/src/endpoints/prompt-converters.js
@@ -79,6 +79,8 @@ function convertClaudePrompt(messages, addHumanPrefix, addAssistantPostfix, with
  * @returns {object[]} Prompt for Google MakerSuite models
  */
 function convertGooglePrompt(messages, model) {
+    // This is a 1x1 transparent PNG
+    const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
     const contents = [];
     let lastRole = '';
     let currentText = '';
@@ -91,14 +93,15 @@ function convertGooglePrompt(messages, model) {
             return role + message.content;
         }).join('\n\n').trim();
 
-        const imageEntry = messages.find((message) => message.content[1]?.image_url);
+        const imageEntry = messages.find((message) => message.content?.[1]?.image_url);
+        const imageData = imageEntry?.content?.[1]?.image_url?.data ?? PNG_PIXEL;
         contents.push({
             parts: [
                 { text: combinedText },
                 {
                     inlineData: {
                         mimeType: 'image/png',
-                        data: imageEntry.content[1].image_url.url ?? '',
+                        data: imageData,
                     },
                 },
             ],