main branch conflicts fixed

This commit is contained in:
Jérôme Commaret 2025-03-15 16:07:33 +01:00
parent ec8eb8bded
commit c6d246f783
3 changed files with 5 additions and 99 deletions

View file

@ -132,15 +132,6 @@ const mistralModelOptions = {
supportsTools: 'openai-style',
supportsReasoning: false,
},
'open-codestral-mamba': {
contextWindow: 32_000,
maxOutputTokens: 4_096,
cost: { input: 0.00, output: 0.00 },
supportsFIM: true,
supportsSystemMessage: 'system-role',
supportsTools: 'openai-style',
supportsReasoning: false,
},
'mistral-large-latest': {
contextWindow: 32_000,
maxOutputTokens: 4_096,
@ -209,12 +200,6 @@ const openSourceModelOptions_assumingOAICompat = {
supportsTools: 'openai-style',
supportsReasoning: { canToggleReasoning: false, canIOReasoning: true, openSourceThinkTags: ['<think>', '</think>'] },
},
'mistral-large-latest': {
supportsFIM: false,
supportsSystemMessage: 'system-role',
supportsTools: 'openai-style',
supportsReasoning: false,
},
// FIM only
'starcoder2': {
supportsFIM: true,
@ -222,13 +207,6 @@ const openSourceModelOptions_assumingOAICompat = {
supportsTools: false,
supportsReasoning: false,
},
// Mistral
'codestral-latest': {
supportsFIM: true,
supportsSystemMessage: 'system-role',
supportsTools: 'openai-style',
supportsReasoning: false,
},
'codegemma:2b': {
supportsFIM: true,
supportsSystemMessage: false,
@ -391,26 +369,6 @@ const openAISettings: ProviderSettings = {
}
}
const mistralModelOptions = {
'codestral-latest': {
contextWindow: 32_000,
maxOutputTokens: 4_096,
cost: { input: 0.00, output: 0.00 },
supportsFIM: true,
supportsSystemMessage: 'system-role',
supportsTools: 'openai-style',
supportsReasoning: false,
},
'mistral-large-latest': {
contextWindow: 32_000,
maxOutputTokens: 4_096,
cost: { input: 0.00, output: 0.00 },
supportsFIM: false,
supportsSystemMessage: 'system-role',
supportsTools: 'openai-style',
supportsReasoning: false,
}
} as const satisfies { [s: string]: ModelOptions }
@ -668,7 +626,6 @@ const modelSettingsOfProvider: { [providerName in ProviderName]: ProviderSetting
anthropic: anthropicSettings,
xAI: xAISettings,
gemini: geminiSettings,
mistral: mistralSettings,
// open source models
deepseek: deepseekSettings,
groq: groqSettings,

View file

@ -316,12 +316,6 @@ export const defaultSettingsOfProvider: SettingsOfProvider = {
...modelInfoOfDefaultModelNames(defaultModelsOfProvider.vLLM),
_didFillInProviderSettings: undefined,
},
mistral: { // aggregator
...defaultCustomSettings,
...defaultProviderSettings.mistral,
...modelInfoOfDefaultModelNames(defaultModelsOfProvider.mistral),
_didFillInProviderSettings: undefined,
},
}

View file

@ -153,51 +153,6 @@ const _sendOpenAICompatibleFIM = ({ messages: messages_, onFinalMessage, onError
})
}
const _sendMistralFIM = ({ messages: messages_, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions }: SendFIMParams_Internal) => {
const { modelName, supportsFIM } = getModelCapabilities(providerName, modelName_)
if (!supportsFIM) {
if (modelName === modelName_)
onError({ message: `Model ${modelName} does not support FIM.`, fullError: null })
else
onError({ message: `Model ${modelName_} (${modelName}) does not support FIM.`, fullError: null })
return
}
const messages = prepareFIMMessage({ messages: messages_, aiInstructions })
const mistral = new MistralCore({ apiKey: settingsOfProvider.mistral.apiKey })
// DEBUG : request params
// console.log('🔍 Sending FIM request with params:', {
// model: modelName,
// promptLength: messages.prefix.length,
// suffixLength: messages.suffix.length,
// stream: false,
// maxTokens: messages.maxTokens
//});
fimComplete(
mistral, {
model: modelName,
prompt: messages.prefix,
suffix: messages.suffix,
stream: false,
topP: 1,
maxTokens: messages.maxTokens,
stop: messages.stopTokens
},
)
.then(async response => {
const fullText = response.choices[0]?.text || '';
onFinalMessage({ fullText, });
// console.log('✅ Réponse FIM reçue:', fullText);
})
.catch(error => {
onError({ message: error + '', fullError: error });
})
}
const _sendOpenAICompatibleChat = ({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions, modelSelectionOptions, tools: tools_ }: SendChatParams_Internal) => {
const {
modelName,
@ -512,7 +467,7 @@ const sendOllamaFIM = ({ messages: messages_, onFinalMessage, onError, settingsO
}
//////// MISTRAL ////////
const sendMistralChat = ({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions, modelSelectionOptions }: SendChatParams_Internal) => {
const _sendMistralChat = ({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions, modelSelectionOptions }: SendChatParams_Internal) => {
_sendOpenAICompatibleChat({
messages: messages_,
onText,
@ -527,7 +482,7 @@ const sendMistralChat = ({ messages: messages_, onText, onFinalMessage, onError,
});
}
const sendMistralFIM = ({ messages: messages_, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions, modelSelectionOptions }: SendFIMParams_Internal) => {
const _sendMistralFIM = ({ messages: messages_, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions, modelSelectionOptions }: SendFIMParams_Internal) => {
const { modelName, supportsFIM } = getModelCapabilities(providerName, modelName_)
if (!supportsFIM) {
if (modelName === modelName_)
@ -614,8 +569,8 @@ export const sendLLMMessageToProviderImplementation = {
list: null,
},
mistral: {
sendChat: (params) => sendMistralChat(params),
sendFIM: (params) => sendMistralFIM(params),
sendChat: (params) => _sendMistralChat(params),
sendFIM: (params) => _sendMistralFIM(params),
list: null,
},
} satisfies CallFnOfProvider
} satisfies CallFnOfProvider