Remove userPlaceholder #2962

face9462aa102e8523a47fee9af6d3bfc3debae3

Cohee <18619528+Cohee1207@users.noreply.github.com>

default/config.yaml+0 -4 Viewed

   # (e.g {{random}} macro or lorebooks not as in-chat injections).
   # Otherwise, you'll just waste money on cache misses.
   enableSystemPromptCache: false
-# -- COHERE API CONFIGURATION --
-cohere:
-  # A placeholder prompt to be used when the message array doesn't end with a user message
-  userPlaceholder: "Continue"
 # -- SERVER PLUGIN CONFIGURATION --
 enableServerPlugins: false

src/prompt-converters.js+3 -7 Viewed

@@ -294,7 +294,7 @@ function convertCohereMessages(messages, charName = '', userName = '') {
294	msg.content = messages[index - 1].content;	294	msg.content = messages[index - 1].content;
295	messages.splice(index - 1, 1);	295	messages.splice(index - 1, 1);
296	} else {	296	} else {
297	msg.content = `I'm going to call the tool for that: ${msg.tool_calls.map(tc => tc?.function?.name).join(', ')}`;	297	msg.content = `I'm going to call a tool for that: ${msg.tool_calls.map(tc => tc?.function?.name).join(', ')}`;
298	}	298	}
299	}	299	}
300	// No names support (who would've thought)	300	// No names support (who would've thought)

     });
     // A prompt should end with a user/tool message
-    if (!['user', 'tool'].includes(messages[messages.length - 1].role)) {
+    if (messages.length && !['user', 'tool'].includes(messages[messages.length - 1].role)) {
-        const userPlaceholder = getConfigValue('cohere.userPlaceholder', PROMPT_PLACEHOLDER || 'Continue');
+        messages[messages.length - 1].role = 'user';
-        messages.push({
-            role: 'user',
-            content: userPlaceholder,
-        });
+    }
     return { chatHistory: messages };