forked from open-webui/open-webui
		
	feat: hybrid search
This commit is contained in:
		
							parent
							
								
									f3e5700d49
								
							
						
					
					
						commit
						4e0b32b505
					
				
					 7 changed files with 406 additions and 110 deletions
				
			
		|  | @ -413,3 +413,64 @@ export const updateEmbeddingConfig = async (token: string, payload: EmbeddingMod | |||
| 
 | ||||
| 	return res; | ||||
| }; | ||||
| 
 | ||||
| export const getRerankingConfig = async (token: string) => { | ||||
| 	let error = null; | ||||
| 
 | ||||
| 	const res = await fetch(`${RAG_API_BASE_URL}/reranking`, { | ||||
| 		method: 'GET', | ||||
| 		headers: { | ||||
| 			'Content-Type': 'application/json', | ||||
| 			Authorization: `Bearer ${token}` | ||||
| 		} | ||||
| 	}) | ||||
| 		.then(async (res) => { | ||||
| 			if (!res.ok) throw await res.json(); | ||||
| 			return res.json(); | ||||
| 		}) | ||||
| 		.catch((err) => { | ||||
| 			console.log(err); | ||||
| 			error = err.detail; | ||||
| 			return null; | ||||
| 		}); | ||||
| 
 | ||||
| 	if (error) { | ||||
| 		throw error; | ||||
| 	} | ||||
| 
 | ||||
| 	return res; | ||||
| }; | ||||
| 
 | ||||
| type RerankingModelUpdateForm = { | ||||
| 	reranking_model: string; | ||||
| }; | ||||
| 
 | ||||
| export const updateRerankingConfig = async (token: string, payload: RerankingModelUpdateForm) => { | ||||
| 	let error = null; | ||||
| 
 | ||||
| 	const res = await fetch(`${RAG_API_BASE_URL}/reranking/update`, { | ||||
| 		method: 'POST', | ||||
| 		headers: { | ||||
| 			'Content-Type': 'application/json', | ||||
| 			Authorization: `Bearer ${token}` | ||||
| 		}, | ||||
| 		body: JSON.stringify({ | ||||
| 			...payload | ||||
| 		}) | ||||
| 	}) | ||||
| 		.then(async (res) => { | ||||
| 			if (!res.ok) throw await res.json(); | ||||
| 			return res.json(); | ||||
| 		}) | ||||
| 		.catch((err) => { | ||||
| 			console.log(err); | ||||
| 			error = err.detail; | ||||
| 			return null; | ||||
| 		}); | ||||
| 
 | ||||
| 	if (error) { | ||||
| 		throw error; | ||||
| 	} | ||||
| 
 | ||||
| 	return res; | ||||
| }; | ||||
|  | @ -8,7 +8,9 @@ | |||
| 		updateQuerySettings, | ||||
| 		resetVectorDB, | ||||
| 		getEmbeddingConfig, | ||||
| 		updateEmbeddingConfig | ||||
| 		updateEmbeddingConfig, | ||||
| 		getRerankingConfig, | ||||
| 		updateRerankingConfig | ||||
| 	} from '$lib/apis/rag'; | ||||
| 
 | ||||
| 	import { documents, models } from '$lib/stores'; | ||||
|  | @ -23,11 +25,13 @@ | |||
| 
 | ||||
| 	let scanDirLoading = false; | ||||
| 	let updateEmbeddingModelLoading = false; | ||||
| 	let updateRerankingModelLoading = false; | ||||
| 
 | ||||
| 	let showResetConfirm = false; | ||||
| 
 | ||||
| 	let embeddingEngine = ''; | ||||
| 	let embeddingModel = ''; | ||||
| 	let rerankingModel = ''; | ||||
| 
 | ||||
