From 341e632f557f939abef273f00ff2498be1094720 Mon Sep 17 00:00:00 2001
From: Nathan Sarrazin <sarrazin.nathan@gmail.com>
Date: Fri, 11 Oct 2024 10:44:16 +0200
Subject: [PATCH] fix: upload of files on multimodal assistant on first message
 (#1513)

there was a bug that prevented users from uploading images to assistants before starting a conversation
---
 src/lib/components/chat/ChatIntroduction.svelte | 11 ++---------
 src/lib/components/chat/ChatWindow.svelte       |  1 -
 src/routes/+page.svelte                         |  9 ++++++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/lib/components/chat/ChatIntroduction.svelte b/src/lib/components/chat/ChatIntroduction.svelte
index caa0917aa89..729a21ad3e3 100644
--- a/src/lib/components/chat/ChatIntroduction.svelte
+++ b/src/lib/components/chat/ChatIntroduction.svelte
@@ -6,17 +6,10 @@
 	import AnnouncementBanner from "../AnnouncementBanner.svelte";
 	import type { Model } from "$lib/types/Model";
 	import ModelCardMetadata from "../ModelCardMetadata.svelte";
-	import { findCurrentModel } from "$lib/utils/models";
 	import { base } from "$app/paths";
-	import { useSettingsStore } from "$lib/stores/settings";
 	import JSON5 from "json5";
 
 	export let currentModel: Model;
-	export let models: Model[];
-
-	const settings = useSettingsStore();
-
-	$: currentModelMetadata = findCurrentModel(models, $settings.activeModel);
 
 	const announcementBanners = envPublic.PUBLIC_ANNOUNCEMENT_BANNERS
 		? JSON5.parse(envPublic.PUBLIC_ANNOUNCEMENT_BANNERS)
@@ -79,11 +72,11 @@
 			<ModelCardMetadata variant="dark" model={currentModel} />
 		</div>
 	</div>
-	{#if currentModelMetadata.promptExamples}
+	{#if currentModel.promptExamples}
 		<div class="lg:col-span-3 lg:mt-6">
 			<p class="mb-3 text-gray-600 dark:text-gray-300">Examples</p>
 			<div class="grid gap-3 lg:grid-cols-3 lg:gap-5">
-				{#each currentModelMetadata.promptExamples as example}
+				{#each currentModel.promptExamples as example}
 					<button
 						type="button"
 						class="rounded-xl border bg-gray-50 p-3 text-gray-600 hover:bg-gray-100 dark:border-gray-800 dark:bg-gray-800 dark:text-gray-300 dark:hover:bg-gray-700 max-xl:text-sm xl:p-3.5"
diff --git a/src/lib/components/chat/ChatWindow.svelte b/src/lib/components/chat/ChatWindow.svelte
index 5b42939d4ce..f8d3fc69abb 100644
--- a/src/lib/components/chat/ChatWindow.svelte
+++ b/src/lib/components/chat/ChatWindow.svelte
@@ -303,7 +303,6 @@
 				/>
 			{:else if !assistant}
 				<ChatIntroduction
-					{models}
 					{currentModel}
 					on:message={(ev) => {
 						if ($page.data.loginRequired) {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 0f6c00212c9..32f976d9962 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -78,6 +78,13 @@
 		const query = $page.url.searchParams.get("q");
 		if (query) createConversation(query);
 	});
+
+	$: currentModel = findCurrentModel(
+		[...data.models, ...data.oldModels],
+		!$settings.assistants.includes($settings.activeModel)
+			? $settings.activeModel
+			: data.assistant?.modelId
+	);
 </script>
 
 <svelte:head>
@@ -88,7 +95,7 @@
 	on:message={(ev) => createConversation(ev.detail)}
 	{loading}
 	assistant={data.assistant}
-	currentModel={findCurrentModel([...data.models, ...data.oldModels], $settings.activeModel)}
+	{currentModel}
 	models={data.models}
 	bind:files
 />