Skip to content

GitLab

"test/ut/sdk/test_smartparam.py" did not exist on "17e267f8b2be597cbb06f7f4e26318c4679dcd67"
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
Show 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 @@
// Advanced
let requestFormat = '';
let seed = 0;
let temperature = 0.8;
let repeat_penalty = 1.1;
let top_k = 40;
let top_p = 0.9;
let temperature = '';
let repeat_penalty = '';
let top_k = '';
let top_p = '';
let num_ctx = '';
// Models
let modelTag = '';
......@@ -227,10 +228,11 @@
requestFormat = settings.requestFormat ?? '';
seed = settings.seed ?? 0;
temperature = settings.temperature ?? 0.8;
repeat_penalty = settings.repeat_penalty ?? 1.1;
top_k = settings.top_k ?? 40;
top_p = settings.top_p ?? 0.9;
temperature = settings.temperature ?? '';
repeat_penalty = settings.repeat_penalty ?? '';
top_k = settings.top_k ?? '';
top_p = settings.top_p ?? '';
num_ctx = settings.num_ctx ?? '';
titleAutoGenerate = settings.titleAutoGenerate ?? true;
speechAutoSend = settings.speechAutoSend ?? false;
......@@ -612,37 +614,6 @@
{:else if selectedTab === 'advanced'}
<div class="flex flex-col h-full justify-between space-y-3 text-sm">
<div class=" space-y-3">
<div>
<div class=" py-1 flex w-full justify-between">
<div class=" self-center text-sm font-medium">Request Mode</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
toggleRequestFormat();
}}
>
{#if requestFormat === ''}
<span class="ml-2 self-center"> Default </span>
{:else if requestFormat === 'json'}
<!-- <svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
class="w-4 h-4 self-center"
>
<path
d="M10 2a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 0110 2zM10 15a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 0110 15zM10 7a3 3 0 100 6 3 3 0 000-6zM15.657 5.404a.75.75 0 10-1.06-1.06l-1.061 1.06a.75.75 0 001.06 1.06l1.06-1.06zM6.464 14.596a.75.75 0 10-1.06-1.06l-1.06 1.06a.75.75 0 001.06 1.06l1.06-1.06zM18 10a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5A.75.75 0 0118 10zM5 10a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5A.75.75 0 015 10zM14.596 15.657a.75.75 0 001.06-1.06l-1.06-1.061a.75.75 0 10-1.06 1.06l1.06 1.06zM5.404 6.464a.75.75 0 001.06-1.06l-1.06-1.06a.75.75 0 10-1.061 1.06l1.06 1.06z"
/>
</svg> -->
<span class="ml-2 self-center"> JSON </span>
{/if}
</button>
</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>
......@@ -659,15 +630,27 @@
</div>
</div>
<hr class=" dark:border-gray-700" />
<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>
<div>
<label for="steps-range" class=" mb-2 text-sm font-medium flex justify-between">
<div>Temperature</div>
<div>
{temperature}
</div></label
<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"
......@@ -678,14 +661,38 @@
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
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"
......@@ -696,14 +703,38 @@
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
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"
......@@ -714,14 +745,38 @@
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
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"
......@@ -732,18 +787,101 @@
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 class=" py-1 flex w-full justify-between">
<div class=" self-center text-sm font-medium">Request Mode</div>
<button
class="p-1 px-3 text-xs flex rounded transition"
on:click={() => {
toggleRequestFormat();
}}
>
{#if requestFormat === ''}
<span class="ml-2 self-center"> Default </span>
{:else if requestFormat === 'json'}
<!-- <svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
class="w-4 h-4 self-center"
>
<path
d="M10 2a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 0110 2zM10 15a.75.75 0 01.75.75v1.5a.75.75 0 01-1.5 0v-1.5A.75.75 0 0110 15zM10 7a3 3 0 100 6 3 3 0 000-6zM15.657 5.404a.75.75 0 10-1.06-1.06l-1.061 1.06a.75.75 0 001.06 1.06l1.06-1.06zM6.464 14.596a.75.75 0 10-1.06-1.06l-1.06 1.06a.75.75 0 001.06 1.06l1.06-1.06zM18 10a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5A.75.75 0 0118 10zM5 10a.75.75 0 01-.75.75h-1.5a.75.75 0 010-1.5h1.5A.75.75 0 015 10zM14.596 15.657a.75.75 0 001.06-1.06l-1.06-1.061a.75.75 0 10-1.06 1.06l1.06 1.06zM5.404 6.464a.75.75 0 001.06-1.06l-1.06-1.06a.75.75 0 10-1.061 1.06l1.06 1.06z"
/>
</svg> -->
<span class="ml-2 self-center"> JSON </span>
{/if}
</button>
</div>
</div>
</div>
<div class="flex justify-end pt-3 text-sm font-medium">
<button
class=" px-4 py-2 bg-emerald-600 hover:bg-emerald-700 text-gray-100 transition rounded"
on:click={() => {
saveSettings({
seed: (seed !== 0 ? seed : undefined) ?? undefined,
temperature: temperature !== 0.8 ? temperature : undefined,
repeat_penalty: repeat_penalty !== 1.1 ? repeat_penalty : undefined,
top_k: top_k !== 40 ? top_k : undefined,
top_p: top_p !== 0.9 ? top_p : undefined
temperature: temperature !== '' ? temperature : undefined,
repeat_penalty: repeat_penalty !== '' ? repeat_penalty : undefined,
top_k: top_k !== '' ? top_k : undefined,
top_p: top_p !== '' ? top_p : undefined,
num_ctx: num_ctx !== '' ? num_ctx : undefined
});
show = false;
}}
......
src/routes/(app)/+page.svelte
View file @ 89644d4e
......@@ -125,7 +125,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
context:
......@@ -196,7 +197,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
history: history
......@@ -264,6 +266,7 @@
.map((message) => ({ role: message.role, content: message.content })),
temperature: $settings.temperature ?? undefined,
top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined,
frequency_penalty: $settings.repeat_penalty ?? undefined
})
});
......@@ -323,7 +326,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
history: history
......@@ -386,7 +390,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
history: history
......
src/routes/(app)/c/[id]/+page.svelte
View file @ 89644d4e
......@@ -160,7 +160,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
context:
......@@ -231,7 +232,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
history: history
......@@ -299,6 +301,7 @@
.map((message) => ({ role: message.role, content: message.content })),
temperature: $settings.temperature ?? undefined,
top_p: $settings.top_p ?? undefined,
num_ctx: $settings.num_ctx ?? undefined,
frequency_penalty: $settings.repeat_penalty ?? undefined
})
});
......@@ -358,7 +361,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
history: history
......@@ -419,7 +423,8 @@
temperature: $settings.temperature ?? undefined,
repeat_penalty: $settings.repeat_penalty ?? 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,
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