| 	let OpenAIKey = ''; | ||||
| 	let OpenAIUrl = ''; | ||||
|  | @ -115,6 +119,29 @@ | |||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
| 	const rerankingModelUpdateHandler = async () => { | ||||
| 		console.log('Update reranking model attempt:', rerankingModel); | ||||
| 
 | ||||
| 		updateRerankingModelLoading = true; | ||||
| 		const res = await updateRerankingConfig(localStorage.token, { | ||||
| 			reranking_model: rerankingModel, | ||||
| 		}).catch(async (error) => { | ||||
| 			toast.error(error); | ||||
| 			await setRerankingConfig(); | ||||
| 			return null; | ||||
| 		}); | ||||
| 		updateRerankingModelLoading = false; | ||||
| 
 | ||||
| 		if (res) { | ||||
| 			console.log('rerankingModelUpdateHandler:', res); | ||||
| 			if (res.status === true) { | ||||
| 				toast.success($i18n.t('Reranking model set to "{{reranking_model}}"', res), { | ||||
| 					duration: 1000 * 10 | ||||
| 				}); | ||||
| 			} | ||||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
| 	const submitHandler = async () => { | ||||
| 		const res = await updateRAGConfig(localStorage.token, { | ||||
| 			pdf_extract_images: pdfExtractImages, | ||||
|  | @ -138,6 +165,14 @@ | |||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
| 	const setRerankingConfig = async () => { | ||||
| 		const rerankingConfig = await getRerankingConfig(localStorage.token); | ||||
| 
 | ||||
| 		if (rerankingConfig) { | ||||
| 			rerankingModel = rerankingConfig.reranking_model; | ||||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
| 	onMount(async () => { | ||||
| 		const res = await getRAGConfig(localStorage.token); | ||||
| 
 | ||||
|  | @ -149,6 +184,7 @@ | |||
| 		} | ||||
| 
 | ||||
| 		await setEmbeddingConfig(); | ||||
| 		await setRerankingConfig(); | ||||
| 
 | ||||
| 		querySettings = await getQuerySettings(localStorage.token); | ||||
| 	}); | ||||
|  | @ -349,6 +385,73 @@ | |||
| 
 | ||||
| 				<hr class=" dark:border-gray-700 my-3" /> | ||||
| 
 | ||||
| 				<div class=" "> | ||||
| 					<div class=" mb-2 text-sm font-medium">{$i18n.t('Update Reranking Model')}</div> | ||||
| 
 | ||||
| 					<div class="flex w-full"> | ||||
| 						<div class="flex-1 mr-2"> | ||||
| 							<input | ||||
| 								class="w-full rounded-lg py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-850 outline-none" | ||||
| 								placeholder={$i18n.t('Update reranking model (e.g. {{model}})', { | ||||
| 									model: rerankingModel.slice(-40) | ||||
| 								})} | ||||
| 								bind:value={rerankingModel} | ||||
| 							/> | ||||
| 						</div> | ||||
| 						<button | ||||
| 							class="px-2.5 bg-gray-100 hover:bg-gray-200 text-gray-800 dark:bg-gray-850 dark:hover:bg-gray-800 dark:text-gray-100 rounded-lg transition" | ||||
| 							on:click={() => { | ||||
| 								rerankingModelUpdateHandler(); | ||||
| 							}} | ||||
| 							disabled={updateRerankingModelLoading} | ||||
| 						> | ||||
| 							{#if updateRerankingModelLoading} | ||||
| 								<div class="self-center"> | ||||
| 									<svg | ||||
| 										class=" w-4 h-4" | ||||
| 										viewBox="0 0 24 24" | ||||
| 										fill="currentColor" | ||||
| 										xmlns="http://www.w3.org/2000/svg" | ||||
| 										><style> | ||||
| 											.spinner_ajPY { | ||||
| 												transform-origin: center; | ||||
| 												animation: spinner_AtaB 0.75s infinite linear; | ||||
| 											} | ||||
| 											@keyframes spinner_AtaB { | ||||
| 												100% { | ||||
| 													transform: rotate(360deg); | ||||
| 												} | ||||
| 											} | ||||
| 										</style><path | ||||
| 											d="M12,1A11,11,0,1,0,23,12,11,11,0,0,0,12,1Zm0,19a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z" | ||||
| 											opacity=".25" | ||||
| 										/><path | ||||
| 											d="M10.14,1.16a11,11,0,0,0-9,8.92A1.59,1.59,0,0,0,2.46,12,1.52,1.52,0,0,0,4.11,10.7a8,8,0,0,1,6.66-6.61A1.42,1.42,0,0,0,12,2.69h0A1.57,1.57,0,0,0,10.14,1.16Z" | ||||
| 											class="spinner_ajPY" | ||||
| 										/></svg | ||||
| 									> | ||||
| 								</div> | ||||
| 							{:else} | ||||
| 								<svg | ||||
| 									xmlns="http://www.w3.org/2000/svg" | ||||
| 									viewBox="0 0 16 16" | ||||
| 									fill="currentColor" | ||||
| 									class="w-4 h-4" | ||||
| 								> | ||||
| 									<path | ||||
| 										d="M8.75 2.75a.75.75 0 0 0-1.5 0v5.69L5.03 6.22a.75.75 0 0 0-1.06 1.06l3.5 3.5a.75.75 0 0 0 1.06 0l3.5-3.5a.75.75 0 0 0-1.06-1.06L8.75 8.44V2.75Z" | ||||
| 									/> | ||||
| 									<path | ||||
| 										d="M3.5 9.75a.75.75 0 0 0-1.5 0v1.5A2.75 2.75 0 0 0 4.75 14h6.5A2.75 2.75 0 0 0 14 11.25v-1.5a.75.75 0 0 0-1.5 0v1.5c0 .69-.56 1.25-1.25 1.25h-6.5c-.69 0-1.25-.56-1.25-1.25v-1.5Z" | ||||
| 									/> | ||||
| 								</svg> | ||||
| 							{/if} | ||||
| 						</button> | ||||
| 					</div> | ||||
| 				</div> | ||||
| 
 | ||||
| 				<hr class=" dark:border-gray-700 my-3" /> | ||||
| 
 | ||||
| 				<div class="  flex w-full justify-between"> | ||||
| 					<div class=" self-center text-xs font-medium"> | ||||
| 						{$i18n.t('Scan for documents from {{path}}', { path: '/data/docs' })} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Steven Kreitzer
						Steven Kreitzer