+ $models.map((m) => m.id).includes(modelId) ? modelId : ''
+ );
+
let _settings = JSON.parse(localStorage.getItem('settings') ?? '{}');
settings.set({
..._settings
@@ -150,6 +155,10 @@
const submitPrompt = async (userPrompt, _user = null) => {
console.log('submitPrompt', $chatId);
+ selectedModels = selectedModels.map((modelId) =>
+ $models.map((m) => m.id).includes(modelId) ? modelId : ''
+ );
+
if (selectedModels.includes('')) {
toast.error('Model not selected');
} else if (messages.length != 0 && messages.at(-1).done != true) {
@@ -278,40 +287,41 @@
}
await Promise.all(
- selectedModels.map(async (model) => {
- console.log(model);
- const modelTag = $models.filter((m) => m.name === model).at(0);
+ selectedModels.map(async (modelId) => {
+ const model = $models.filter((m) => m.id === modelId).at(0);
- // Create response message
- let responseMessageId = uuidv4();
- let responseMessage = {
- parentId: parentId,
- id: responseMessageId,
- childrenIds: [],
- role: 'assistant',
- content: '',
- model: model,
- timestamp: Math.floor(Date.now() / 1000) // Unix epoch
- };
+ if (model) {
+ // Create response message
+ let responseMessageId = uuidv4();
+ let responseMessage = {
+ parentId: parentId,
+ id: responseMessageId,
+ childrenIds: [],
+ role: 'assistant',
+ content: '',
+ model: model.id,
+ timestamp: Math.floor(Date.now() / 1000) // Unix epoch
+ };
- // Add message to history and Set currentId to messageId
- history.messages[responseMessageId] = responseMessage;
- history.currentId = responseMessageId;
+ // Add message to history and Set currentId to messageId
+ history.messages[responseMessageId] = responseMessage;
+ history.currentId = responseMessageId;
- // Append messageId to childrenIds of parent message
- if (parentId !== null) {
- history.messages[parentId].childrenIds = [
- ...history.messages[parentId].childrenIds,
- responseMessageId
- ];
- }
+ // Append messageId to childrenIds of parent message
+ if (parentId !== null) {
+ history.messages[parentId].childrenIds = [
+ ...history.messages[parentId].childrenIds,
+ responseMessageId
+ ];
+ }
- if (modelTag?.external) {
- await sendPromptOpenAI(model, prompt, responseMessageId, _chatId);
- } else if (modelTag) {
- await sendPromptOllama(model, prompt, responseMessageId, _chatId);
+ if (model?.external) {
+ await sendPromptOpenAI(model, prompt, responseMessageId, _chatId);
+ } else if (model) {
+ await sendPromptOllama(model, prompt, responseMessageId, _chatId);
+ }
} else {
- toast.error(`Model ${model} not found`);
+ toast.error(`Model ${modelId} not found`);
}
})
);
@@ -320,6 +330,7 @@
};
const sendPromptOllama = async (model, userPrompt, responseMessageId, _chatId) => {
+ model = model.id;
const responseMessage = history.messages[responseMessageId];
// Wait until history/message have been updated
@@ -531,54 +542,58 @@
const responseMessage = history.messages[responseMessageId];
scrollToBottom();
- const res = await generateOpenAIChatCompletion(localStorage.token, {
- model: model,
- stream: true,
- messages: [
- $settings.system
- ? {
- role: 'system',
- content: $settings.system
- }
- : undefined,
- ...messages.filter((message) => !message.deleted)
- ]
- .filter((message) => message)
- .map((message, idx, arr) => ({
- role: message.role,
- ...(message.files?.filter((file) => file.type === 'image').length > 0 ?? false
+ const res = await generateOpenAIChatCompletion(
+ localStorage.token,
+ {
+ model: model.id,
+ stream: true,
+ messages: [
+ $settings.system
? {
- content: [
- {
- type: 'text',
- text:
- arr.length - 1 !== idx
- ? message.content
- : message?.raContent ?? message.content
- },
- ...message.files
- .filter((file) => file.type === 'image')
- .map((file) => ({
- type: 'image_url',
- image_url: {
- url: file.url
- }
- }))
- ]
+ role: 'system',
+ content: $settings.system
}
- : {
- content:
- arr.length - 1 !== idx ? message.content : message?.raContent ?? message.content
- })
- })),
- seed: $settings?.options?.seed ?? undefined,
- stop: $settings?.options?.stop ?? undefined,
- temperature: $settings?.options?.temperature ?? undefined,
- top_p: $settings?.options?.top_p ?? undefined,
- num_ctx: $settings?.options?.num_ctx ?? undefined,
- frequency_penalty: $settings?.options?.repeat_penalty ?? undefined,
- max_tokens: $settings?.options?.num_predict ?? undefined
- });
+ : undefined,
+ ...messages.filter((message) => !message.deleted)
+ ]
+ .filter((message) => message)
+ .map((message, idx, arr) => ({
+ role: message.role,
+ ...(message.files?.filter((file) => file.type === 'image').length > 0 ?? false
+ ? {
+ content: [
+ {
+ type: 'text',
+ text:
+ arr.length - 1 !== idx
+ ? message.content
+ : message?.raContent ?? message.content
+ },
+ ...message.files
+ .filter((file) => file.type === 'image')
+ .map((file) => ({
+ type: 'image_url',
+ image_url: {
+ url: file.url
+ }
+ }))
+ ]
+ }
+ : {
+ content:
+ arr.length - 1 !== idx ? message.content : message?.raContent ?? message.content
+ })
+ })),
+ seed: $settings?.options?.seed ?? undefined,
+ stop: $settings?.options?.stop ?? undefined,
+ temperature: $settings?.options?.temperature ?? undefined,
+ top_p: $settings?.options?.top_p ?? undefined,
+ num_ctx: $settings?.options?.num_ctx ?? undefined,
+ frequency_penalty: $settings?.options?.repeat_penalty ?? undefined,
+ max_tokens: $settings?.options?.num_predict ?? undefined
+ },
+ model.source === 'litellm' ? `${LITELLM_API_BASE_URL}/v1` : `${OPENAI_API_BASE_URL}`
+ );
if (res && res.ok) {
const reader = res.body
diff --git a/test.json b/test.json
new file mode 100644
index 00000000..dccb6b26
--- /dev/null
+++ b/test.json
@@ -0,0 +1,6 @@
+{
+ "model_name": "string",
+ "litellm_params": {
+ "model": "ollama/mistral"
+ }
+}
\ No newline at end of file