Merge pull request #915 from open-webui/dev

fix: continue generation

src/lib/components/chat/Messages.svelte

@@ -281,52 +281,6 @@
 									{showNextMessage}
 									{copyToClipboard}
 								/>
-
-								{#if messages.length - 1 === messageIdx && processing !== ''}
-									<div class="flex my-2.5 ml-12 items-center w-fit space-x-2.5">
-										<div class=" dark:text-blue-100">
-											<svg
-												class=" w-4 h-4 translate-y-[0.5px]"
-												fill="currentColor"
-												viewBox="0 0 24 24"
-												xmlns="http://www.w3.org/2000/svg"
-												><style>
-													.spinner_qM83 {
-														animation: spinner_8HQG 1.05s infinite;
-													}
-													.spinner_oXPr {
-														animation-delay: 0.1s;
-													}
-													.spinner_ZTLf {
-														animation-delay: 0.2s;
-													}
-													@keyframes spinner_8HQG {
-														0%,
-														57.14% {
-															animation-timing-function: cubic-bezier(0.33, 0.66, 0.66, 1);
-															transform: translate(0);
-														}
-														28.57% {
-															animation-timing-function: cubic-bezier(0.33, 0, 0.66, 0.33);
-															transform: translateY(-6px);
-														}
-														100% {
-															transform: translate(0);
-														}
-													}
-												</style><circle class="spinner_qM83" cx="4" cy="12" r="2.5" /><circle
-													class="spinner_qM83 spinner_oXPr"
-													cx="12"
-													cy="12"
-													r="2.5"
-												/><circle class="spinner_qM83 spinner_ZTLf" cx="20" cy="12" r="2.5" /></svg
-											>
-										</div>
-										<div class=" text-sm font-medium">
-											{processing}
-										</div>
-									</div>
-								{/if}
 							{:else}
 								<ResponseMessage
 									{message}

src/routes/(app)/+page.svelte

@@ -732,25 +732,26 @@
 			responseMessage.done = false;
 			await tick();
 
-			const modelTag = $models.filter((m) => m.name === responseMessage.model).at(0);
+			const model = $models.filter((m) => m.id === responseMessage.model).at(0);
 
-			if (modelTag?.external) {
+			if (model) {
+				if (model?.external) {
 					await sendPromptOpenAI(
-					responseMessage.model,
+						model,
 						history.messages[responseMessage.parentId].content,
 						responseMessage.id,
 						_chatId
 					);
-			} else if (modelTag) {
+				} else
 					await sendPromptOllama(
-					responseMessage.model,
+						model,
 						history.messages[responseMessage.parentId].content,
 						responseMessage.id,
 						_chatId
 					);
-			} else {
-				toast.error(`Model ${model} not found`);
 			}
+		} else {
+			toast.error(`Model ${modelId} not found`);
 		}
 	};
 

src/routes/(app)/c/[id]/+page.svelte

@@ -238,7 +238,6 @@
 			await sendPrompt(userPrompt, userMessageId);
 		}
 	};
-
 	const sendPrompt = async (prompt, parentId) => {
 		const _chatId = JSON.parse(JSON.stringify($chatId));
 
@@ -292,10 +291,10 @@
 		}
 
 		await Promise.all(
-			selectedModels.map(async (model) => {
+			selectedModels.map(async (modelId) => {
-				console.log(model);
+				const model = $models.filter((m) => m.id === modelId).at(0);
-				const modelTag = $models.filter((m) => m.name === model).at(0);
 
+				if (model) {
 					// Create response message
 					let responseMessageId = uuidv4();
 					let responseMessage = {
@@ -304,7 +303,7 @@
 						childrenIds: [],
 						role: 'assistant',
 						content: '',
-					model: model,
+						model: model.id,
 						timestamp: Math.floor(Date.now() / 1000) // Unix epoch
 					};
 
@@ -320,12 +319,13 @@
 						];
 					}
 
-				if (modelTag?.external) {
+					if (model?.external) {
 						await sendPromptOpenAI(model, prompt, responseMessageId, _chatId);
-				} else if (modelTag) {
+					} else if (model) {
 						await sendPromptOllama(model, prompt, responseMessageId, _chatId);
+					}
 				} else {
-					toast.error(`Model ${model} not found`);
+					toast.error(`Model ${modelId} not found`);
 				}
 			})
 		);
@@ -334,6 +334,7 @@
 	};
 
 	const sendPromptOllama = async (model, userPrompt, responseMessageId, _chatId) => {
+		model = model.id;
 		const responseMessage = history.messages[responseMessageId];
 
 		// Wait until history/message have been updated
@@ -543,11 +544,12 @@
 
 	const sendPromptOpenAI = async (model, userPrompt, responseMessageId, _chatId) => {
 		const responseMessage = history.messages[responseMessageId];
-
 		scrollToBottom();
 
-		const res = await generateOpenAIChatCompletion(localStorage.token, {
+		const res = await generateOpenAIChatCompletion(
-			model: model,
+			localStorage.token,
+			{
+				model: model.id,
 				stream: true,
 				messages: [
 					$settings.system
@@ -593,7 +595,9 @@
 				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
@@ -704,7 +708,6 @@
 			await setChatTitle(_chatId, userPrompt);
 		}
 	};
-
 	const stopResponse = () => {
 		stopResponseFlag = true;
 		console.log('stopResponse');
@@ -719,25 +722,26 @@
 			responseMessage.done = false;
 			await tick();
 
-			const modelTag = $models.filter((m) => m.name === responseMessage.model).at(0);
+			const model = $models.filter((m) => m.id === responseMessage.model).at(0);
 
-			if (modelTag?.external) {
+			if (model) {
+				if (model?.external) {
 					await sendPromptOpenAI(
-					responseMessage.model,
+						model,
 						history.messages[responseMessage.parentId].content,
 						responseMessage.id,
 						_chatId
 					);
-			} else if (modelTag) {
+				} else
 					await sendPromptOllama(
-					responseMessage.model,
+						model,
 						history.messages[responseMessage.parentId].content,
 						responseMessage.id,
 						_chatId
 					);
-			} else {
-				toast.error(`Model ${model} not found`);
 			}
+		} else {
+			toast.error(`Model ${modelId} not found`);
 		}
 	};