Merge pull request #229 from voideditor/model-selection

Minor usability updates

Author: andrewpareles

build/win32/code.iss

@@ -23,7 +23,7 @@ AppMutex={code:GetAppMutex}
 SetupMutex={#AppMutex}setup
 ; this is a Void icon comment. Old: WizardImageFile="{#RepoDir}\resources\win32\inno-big-100.bmp,{#RepoDir}\resources\win32\inno-big-125.bmp,{#RepoDir}\resources\win32\inno-big-150.bmp,{#RepoDir}\resources\win32\inno-big-175.bmp,{#RepoDir}\resources\win32\inno-big-200.bmp,{#RepoDir}\resources\win32\inno-big-225.bmp,{#RepoDir}\resources\win32\inno-big-250.bmp"
 ; this is a Void icon comment. Old: WizardSmallImageFile="{#RepoDir}\resources\win32\inno-small-100.bmp,{#RepoDir}\resources\win32\inno-small-125.bmp,{#RepoDir}\resources\win32\inno-small-150.bmp,{#RepoDir}\resources\win32\inno-small-175.bmp,{#RepoDir}\resources\win32\inno-small-200.bmp,{#RepoDir}\resources\win32\inno-small-225.bmp,{#RepoDir}\resources\win32\inno-small-250.bmp"
-WizardImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
+; WizardImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
 WizardSmallImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
 SetupIconFile={#RepoDir}\resources\win32\code.ico
 UninstallDisplayIcon={app}\{#ExeBasename}.exe

resources/win32/code.ico

@@ -98,6 +98,7 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 		}
 		const { providerName, modelName } = modelSelection
 
+		// add ai instructions here because we don't have access to voidSettingsService on the other side of the proxy
 		const aiInstructions = this.voidSettingsService.state.globalSettings.aiInstructions
 		if (aiInstructions)
 			proxyParams.messages.unshift({ role: 'system', content: aiInstructions })

resources/win32/inno-void.bmp

@@ -30,6 +30,12 @@ export type LLMMessage = {
 	content: string;
 }
 
+export type _InternalLLMMessage = {
+	role: 'user' | 'assistant';
+	content: string;
+}
+
+
 export type ServiceSendLLMFeatureParams = {
 	useProviderFor: 'Ctrl+K';
 	range: IRange;
@@ -80,7 +86,7 @@ export type EventLLMMessageOnFinalMessageParams = Parameters<OnFinalMessage>[0]
 export type EventLLMMessageOnErrorParams = Parameters<OnError>[0] & { requestId: string }
 
 export type _InternalSendLLMMessageFnType = (params: {
-	messages: LLMMessage[];
+	messages: _InternalLLMMessage[];
 	onText: OnText;
 	onFinalMessage: OnFinalMessage;
 	onError: OnError;

src/vs/platform/void/common/llmMessageService.ts

@@ -7,6 +7,7 @@ import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
 import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IMetricsService } from './metricsService.js';
 
 
 
@@ -27,16 +28,17 @@ export class VoidUpdateService implements IVoidUpdateService {
 
 	constructor(
 		@IMainProcessService mainProcessService: IMainProcessService, // (only usable on client side)
+		@IMetricsService private readonly metricsService: IMetricsService,
 	) {
 		// creates an IPC proxy to use metricsMainService.ts
 		this.voidUpdateService = ProxyChannel.toService<IVoidUpdateService>(mainProcessService.getChannel('void-channel-update'));
 	}
 
 
-
 	// anything transmitted over a channel must be async even if it looks like it doesn't have to be
 	check: IVoidUpdateService['check'] = async () => {
 		const res = await this.voidUpdateService.check()
+		this.metricsService.capture('Check for Updates', { ...res })
 		return res
 	}
 }

src/vs/platform/void/common/llmMessageTypes.ts

@@ -7,11 +7,6 @@ import Anthropic from '@anthropic-ai/sdk';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
 import { anthropicMaxPossibleTokens } from '../../common/voidSettingsTypes.js';
 
-// Anthropic
-type LLMMessageAnthropic = {
-	role: 'user' | 'assistant';
-	content: string;
-}
 export const sendAnthropicMsg: _InternalSendLLMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
 
 	const thisConfig = settingsOfProvider.anthropic
@@ -24,20 +19,9 @@ export const sendAnthropicMsg: _InternalSendLLMMessageFnType = ({ messages, onTe
 
 	const anthropic = new Anthropic({ apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true });
 
-	// find system messages and concatenate them
-	const systemMessage = messages
-		.filter(msg => msg.role === 'system')
-		.map(msg => msg.content)
-		.join('\n');
-
-	// remove system messages for Anthropic
-	const anthropicMessages = messages.filter(msg => msg.role !== 'system') as LLMMessageAnthropic[]
-
-
-
 	const stream = anthropic.messages.stream({
-		system: systemMessage,
-		messages: anthropicMessages,
+		// system: systemMessage,
+		messages: messages,
 		model: modelName,
 		max_tokens: maxTokens,
 	});

src/vs/platform/void/common/voidUpdateService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { Content, GoogleGenerativeAI, GoogleGenerativeAIFetchError } from '@google/generative-ai';
+import { Content, GoogleGenerativeAI } from '@google/generative-ai';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
 
 // Gemini
@@ -16,22 +16,17 @@ export const sendGeminiMsg: _InternalSendLLMMessageFnType = async ({ messages, o
 	const genAI = new GoogleGenerativeAI(thisConfig.apiKey);
 	const model = genAI.getGenerativeModel({ model: modelName });
 
-	// remove system messages that get sent to Gemini
-	// str of all system messages
-	const systemMessage = messages
-		.filter(msg => msg.role === 'system')
-		.map(msg => msg.content)
-		.join('\n');
-
 	// Convert messages to Gemini format
 	const geminiMessages: Content[] = messages
-		.filter(msg => msg.role !== 'system')
 		.map((msg, i) => ({
 			parts: [{ text: msg.content }],
 			role: msg.role === 'assistant' ? 'model' : 'user'
 		}))
 
-	model.generateContentStream({ contents: geminiMessages, systemInstruction: systemMessage, })
+	model.generateContentStream({
+		// systemInstruction: systemMessage,
+		contents: geminiMessages,
+	})
 		.then(async response => {
 			_setAborter(() => response.stream.return(fullText))
 
@@ -43,11 +38,6 @@ export const sendGeminiMsg: _InternalSendLLMMessageFnType = async ({ messages, o
 			onFinalMessage({ fullText });
 		})
 		.catch((error) => {
-			if (error instanceof GoogleGenerativeAIFetchError && error.status === 400) {
-				onError({ message: 'Invalid API key.', fullError: null });
-			}
-			else {
-				onError({ message: error + '', fullError: error });
-			}
+			onError({ message: error + '', fullError: error })
 		})
 }

src/vs/platform/void/electron-main/llmMessage/anthropic.ts

@@ -79,7 +79,6 @@ export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText,
 		throw new Error(`providerName was invalid: ${providerName}`)
 	}
 
-	openai.models.list()
 	openai.chat.completions
 		.create(options)
 		.then(async response => {
@@ -98,7 +97,7 @@ export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText,
 				onError({ message: 'Invalid API key.', fullError: error });
 			}
 			else {
-				onError({ message: error, fullError: error });
+				onError({ message: error + '', fullError: error });
 			}
 		})
 

src/vs/platform/void/electron-main/llmMessage/gemini.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { LLMMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
+import { LLMMMessageParams, OnText, OnFinalMessage, OnError, LLMMessage, _InternalLLMMessage } from '../../common/llmMessageTypes.js';
 import { IMetricsService } from '../../common/metricsService.js';
 
 import { sendAnthropicMsg } from './anthropic.js';
@@ -12,8 +12,43 @@ import { sendOpenAIMsg } from './openai.js';
 import { sendGeminiMsg } from './gemini.js';
 import { sendGroqMsg } from './groq.js';
 
+
+const cleanMessages = (messages: LLMMessage[]): _InternalLLMMessage[] => {
+	// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
+	messages = messages.map(m => ({ ...m, content: m.content.trim() }))
+
+	// find system messages and concatenate them
+	const systemMessage = messages
+		.filter(msg => msg.role === 'system')
+		.map(msg => msg.content)
+		.join('\n') || undefined;
+
+	// remove all system messages
+	const noSystemMessages = messages
+		.filter(msg => msg.role !== 'system') as _InternalLLMMessage[]
+
+	// add system mesasges to first message (should be a user message)
+	if (systemMessage && (noSystemMessages.length !== 0)) {
+		const newFirstMessage = {
+			role: noSystemMessages[0].role,
+			content: (''
+				+ '<SYSTEM_MESSAGE>\n'
+				+ systemMessage
+				+ '\n'
+				+ '</SYSTEM_MESSAGE>\n'
+				+ noSystemMessages[0].content
+			)
+		}
+		noSystemMessages.splice(0, 1) // delete first message
+		noSystemMessages.unshift(newFirstMessage) // add new first message
+	}
+
+	return noSystemMessages
+}
+
+
 export const sendLLMMessage = ({
-	messages,
+	messages: messages_,
 	onText: onText_,
 	onFinalMessage: onFinalMessage_,
 	onError: onError_,
@@ -26,9 +61,7 @@ export const sendLLMMessage = ({
 
 	metricsService: IMetricsService
 ) => {
-
-	// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
-	messages = messages.map(m => ({ ...m, content: m.content.trim() }))
+	const messages = cleanMessages(messages_)
 
 	// only captures number of messages and message "shape", no actual code, instructions, prompts, etc
 	const captureChatEvent = (eventId: string, extras?: object) => {
@@ -37,6 +70,9 @@ export const sendLLMMessage = ({
 			modelName,
 			numMessages: messages?.length,
 			messagesShape: messages?.map(msg => ({ role: msg.role, length: msg.content.length })),
+			origNumMessages: messages_?.length,
+			origMessagesShape: messages_?.map(msg => ({ role: msg.role, length: msg.content.length })),
+
 			...extras,
 		})
 	}