Added display of more extended error messages

chat-ui/src/lib/components/OpenWebSearchResults.svelte

@@ -13,7 +13,9 @@
 
 	let detailsOpen: boolean;
 	let error: boolean;
+	let errorMessage: string;
 	$: error = webSearchMessages[webSearchMessages.length - 1]?.messageType === "error";
+	$: errorMessage = webSearchMessages[webSearchMessages.length - 1]?.messageType === "error" ? webSearchMessages[webSearchMessages.length - 1].message : "";
 </script>
 
 <details
@@ -30,8 +32,12 @@
 		{:else}
 			<CarbonCheckmark class="my-auto text-gray-500" />
 		{/if}
-		<span class="px-2 font-medium" class:text-red-700={error} class:dark:text-red-500={error}
-			>Поиск в интернете
+		<span class="px-2 font-medium" class:text-red-700={error} class:dark:text-red-500={error}>
+			{#if error}
+			{ errorMessage ? errorMessage : "Произошла ошибка при поиске. Кликните сюда для просмотра лога." }
+			{:else}
+			Поиск в интернете
+			{/if}
 		</span>
 		<div class="my-auto transition-all" class:rotate-90={detailsOpen}>
 			<CarbonCaretRight />

chat-ui/src/lib/server/websearch/runWebSearch.ts

@@ -65,88 +65,101 @@ export async function runWebSearch(
 
 		webSearch.results = webSearch.results
 			.filter(({ link }) => !link.includes("youtube.com") && !link.includes(".pdf")); // filter out youtube links
-			//slice(0, Number(MAX_N_PAGES_SCRAPE)); // limit to first 10 links only
+		//slice(0, Number(MAX_N_PAGES_SCRAPE)); // limit to first 10 links only
 
 		// let paragraphChunks: { source: WebSearchSource; text: string }[] = [];
 
-		let texts : {source: any, text: string}[] = [];
+		let texts: { source: any, text: string }[] = [];
 		if (webSearch.results.length > 0) {
 			appendUpdate("Обработка результатов");
 			//let fullText = '';
-			for(const i in webSearch.results) {
-				if(texts.length > 30) break;
+			for (const i in webSearch.results) {
+				if (texts.length > 30) break;
 				const { link, hostname, title } = webSearch.results[i];
 				let text = "";
 				try {
-					if(USE_CUSTOM_PARSER){
-						try{
+					if (USE_CUSTOM_PARSER) {
+						try {
 							text = await parseNalogGovRu(link);
-						}catch(e){
+						} catch (e) {
 							console.log('Custom parser failed. link: ', link)
 							console.log('Custom parser failed. error: ', e)
 							console.log('Starting fallback parser')
 							text = await parseWeb(link);
 							console.log('Fallback returned: ', text)
 						}
-						
-					}else{
+
+					} else {
 						text = await parseWeb(link);
 					}
-					
+
 					appendUpdate("Обработка страницы", [link]);
 				} catch (e) {
 					console.error(`Error parsing webpage "${link}"`, e);
 				}
-				
 
-				
-				if(text.length > 0){
-					texts.push({source: { link: link, hostname: hostname, title: title }, text})
+
+
+				if (text.length > 0) {
+					texts.push({ source: { link: link, hostname: hostname, title: title }, text })
 				}
-					
-				
+
+
 				// fullText += text;
 				// if(fullText.length >= Number(SAIGA_TRUNCATE_WEB_CONTEXT)){
 				// 	break;
 				// }
-				
+
 				// texts.push(...chunk(text, CHUNK_CAR_LEN).slice(0, MAX_N_CHUNKS));
 			}
 		} else {
 			appendUpdate("Поиск не вернул релевантных результатов");
 			appendUpdate("Генерируем ответ на основе данных нейросети");
-			//throw new Error("No results found for this search query");
-		}		
+			appendUpdate("По вашему запросу ничего не найдено.", [], "error");
+			throw new Error("По вашему запросу ничего не найдено.");
+		}
 
-		if(texts && texts.length > 0){
+		if (texts && texts.length > 0) {
 			appendUpdate("Получение релевантной информации");
 			console.log('webSearch.contextSources', webSearch.contextSources)
-			
-			const allIndices = await findSimilarSentences(prompt, texts.map((t) => t.text));//, { topK: topKClosestParagraphs});
-			
-			console.log('similarity check result:', allIndices);
-			const indices = allIndices.filter((r) => r.score >= Number(SIMILARITY_THRESHOLD))
-				.sort((a, b) => b.score - a.score)
-				.slice(0, Number(MAX_N_PAGES_SCRAPE));
-			
-			let fullText = ''; 
-			for(const i in indices){
-				const text = texts[indices[i].i];
-				if(fullText.length >= Number(SAIGA_TRUNCATE_WEB_CONTEXT)){
-					break;
-				}
 
-				fullText += text.text + "\n";
-				webSearch.contextSources.push(text.source);
+			try {
+				const allIndices = await findSimilarSentences(prompt, texts.map((t) => t.text));//, { topK: topKClosestParagraphs});
+
+
+				console.log('similarity check result:', allIndices);
+				const indices = allIndices.filter((r) => r.score >= Number(SIMILARITY_THRESHOLD))
+					.sort((a, b) => b.score - a.score)
+					.slice(0, Number(MAX_N_PAGES_SCRAPE));
+
+				let fullText = '';
+				for (const i in indices) {
+					const text = texts[indices[i].i];
+					if (fullText.length >= Number(SAIGA_TRUNCATE_WEB_CONTEXT)) {
+						break;
+					}
+
+					fullText += text.text + "\n";
+					webSearch.contextSources.push(text.source);
+				}
+				webSearch.context = fullText.slice(0, Number(SAIGA_TRUNCATE_WEB_CONTEXT));
+				console.log('web search context:', webSearch.context);
+				updatePad({
+					type: "webSearch",
+					messageType: "sources",
+					message: "sources",
+					sources: webSearch.contextSources,
+				});
+			} catch (e) {
+				if (e instanceof Error) {
+					appendUpdate(
+						e.message,
+						[],
+						"error"
+					);
+				}
+				throw e;
 			}
-			webSearch.context = fullText.slice(0, Number(SAIGA_TRUNCATE_WEB_CONTEXT));
-			console.log('web search context:', webSearch.context);
-			updatePad({
-				type: "webSearch",
-				messageType: "sources",
-				message: "sources",
-				sources: webSearch.contextSources,
-			});
 
 			// webSearch.contextSources = [
 			// 	{
@@ -165,13 +178,13 @@ export async function runWebSearch(
 			// 	  title: 'Как получить ИНН через электронные сервисы ФНС'
 			// 	}
 			//   ];
-			
+
 
 			// webSearch.context = texts.map((t) => t.text)
 			// 	.join("\n")
 			// 	.slice(0, Number(SAIGA_TRUNCATE_WEB_CONTEXT));
-			
-			
+
+
 
 			// updatePad({
 			// 	type: "webSearch",
@@ -179,7 +192,7 @@ export async function runWebSearch(
 			// 	message: "sources",
 			// 	sources: [],
 			// });
-			
+
 			// const usedSources = new Set<string>();
 			// for (const idx of indices) {
 			// 	const { source } = texts[idx.i];
@@ -199,18 +212,20 @@ export async function runWebSearch(
 		console.log('searchError', searchError)
 		if (searchError instanceof Error) {
 			appendUpdate(
-				"Произошла ошибка",
-				[JSON.stringify(searchError.message)],
+				searchError.message,
+				[],
 				"error"
 			);
 		}
+
+		throw searchError;
 	}
 
 	return webSearch;
 }
 
 
-async function findSimilarSentences(query: string, sentences: string[]): Promise<{i: number, score: number}[]> {
+async function findSimilarSentences(query: string, sentences: string[]): Promise<{ i: number, score: number }[]> {
 	const requestOptions = {
 		method: 'POST',
 		headers: {
@@ -246,5 +261,5 @@ async function findSimilarSentences(query: string, sentences: string[]): Promise
 		}
 	}
 
-	throw new Error(`Max retries (${maxRetries}) exceeded.`);
+	throw new Error(`Сервер генератора контекста недоступен.`);
 }

chat-ui/src/routes/conversation/[id]/+server.ts

@@ -159,11 +159,6 @@ export async function POST({ request, fetch, locals, params, getClientAddress })
 		const stream = new ReadableStream({
 			async start(controller) {
 				console.log('conversation start')
-				console.log({
-					'api_dev_key': PASTEBIN_DEV_KEY,
-					'api_user_name': PASTEBIN_USERNAME,
-					'api_user_password': PASTEBIN_PASSWORD,
-				})
 				// fetch the endpoint
 				const randomEndpoint = modelEndpoint(model);
 
@@ -189,8 +184,19 @@ export async function POST({ request, fetch, locals, params, getClientAddress })
 				let webSearchResults: WebSearch | undefined;
 
 				if (webSearch) {
-					webSearchResults = await runWebSearch(conv, newPrompt, update);
-					logEntry.websearch = webSearchResults;
+					try{
+						webSearchResults = await runWebSearch(conv, newPrompt, update);
+						logEntry.websearch = webSearchResults;
+					} catch (error) {
+						console.log('Error in search subsystem:', error);
+						logEntry.error = error;
+						update({
+							type: "finalAnswer",
+							text: '',
+						});
+					} finally {
+						Log(logEntry);
+					}
 				}
 
 
@@ -348,6 +354,7 @@ export async function POST({ request, fetch, locals, params, getClientAddress })
 
 				} catch (error) {
 					console.log('Error fetching data from Flask API:', error);
+					logEntry.error = error;
 					update({
 						type: "finalAnswer",
 						text: '',