forked from open-webui/open-webui
		
	feat: model download from model selector
This commit is contained in:
		
							parent
							
								
									9560f9196d
								
							
						
					
					
						commit
						c19ea89a1d
					
				
					 4 changed files with 367 additions and 32 deletions
				
			
		|  | @ -3,7 +3,7 @@ | ||||||
| 	import { models, showSettings, settings, user } from '$lib/stores'; | 	import { models, showSettings, settings, user } from '$lib/stores'; | ||||||
| 	import { onMount, tick, getContext } from 'svelte'; | 	import { onMount, tick, getContext } from 'svelte'; | ||||||
| 	import { toast } from 'svelte-sonner'; | 	import { toast } from 'svelte-sonner'; | ||||||
| 	import Select from '../common/Select.svelte'; | 	import Selector from './ModelSelector/Selector.svelte'; | ||||||
| 
 | 
 | ||||||
| 	const i18n = getContext('i18n'); | 	const i18n = getContext('i18n'); | ||||||
| 
 | 
 | ||||||
|  | @ -38,7 +38,7 @@ | ||||||
| 		<div class="flex w-full"> | 		<div class="flex w-full"> | ||||||
| 			<div class="overflow-hidden w-full"> | 			<div class="overflow-hidden w-full"> | ||||||
| 				<div class="mr-2 max-w-full"> | 				<div class="mr-2 max-w-full"> | ||||||
| 					<Select | 					<Selector | ||||||
| 						placeholder={$i18n.t('Select a model')} | 						placeholder={$i18n.t('Select a model')} | ||||||
| 						items={$models | 						items={$models | ||||||
| 							.filter((model) => model.name !== 'hr') | 							.filter((model) => model.name !== 'hr') | ||||||
|  |  | ||||||
							
								
								
									
										326
									
								
								src/lib/components/chat/ModelSelector/Selector.svelte
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										326
									
								
								src/lib/components/chat/ModelSelector/Selector.svelte
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,326 @@ | ||||||
|  | <script lang="ts"> | ||||||
|  | 	import { Select } from 'bits-ui'; | ||||||
|  | 
 | ||||||
|  | 	import { flyAndScale } from '$lib/utils/transitions'; | ||||||
|  | 	import { createEventDispatcher, onMount, getContext } from 'svelte'; | ||||||
|  | 
 | ||||||
|  | 	import ChevronDown from '$lib/components/icons/ChevronDown.svelte'; | ||||||
|  | 	import Check from '$lib/components/icons/Check.svelte'; | ||||||
|  | 	import Search from '$lib/components/icons/Search.svelte'; | ||||||
|  | 
 | ||||||
|  | 	import { cancelOllamaRequest, deleteModel, getOllamaVersion, pullModel } from '$lib/apis/ollama'; | ||||||
|  | 
 | ||||||
|  | 	import { user, MODEL_DOWNLOAD_POOL } from '$lib/stores'; | ||||||
|  | 	import { toast } from 'svelte-sonner'; | ||||||
|  | 	import { splitStream } from '$lib/utils'; | ||||||
|  | 	import Tooltip from '$lib/components/common/Tooltip.svelte'; | ||||||
|  | 
 | ||||||
|  | 	const i18n = getContext('i18n'); | ||||||
|  | 	const dispatch = createEventDispatcher(); | ||||||
|  | 
 | ||||||
|  | 	export let value = ''; | ||||||
|  | 	export let placeholder = 'Select a model'; | ||||||
|  | 	export let searchEnabled = true; | ||||||
|  | 	export let searchPlaceholder = 'Search a model'; | ||||||
|  | 
 | ||||||
|  | 	export let items = [{ value: 'mango', label: 'Mango' }]; | ||||||
|  | 
 | ||||||
|  | 	let searchValue = ''; | ||||||
|  | 	let ollamaVersion = null; | ||||||
|  | 
 | ||||||
|  | 	$: filteredItems = searchValue | ||||||
|  | 		? items.filter((item) => item.value.includes(searchValue.toLowerCase())) | ||||||
|  | 		: items; | ||||||
|  | 
 | ||||||
|  | 	const pullModelHandler = async () => { | ||||||
|  | 		const sanitizedModelTag = searchValue.trim(); | ||||||
|  | 
 | ||||||
|  | 		console.log($MODEL_DOWNLOAD_POOL); | ||||||
|  | 		if ($MODEL_DOWNLOAD_POOL[sanitizedModelTag]) { | ||||||
|  | 			toast.error( | ||||||
|  | 				$i18n.t(`Model '{{modelTag}}' is already in queue for downloading.`, { | ||||||
|  | 					modelTag: sanitizedModelTag | ||||||
|  | 				}) | ||||||
|  | 			); | ||||||
|  | 			return; | ||||||
|  | 		} | ||||||
|  | 		if (Object.keys($MODEL_DOWNLOAD_POOL).length === 3) { | ||||||
|  | 			toast.error( | ||||||
|  | 				$i18n.t('Maximum of 3 models can be downloaded simultaneously. Please try again later.') | ||||||
|  | 			); | ||||||
|  | 			return; | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		const res = await pullModel(localStorage.token, sanitizedModelTag, '0').catch((error) => { | ||||||
|  | 			toast.error(error); | ||||||
|  | 			return null; | ||||||
|  | 		}); | ||||||
|  | 
 | ||||||
|  | 		if (res) { | ||||||
|  | 			const reader = res.body | ||||||
|  | 				.pipeThrough(new TextDecoderStream()) | ||||||
|  | 				.pipeThrough(splitStream('\n')) | ||||||
|  | 				.getReader(); | ||||||
|  | 
 | ||||||
|  | 			while (true) { | ||||||
|  | 				try { | ||||||
|  | 					const { value, done } = await reader.read(); | ||||||
|  | 					if (done) break; | ||||||
|  | 
 | ||||||
|  | 					let lines = value.split('\n'); | ||||||
|  | 
 | ||||||
|  | 					for (const line of lines) { | ||||||
|  | 						if (line !== '') { | ||||||
|  | 							let data = JSON.parse(line); | ||||||
|  | 							console.log(data); | ||||||
|  | 							if (data.error) { | ||||||
|  | 								throw data.error; | ||||||
|  | 							} | ||||||
|  | 							if (data.detail) { | ||||||
|  | 								throw data.detail; | ||||||
|  | 							} | ||||||
|  | 
 | ||||||
|  | 							if (data.id) { | ||||||
|  | 								MODEL_DOWNLOAD_POOL.set({ | ||||||
|  | 									...$MODEL_DOWNLOAD_POOL, | ||||||
|  | 									[sanitizedModelTag]: { | ||||||
|  | 										...$MODEL_DOWNLOAD_POOL[sanitizedModelTag], | ||||||
|  | 										requestId: data.id, | ||||||
|  | 										reader, | ||||||
|  | 										done: false | ||||||
|  | 									} | ||||||
|  | 								}); | ||||||
|  | 								console.log(data); | ||||||
|  | 							} | ||||||
|  | 
 | ||||||
|  | 							if (data.status) { | ||||||
|  | 								if (data.digest) { | ||||||
|  | 									let downloadProgress = 0; | ||||||
|  | 									if (data.completed) { | ||||||
|  | 										downloadProgress = Math.round((data.completed / data.total) * 1000) / 10; | ||||||
|  | 									} else { | ||||||
|  | 										downloadProgress = 100; | ||||||
|  | 									} | ||||||
|  | 
 | ||||||
|  | 									MODEL_DOWNLOAD_POOL.set({ | ||||||
|  | 										...$MODEL_DOWNLOAD_POOL, | ||||||
|  | 										[sanitizedModelTag]: { | ||||||
|  | 											...$MODEL_DOWNLOAD_POOL[sanitizedModelTag], | ||||||
|  | 											pullProgress: downloadProgress, | ||||||
|  | 											digest: data.digest | ||||||
|  | 										} | ||||||
|  | 									}); | ||||||
|  | 								} else { | ||||||
|  | 									toast.success(data.status); | ||||||
|  | 
 | ||||||
|  | 									MODEL_DOWNLOAD_POOL.set({ | ||||||
|  | 										...$MODEL_DOWNLOAD_POOL, | ||||||
|  | 										[sanitizedModelTag]: { | ||||||
|  | 											...$MODEL_DOWNLOAD_POOL[sanitizedModelTag], | ||||||
|  | 											done: data.status === 'success' | ||||||
|  | 										} | ||||||
|  | 									}); | ||||||
|  | 								} | ||||||
|  | 							} | ||||||
|  | 						} | ||||||
|  | 					} | ||||||
|  | 				} catch (error) { | ||||||
|  | 					console.log(error); | ||||||
|  | 					if (typeof error !== 'string') { | ||||||
|  | 						error = error.message; | ||||||
|  | 					} | ||||||
|  | 
 | ||||||
|  | 					toast.error(error); | ||||||
|  | 					// opts.callback({ success: false, error, modelName: opts.modelName }); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			if ($MODEL_DOWNLOAD_POOL[sanitizedModelTag].done) { | ||||||
|  | 				toast.success( | ||||||
|  | 					$i18n.t(`Model '{{modelName}}' has been successfully downloaded.`, { | ||||||
|  | 						modelName: sanitizedModelTag | ||||||
|  | 					}) | ||||||
|  | 				); | ||||||
|  | 			} else { | ||||||
|  | 				toast.error('Download canceled'); | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			delete $MODEL_DOWNLOAD_POOL[sanitizedModelTag]; | ||||||
|  | 
 | ||||||
|  | 			MODEL_DOWNLOAD_POOL.set({ | ||||||
|  | 				...$MODEL_DOWNLOAD_POOL | ||||||
|  | 			}); | ||||||
|  | 		} | ||||||
|  | 	}; | ||||||
|  | 
 | ||||||
|  | 	onMount(async () => { | ||||||
|  | 		ollamaVersion = await getOllamaVersion(localStorage.token).catch((error) => false); | ||||||
|  | 	}); | ||||||
|  | 
 | ||||||
|  | 	const cancelModelPullHandler = async (model: string) => { | ||||||
|  | 		const { reader, requestId } = $MODEL_DOWNLOAD_POOL[model]; | ||||||
|  | 		if (reader) { | ||||||
|  | 			await reader.cancel(); | ||||||
|  | 
 | ||||||
|  | 			await cancelOllamaRequest(localStorage.token, requestId); | ||||||
|  | 			delete $MODEL_DOWNLOAD_POOL[model]; | ||||||
|  | 			MODEL_DOWNLOAD_POOL.set({ | ||||||
|  | 				...$MODEL_DOWNLOAD_POOL | ||||||
|  | 			}); | ||||||
|  | 			await deleteModel(localStorage.token, model); | ||||||
|  | 			toast.success(`${model} download has been canceled`); | ||||||
|  | 		} | ||||||
|  | 	}; | ||||||
|  | </script> | ||||||
|  | 
 | ||||||
|  | <Select.Root | ||||||
|  | 	{items} | ||||||
|  | 	onOpenChange={() => { | ||||||
|  | 		searchValue = ''; | ||||||
|  | 	}} | ||||||
|  | 	selected={items.find((item) => item.value === value)} | ||||||
|  | 	onSelectedChange={(selectedItem) => { | ||||||
|  | 		value = selectedItem.value; | ||||||
|  | 	}} | ||||||
|  | > | ||||||
|  | 	<Select.Trigger class="relative w-full" aria-label={placeholder}> | ||||||
|  | 		<Select.Value | ||||||
|  | 			class="inline-flex h-input px-0.5 w-full outline-none bg-transparent truncate text-lg font-semibold placeholder-gray-400  focus:outline-none" | ||||||
|  | 			{placeholder} | ||||||
|  | 		/> | ||||||
|  | 		<ChevronDown className="absolute end-2 top-1/2 -translate-y-[45%] size-3.5" strokeWidth="2.5" /> | ||||||
|  | 	</Select.Trigger> | ||||||
|  | 	<Select.Content | ||||||
|  | 		class="w-full rounded-lg  bg-white dark:bg-gray-900 dark:text-white shadow-lg border border-gray-300/30 dark:border-gray-700/50  outline-none" | ||||||
|  | 		transition={flyAndScale} | ||||||
|  | 		sideOffset={4} | ||||||
|  | 	> | ||||||
|  | 		<slot> | ||||||
|  | 			{#if searchEnabled} | ||||||
|  | 				<div class="flex items-center gap-2.5 px-5 mt-3.5 mb-3"> | ||||||
|  | 					<Search className="size-4" strokeWidth="2.5" /> | ||||||
|  | 
 | ||||||
|  | 					<input | ||||||
|  | 						bind:value={searchValue} | ||||||
|  | 						class="w-full text-sm bg-transparent outline-none" | ||||||
|  | 						placeholder={searchPlaceholder} | ||||||
|  | 					/> | ||||||
|  | 				</div> | ||||||
|  | 
 | ||||||
|  | 				<hr class="border-gray-100 dark:border-gray-800" /> | ||||||
|  | 			{/if} | ||||||
|  | 
 | ||||||
|  | 			<div class="px-3 my-2 max-h-80 overflow-y-auto"> | ||||||
|  | 				{#each filteredItems as item} | ||||||
|  | 					<Select.Item | ||||||
|  | 						class="flex w-full font-medium line-clamp-1 select-none items-center rounded-button py-2 pl-3 pr-1.5 text-sm  text-gray-700 dark:text-gray-100  outline-none transition-all duration-75 hover:bg-gray-100 dark:hover:bg-gray-850 rounded-lg cursor-pointer data-[highlighted]:bg-muted" | ||||||
|  | 						value={item.value} | ||||||
|  | 						label={item.label} | ||||||
|  | 					> | ||||||
|  | 						{item.label} | ||||||
|  | 
 | ||||||
|  | 						{#if value === item.value} | ||||||
|  | 							<div class="ml-auto"> | ||||||
|  | 								<Check /> | ||||||
|  | 							</div> | ||||||
|  | 						{/if} | ||||||
|  | 					</Select.Item> | ||||||
|  | 				{:else} | ||||||
|  | 					<div> | ||||||
|  | 						<div class="block px-3 py-2 text-sm text-gray-700 dark:text-gray-100"> | ||||||
|  | 							No results found | ||||||
|  | 						</div> | ||||||
|  | 					</div> | ||||||
|  | 				{/each} | ||||||
|  | 
 | ||||||
|  | 				{#each Object.keys($MODEL_DOWNLOAD_POOL) as model} | ||||||
|  | 					<div | ||||||
|  | 						class="flex w-full justify-between font-medium select-none rounded-button py-2 pl-3 pr-1.5 text-sm text-gray-700 dark:text-gray-100 outline-none transition-all duration-75 rounded-lg cursor-pointer data-[highlighted]:bg-muted" | ||||||
|  | 					> | ||||||
|  | 						<div class="flex"> | ||||||
|  | 							<div class="-ml-2 mr-2.5 translate-y-0.5"> | ||||||
|  | 								<svg | ||||||
|  | 									class="size-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> | ||||||
|  | 
 | ||||||
|  | 							<div class="flex flex-col self-start"> | ||||||
|  | 								<div class="line-clamp-1"> | ||||||
|  | 									Downloading "{model}" {'pullProgress' in $MODEL_DOWNLOAD_POOL[model] | ||||||
|  | 										? `(${$MODEL_DOWNLOAD_POOL[model].pullProgress}%)` | ||||||
|  | 										: ''} | ||||||
|  | 								</div> | ||||||
|  | 
 | ||||||
|  | 								{#if 'digest' in $MODEL_DOWNLOAD_POOL[model] && $MODEL_DOWNLOAD_POOL[model].digest} | ||||||
|  | 									<div class="-mt-1 h-fit text-[0.7rem] dark:text-gray-500 line-clamp-1"> | ||||||
|  | 										{$MODEL_DOWNLOAD_POOL[model].digest} | ||||||
|  | 									</div> | ||||||
|  | 								{/if} | ||||||
|  | 							</div> | ||||||
|  | 						</div> | ||||||
|  | 
 | ||||||
|  | 						<div class="mr-3 translate-y-0.5"> | ||||||
|  | 							<Tooltip content="Cancel"> | ||||||
|  | 								<button | ||||||
|  | 									class="text-gray-800 dark:text-gray-100" | ||||||
|  | 									on:click={() => { | ||||||
|  | 										cancelModelPullHandler(model); | ||||||
|  | 									}} | ||||||
|  | 								> | ||||||
|  | 									<svg | ||||||
|  | 										class="w-4 h-4 text-gray-800 dark:text-white" | ||||||
|  | 										aria-hidden="true" | ||||||
|  | 										xmlns="http://www.w3.org/2000/svg" | ||||||
|  | 										width="24" | ||||||
|  | 										height="24" | ||||||
|  | 										fill="currentColor" | ||||||
|  | 										viewBox="0 0 24 24" | ||||||
|  | 									> | ||||||
|  | 										<path | ||||||
|  | 											stroke="currentColor" | ||||||
|  | 											stroke-linecap="round" | ||||||
|  | 											stroke-linejoin="round" | ||||||
|  | 											stroke-width="2" | ||||||
|  | 											d="M6 18 17.94 6M18 18 6.06 6" | ||||||
|  | 										/> | ||||||
|  | 									</svg> | ||||||
|  | 								</button> | ||||||
|  | 							</Tooltip> | ||||||
|  | 						</div> | ||||||
|  | 					</div> | ||||||
|  | 				{/each} | ||||||
|  | 
 | ||||||
|  | 				{#if !(searchValue.trim() in $MODEL_DOWNLOAD_POOL) && searchValue && ollamaVersion && $user.role === 'admin'} | ||||||
|  | 					<button | ||||||
|  | 						class="flex w-full font-medium line-clamp-1 select-none items-center rounded-button py-2 pl-3 pr-1.5 text-sm text-gray-700 dark:text-gray-100 outline-none transition-all duration-75 hover:bg-gray-100 dark:hover:bg-gray-850 rounded-lg cursor-pointer data-[highlighted]:bg-muted" | ||||||
|  | 						on:click={() => { | ||||||
|  | 							pullModelHandler(); | ||||||
|  | 						}} | ||||||
|  | 					> | ||||||
|  | 						Pull "{searchValue}" from Ollama.com | ||||||
|  | 					</button> | ||||||
|  | 				{/if} | ||||||
|  | 			</div> | ||||||
|  | 		</slot> | ||||||
|  | 	</Select.Content> | ||||||
|  | </Select.Root> | ||||||
|  | @ -12,6 +12,9 @@ | ||||||
| 
 | 
 | ||||||
| 	export let value = ''; | 	export let value = ''; | ||||||
| 	export let placeholder = 'Select a model'; | 	export let placeholder = 'Select a model'; | ||||||
|  | 	export let searchEnabled = true; | ||||||
|  | 	export let searchPlaceholder = 'Search a model'; | ||||||
|  | 
 | ||||||
| 	export let items = [ | 	export let items = [ | ||||||
| 		{ value: 'mango', label: 'Mango' }, | 		{ value: 'mango', label: 'Mango' }, | ||||||
| 		{ value: 'watermelon', label: 'Watermelon' }, | 		{ value: 'watermelon', label: 'Watermelon' }, | ||||||
|  | @ -49,22 +52,25 @@ | ||||||
| 		transition={flyAndScale} | 		transition={flyAndScale} | ||||||
| 		sideOffset={4} | 		sideOffset={4} | ||||||
| 	> | 	> | ||||||
|  | 		<slot> | ||||||
|  | 			{#if searchEnabled} | ||||||
| 				<div class="flex items-center gap-2.5 px-5 mt-3.5 mb-3"> | 				<div class="flex items-center gap-2.5 px-5 mt-3.5 mb-3"> | ||||||
| 					<Search className="size-4" strokeWidth="2.5" /> | 					<Search className="size-4" strokeWidth="2.5" /> | ||||||
| 
 | 
 | ||||||
| 					<input | 					<input | ||||||
| 						bind:value={searchValue} | 						bind:value={searchValue} | ||||||
| 						class="w-full text-sm bg-transparent outline-none" | 						class="w-full text-sm bg-transparent outline-none" | ||||||
| 				placeholder="Search a model" | 						placeholder={searchPlaceholder} | ||||||
| 					/> | 					/> | ||||||
| 				</div> | 				</div> | ||||||
| 
 | 
 | ||||||
| 				<hr class="border-gray-100 dark:border-gray-800" /> | 				<hr class="border-gray-100 dark:border-gray-800" /> | ||||||
|  | 			{/if} | ||||||
| 
 | 
 | ||||||
| 			<div class="px-3 my-2 max-h-80 overflow-y-auto"> | 			<div class="px-3 my-2 max-h-80 overflow-y-auto"> | ||||||
| 				{#each filteredItems as item} | 				{#each filteredItems as item} | ||||||
| 					<Select.Item | 					<Select.Item | ||||||
| 					class="flex w-full font-medium line-clamp-1 select-none items-center rounded-button py-2 pl-3 pr-1.5 text-sm  text-gray-700 dark:text-gray-100  outline-none transition-all duration-75 data-[highlighted]:bg-muted" | 						class="flex w-full font-medium line-clamp-1 select-none items-center rounded-button py-2 pl-3 pr-1.5 text-sm  text-gray-700 dark:text-gray-100  outline-none transition-all duration-75 hover:bg-gray-100 dark:hover:bg-gray-850 rounded-lg cursor-pointer data-[highlighted]:bg-muted" | ||||||
| 						value={item.value} | 						value={item.value} | ||||||
| 						label={item.label} | 						label={item.label} | ||||||
| 					> | 					> | ||||||
|  | @ -77,11 +83,13 @@ | ||||||
| 						{/if} | 						{/if} | ||||||
| 					</Select.Item> | 					</Select.Item> | ||||||
| 				{:else} | 				{:else} | ||||||
| 				<span class="block px-5 py-2 text-sm text-gray-700 dark:text-gray-100"> | 					<div> | ||||||
|  | 						<div class="block px-5 py-2 text-sm text-gray-700 dark:text-gray-100"> | ||||||
| 							No results found | 							No results found | ||||||
| 				</span> | 						</div> | ||||||
|  | 					</div> | ||||||
| 				{/each} | 				{/each} | ||||||
| 			</div> | 			</div> | ||||||
|  | 		</slot> | ||||||
| 	</Select.Content> | 	</Select.Content> | ||||||
| 	<Select.Input name="favoriteFruit" /> |  | ||||||
| </Select.Root> | </Select.Root> | ||||||
|  | @ -7,8 +7,9 @@ export const config = writable(undefined); | ||||||
| export const user = writable(undefined); | export const user = writable(undefined); | ||||||
| 
 | 
 | ||||||
| // Frontend
 | // Frontend
 | ||||||
| export const theme = writable('system'); | export const MODEL_DOWNLOAD_POOL = writable({}); | ||||||
| 
 | 
 | ||||||
|  | export const theme = writable('system'); | ||||||
| export const chatId = writable(''); | export const chatId = writable(''); | ||||||
| 
 | 
 | ||||||
| export const chats = writable([]); | export const chats = writable([]); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Timothy J. Baek
						Timothy J. Baek