diff --git a/src/vs/workbench/contrib/void/browser/editCodeService.ts b/src/vs/workbench/contrib/void/browser/editCodeService.ts index efd70d7e..3f15cc21 100644 --- a/src/vs/workbench/contrib/void/browser/editCodeService.ts +++ b/src/vs/workbench/contrib/void/browser/editCodeService.ts @@ -1315,7 +1315,7 @@ class EditCodeService extends Disposable implements IEditCodeService { const startLine = startRange === 'fullFile' ? 1 : startRange[0] const endLine = startRange === 'fullFile' ? model.getLineCount() : startRange[1] const { prefix, suffix } = voidPrefixAndSuffix({ fullFileStr: originalFileCode, startLine, endLine }) - const userContent = ctrlKStream_userMessage({ selection: originalCode, instructions: instructions, prefix, suffix, isOllamaFIM: false, fimTags: quickEditFIMTags, language }) + const userContent = ctrlKStream_userMessage({ selection: originalCode, instructions: instructions, prefix, suffix, fimTags: quickEditFIMTags, language }) // type: 'messages', messages = [ { role: 'system', content: ctrlKStream_systemMessage({ quickEditFIMTags: quickEditFIMTags }), }, diff --git a/src/vs/workbench/contrib/void/common/modelCapabilities.ts b/src/vs/workbench/contrib/void/common/modelCapabilities.ts index f1009f4f..e3f19254 100644 --- a/src/vs/workbench/contrib/void/common/modelCapabilities.ts +++ b/src/vs/workbench/contrib/void/common/modelCapabilities.ts @@ -39,8 +39,11 @@ export const defaultProviderSettings = { apiKey: '', }, xAI: { - apiKey: '' + apiKey: '', }, + mistral: { + apiKey: '', + } } as const @@ -627,8 +630,8 @@ const mistralModelOptions = { // https://mistral.ai/products/la-plateforme#prici maxOutputTokens: 8_192, cost: { input: 2.00, output: 6.00 }, supportsFIM: false, + downloadable: { sizeGb: 73 }, supportsSystemMessage: 'system-role', - supportsTools: 'openai-style', reasoningCapabilities: false, }, 'codestral-latest': { @@ -636,26 +639,17 @@ const mistralModelOptions = { // https://mistral.ai/products/la-plateforme#prici maxOutputTokens: 8_192, cost: { input: 0.30, output: 0.90 }, supportsFIM: true, + downloadable: { sizeGb: 13 }, supportsSystemMessage: 'system-role', - supportsTools: 'openai-style', reasoningCapabilities: false, }, - 'mistral-saba-latest': { - contextWindow: 32_000, - maxOutputTokens: 8_192, - cost: { input: 0.20, output: 0.60 }, - supportsFIM: true, - supportsSystemMessage: 'system-role', - supportsTools: false, - reasoningCapabilities: false, - }, - 'ministral-8b-latest': { + 'ministral-8b-latest': { // ollama 'mistral' contextWindow: 131_000, maxOutputTokens: 4_096, cost: { input: 0.10, output: 0.10 }, supportsFIM: false, + downloadable: { sizeGb: 4.1 }, supportsSystemMessage: 'system-role', - supportsTools: 'openai-style', reasoningCapabilities: false, }, 'ministral-3b-latest': { @@ -663,13 +657,13 @@ const mistralModelOptions = { // https://mistral.ai/products/la-plateforme#prici maxOutputTokens: 4_096, cost: { input: 0.04, output: 0.04 }, supportsFIM: false, + downloadable: { sizeGb: 'not-known' }, supportsSystemMessage: 'system-role', - supportsTools: 'openai-style', reasoningCapabilities: false, }, -} as const satisfies { [s: string]: ModelOptions } +} as const satisfies { [s: string]: VoidStaticModelInfo } -const mistralSettings: ProviderSettings = { +const mistralSettings: VoidStaticProviderInfo = { modelOptions: mistralModelOptions, modelOptionsFallback: (modelName) => { return null }, } diff --git a/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts b/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts index 232d8c53..551f0987 100644 --- a/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts +++ b/src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts @@ -6,8 +6,8 @@ import Anthropic from '@anthropic-ai/sdk'; import { Ollama } from 'ollama'; import OpenAI, { ClientOptions } from 'openai'; -import { MistralCore } from "@mistralai/mistralai/core.js"; -import { fimComplete } from "@mistralai/mistralai/funcs/fimComplete.js"; +import { MistralCore } from '@mistralai/mistralai/core.js'; +import { fimComplete } from '@mistralai/mistralai/funcs/fimComplete.js'; import { LLMChatMessage, LLMFIMMessage, ModelListParams, OllamaModelResponse, OnError, OnFinalMessage, OnText } from '../../common/sendLLMMessageTypes.js';