diff --git a/src/vs/platform/void/common/llmMessageTypes.ts b/src/vs/platform/void/common/llmMessageTypes.ts index 5966f1b1..94096b7c 100644 --- a/src/vs/platform/void/common/llmMessageTypes.ts +++ b/src/vs/platform/void/common/llmMessageTypes.ts @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information. *--------------------------------------------------------------------------------------*/ -import { ProviderName, SettingsOfProvider } from './voidSettingsTypes.js' +import { FeatureName, ProviderName, SettingsOfProvider } from './voidSettingsTypes.js' export const errorDetails = (fullError: Error | null): string | null => { @@ -54,7 +54,7 @@ export type ServiceSendLLMMessageParams = { onFinalMessage: OnFinalMessage; onError: OnError; logging: { loggingName: string, }; - useProviderFor: 'Ctrl+K' | 'Ctrl+L' | 'Autocomplete'; + useProviderFor: FeatureName; } & SendLLMType // params to the true sendLLMMessage function diff --git a/src/vs/platform/void/electron-main/llmMessage/openai.ts b/src/vs/platform/void/electron-main/llmMessage/openai.ts index 5160fa02..5695cd06 100644 --- a/src/vs/platform/void/electron-main/llmMessage/openai.ts +++ b/src/vs/platform/void/electron-main/llmMessage/openai.ts @@ -79,7 +79,9 @@ export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText, } else if (providerName === 'openAICompatible') { const thisConfig = settingsOfProvider.openAICompatible - openai = new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true }) + openai = new OpenAI({ + baseURL: thisConfig.endpoint, apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true + }) options = { model: modelName, messages: messages, stream: true, /*max_completion_tokens: parseMaxTokensStr(thisConfig.maxTokens)*/ } } else { diff --git a/src/vs/workbench/contrib/void/browser/autocompleteService.ts b/src/vs/workbench/contrib/void/browser/autocompleteService.ts index 612d3d78..6eab4c3f 100644 --- a/src/vs/workbench/contrib/void/browser/autocompleteService.ts +++ b/src/vs/workbench/contrib/void/browser/autocompleteService.ts @@ -797,6 +797,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ suffix: llmSuffix, stopTokens: stopTokens, }, + useProviderFor: 'Autocomplete', logging: { loggingName: 'Autocomplete' }, onText: async ({ fullText, newText }) => { @@ -840,7 +841,6 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ newAutocompletion.status = 'error' reject(message) }, - useProviderFor: 'Autocomplete', }) newAutocompletion.requestId = requestId diff --git a/src/vs/workbench/contrib/void/browser/chatThreadService.ts b/src/vs/workbench/contrib/void/browser/chatThreadService.ts index 468708b3..588c91ca 100644 --- a/src/vs/workbench/contrib/void/browser/chatThreadService.ts +++ b/src/vs/workbench/contrib/void/browser/chatThreadService.ts @@ -204,6 +204,7 @@ class ChatThreadService extends Disposable implements IChatThreadService { const llmCancelToken = this._llmMessageService.sendLLMMessage({ type: 'sendLLMMessage', logging: { loggingName: 'Chat' }, + useProviderFor: 'Ctrl+L', messages: [ { role: 'system', content: chat_systemMessage }, ...this.getCurrentThread().messages.map(m => ({ role: m.role, content: m.content || '(null)' })), @@ -217,7 +218,6 @@ class ChatThreadService extends Disposable implements IChatThreadService { onError: (error) => { this.finishStreaming(threadId, this.streamState[threadId]?.messageSoFar ?? '', error) }, - useProviderFor: 'Ctrl+L', }) if (llmCancelToken === null) return diff --git a/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts index b7d43a6d..618db611 100644 --- a/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts +++ b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts @@ -1368,7 +1368,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService { streamRequestIdRef.current = this._llmMessageService.sendLLMMessage({ type: 'sendLLMMessage', - useProviderFor: featureName, + useProviderFor: opts.featureName === 'Ctrl+L' ? 'FastApply' : 'Ctrl+K', logging: { loggingName: `startApplying - ${featureName}` }, messages, onText: ({ newText: newText_ }) => {