Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "b0c0eb7b1f2ac9a983c550ee971cea275463d8fc"
Unverified Commit 89644d4e authored by Timothy Jaeryang Baek's avatar Timothy Jaeryang Baek Committed by GitHub
Browse files

Merge pull request #166 from ollama-webui/dev 

feat: advanced settings refac & num_ctx added
parents 4c4d50f1 a4712989
Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 113 deletions
src/lib/components/chat/SettingsModal.svelte
View file @ 89644d4e
...@@ -26,10 +26,11 @@ ...@@ -26,10 +26,11 @@
// Advanced // Advanced
let requestFormat = ''; let requestFormat = '';
let seed = 0; let seed = 0;
let temperature = 0.8; let temperature = '';
let repeat_penalty = 1.1; let repeat_penalty = '';
let top_k = 40; let top_k = '';
let top_p = 0.9; let top_p = '';
let num_ctx = '';
// Models // Models
let modelTag = ''; let modelTag = '';
...@@ -227,10 +228,11 @@ ...@@ -227,10 +228,11 @@
requestFormat = settings.requestFormat ?? ''; requestFormat = settings.requestFormat ?? '';
seed = settings.seed ?? 0; seed = settings.seed ?? 0;
temperature = settings.temperature ?? 0.8; temperature = settings.temperature ?? '';
repeat_penalty = settings.repeat_penalty ?? 1.1; repeat_penalty = settings.repeat_penalty ?? '';
top_k = settings.top_k ?? 40; top_k = settings.top_k ?? '';
top_p = settings.top_p ?? 0.9; top_p = settings.top_p ?? '';
num_ctx = settings.num_ctx ?? '';
titleAutoGenerate = settings.titleAutoGenerate ?? true; titleAutoGenerate = settings.titleAutoGenerate ?? true;
speechAutoSend = settings.speechAutoSend ?? false; speechAutoSend = settings.speechAutoSend ?? false;
...@@ -612,6 +614,234 @@ ...@@ -612,6 +614,234 @@
{:else if selectedTab === 'advanced'} {:else if selectedTab === 'advanced'}
<div class="flex flex-col h-full justify-between space-y-3 text-sm"> <div class="flex flex-col h-full justify-between space-y-3 text-sm">
<div class=" space-y-3"> <div class=" space-y-3">
<div>
<div class=" py-1 flex w-full justify-between">
<div class=" w-20 text-sm font-medium self-center">Seed</div>
<div class=" flex-1 self-center">
<input
class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none"
type="number"
placeholder="Enter Seed"
bind:value={seed}
autocomplete="off"
min="0"
/>
</div>
</div>
</div>
<div class=" py-0.5 w-full justify-between">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-medium">Temperature</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
temperature = temperature === '' ? 0.8 : '';
}}
>
{#if temperature === ''}
<span class="ml-2 self-center"> Default </span>
{:else}
<span class="ml-2 self-center"> Custom </span>
{/if}
</button>
</div>
{#if temperature !== ''}
<div class="flex mt-0.5 space-x-2">
<div class=" flex-1">
<input
id="steps-range"
type="range"
min="0"
max="1"
bind:value={temperature}
step="0.05"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<input
bind:value={temperature}
type="number"
class=" bg-transparent text-center w-10"
/>
</div>
</div>
{/if}
</div>
<div class=" py-0.5 w-full justify-between">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-medium">Repeat Penalty</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
repeat_penalty = repeat_penalty === '' ? 1.1 : '';
}}
>
{#if repeat_penalty === ''}
<span class="ml-2 self-center"> Default </span>
{:else}
<span class="ml-2 self-center"> Custom </span>
{/if}
</button>
</div>
{#if repeat_penalty !== ''}
<div class="flex mt-0.5 space-x-2">
<div class=" flex-1">
<input
id="steps-range"
type="range"
min="0"
max="2"
bind:value={repeat_penalty}
step="0.05"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<input
bind:value={repeat_penalty}
type="number"
class=" bg-transparent text-center w-10"
/>
</div>
</div>
{/if}
</div>
<div class=" py-0.5 w-full justify-between">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-medium">Top K</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
top_k = top_k === '' ? 40 : '';
}}
>
{#if top_k === ''}
<span class="ml-2 self-center"> Default </span>
{:else}
<span class="ml-2 self-center"> Custom </span>
{/if}
</button>
</div>
{#if top_k !== ''}
<div class="flex mt-0.5 space-x-2">
<div class=" flex-1">
<input
id="steps-range"
type="range"
min="0"
max="100"
bind:value={top_k}
step="0.5"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<input
bind:value={top_k}
type="number"
class=" bg-transparent text-center w-10"
/>
</div>
</div>
{/if}
</div>
<div class=" py-0.5 w-full justify-between">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-medium">Top P</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
top_p = top_p === '' ? 0.9 : '';
}}
>
{#if top_p === ''}
<span class="ml-2 self-center"> Default </span>
{:else}
<span class="ml-2 self-center"> Custom </span>
{/if}
</button>
</div>
{#if top_p !== ''}
<div class="flex mt-0.5 space-x-2">
<div class=" flex-1">
<input
id="steps-range"
type="range"
min="0"
max="1"
bind:value={top_p}
step="0.05"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<input
bind:value={top_p}
type="number"
class=" bg-transparent text-center w-10"
/>
</div>
</div>
{/if}
</div>
<div class=" py-0.5 w-full justify-between">
<div class="flex w-full justify-between">
<div class=" self-center text-sm font-medium">Context Length</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
num_ctx = num_ctx === '' ? 2048 : '';
}}
>
{#if num_ctx === ''}
<span class="ml-2 self-center"> Default </span>
{:else}
<span class="ml-2 self-center"> Custom </span>
{/if}
</button>
</div>
{#if num_ctx !== ''}
<div class="flex mt-0.5 space-x-2">
<div class=" flex-1">
<input
id="steps-range"
type="range"
min="1"
max="16000"
bind:value={num_ctx}
step="1"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<input
bind:value={num_ctx}
type="number"
class=" bg-transparent text-center w-10"
/>
</div>
</div>
{/if}
</div>
<hr class=" dark:border-gray-700" />
<div> <div>
<div class=" py-1 flex w-full justify-between"> <div class=" py-1 flex w-full justify-between">
<div class=" self-center text-sm font-medium">Request Mode</div> <div class=" self-center text-sm font-medium">Request Mode</div>
...@@ -640,110 +870,18 @@ ...@@ -640,110 +870,18 @@
</button> </button>
</div> </div>
</div> </div>
<hr class=" dark:border-gray-700" />
<div>
<div class=" py-1 flex w-full justify-between">
<div class=" w-20 text-sm font-medium self-center">Seed</div>
<div class=" flex-1 self-center">
<input
class="w-full rounded py-2 px-4 text-sm dark:text-gray-300 dark:bg-gray-800 outline-none"
type="number"
placeholder="Enter Seed"
bind:value={seed}
autocomplete="off"
min="0"
/>
</div>
</div>
</div>
<hr class=" dark:border-gray-700" />
<div>
<label for="steps-range" class=" mb-2 text-sm font-medium flex justify-between">
<div>Temperature</div>
<div>
{temperature}
</div></label
>
<input
id="steps-range"
type="range"
min="0"
max="1"
bind:value={temperature}
step="0.05"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<label for="steps-range" class=" mb-2 text-sm font-medium flex justify-between">
<div>Repeat Penalty</div>
<div>
{repeat_penalty}
</div></label
>
<input
id="steps-range"
type="range"
min="0"
max="2"
bind:value={repeat_penalty}
step="0.05"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<label for="steps-range" class=" mb-2 text-sm font-medium flex justify-between">
<div>Top K</div>
<div>
{top_k}
</div></label
>
<input
id="steps-range"
type="range"
min="0"
max="100"
bind:value={top_k}
step="0.5"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
<div>
<label for="steps-range" class=" mb-2 text-sm font-medium flex justify-between">
<div>Top P</div>
<div>
{top_p}
</div></label
>
<input
id="steps-range"
type="range"
min="0"
max="1"
bind:value={top_p}
step="0.05"
class="w-full h-2 rounded-lg appearance-none cursor-pointer dark:bg-gray-700"
/>
</div>
</div> </div>
<div class="flex justify-end pt-3 text-sm font-medium"> <div class="flex justify-end pt-3 text-sm font-medium">
<button <button
class=" px-4 py-2 bg-emerald-600 hover:bg-emerald-700 text-gray-100 transition rounded" class=" px-4 py-2 bg-emerald-600 hover:bg-emerald-700 text-gray-100 transition rounded"
on:click={() => { on:click={() => {
saveSettings({ saveSettings({
seed: (seed !== 0 ? seed : undefined) ?? undefined, seed: (seed !== 0 ? seed : undefined) ?? undefined,
temperature: temperature !== 0.8 ? temperature : undefined, temperature: temperature !== '' ? temperature : undefined,
repeat_penalty: repeat_penalty !== 1.1 ? repeat_penalty : undefined, repeat_penalty: repeat_penalty !== '' ? repeat_penalty : undefined,
top_k: top_k !== 40 ? top_k : undefined, top_k: top_k !== '' ? top_k : undefined,
top_p: top_p !== 0.9 ? top_p : undefined top_p: top_p !== '' ? top_p : undefined,
num_ctx: num_ctx !== '' ? num_ctx : undefined
}); });
show = false; show = false;
}} }}
......
src/routes/(app)/+page.svelte
View file @ 89644d4e
...@@ -125,7 +125,8 @@ ...@@ -125,7 +125,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
format: $settings.requestFormat ?? undefined, format: $settings.requestFormat ?? undefined,
context: context:
...@@ -196,7 +197,8 @@ ...@@ -196,7 +197,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
messages: messages, messages: messages,
history: history history: history
...@@ -264,6 +266,7 @@ ...@@ -264,6 +266,7 @@
.map((message) => ({ role: message.role, content: message.content })), .map((message) => ({ role: message.role, content: message.content })),
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
top_p: $settings.top_p ?? undefined, top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined,
frequency_penalty: $settings.repeat_penalty ?? undefined frequency_penalty: $settings.repeat_penalty ?? undefined
}) })
}); });
...@@ -323,7 +326,8 @@ ...@@ -323,7 +326,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
messages: messages, messages: messages,
history: history history: history
...@@ -386,7 +390,8 @@ ...@@ -386,7 +390,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
messages: messages, messages: messages,
history: history history: history
......
src/routes/(app)/c/[id]/+page.svelte
View file @ 89644d4e
...@@ -160,7 +160,8 @@ ...@@ -160,7 +160,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
format: $settings.requestFormat ?? undefined, format: $settings.requestFormat ?? undefined,
context: context:
...@@ -231,7 +232,8 @@ ...@@ -231,7 +232,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
messages: messages, messages: messages,
history: history history: history
...@@ -299,6 +301,7 @@ ...@@ -299,6 +301,7 @@
.map((message) => ({ role: message.role, content: message.content })), .map((message) => ({ role: message.role, content: message.content })),
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
top_p: $settings.top_p ?? undefined, top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined,
frequency_penalty: $settings.repeat_penalty ?? undefined frequency_penalty: $settings.repeat_penalty ?? undefined
}) })
}); });
...@@ -358,7 +361,8 @@ ...@@ -358,7 +361,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
messages: messages, messages: messages,
history: history history: history
...@@ -419,7 +423,8 @@ ...@@ -419,7 +423,8 @@
temperature: $settings.temperature ?? undefined, temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? undefined, repeat_penalty: $settings.repeat_penalty ?? undefined,
top_k: $settings.top_k ?? undefined, top_k: $settings.top_k ?? undefined,
top_p: $settings.top_p ?? undefined top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined
}, },
messages: messages, messages: messages,
history: history history: history
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment