Skip to content

GitLab

"...overview/git@developer.sourcefind.cn:OpenDAS/nni.git" did not exist on "ef15fc81967fa13c74da6147931fde236464bf04"
Commit 11741ea7 authored by Self Denial's avatar Self Denial
Browse files

Tooltip info & warn. Detect file path during update. Add translation. 

* Tooltips added to show full model name and warning regarding vector storage
* Send toast error and return early if more than a single front slash is detected
* Extend toast duration for model update action
* Add i18n en_US translation
* Remove commented code copied from existing function
parent 9f82f5ab
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 57 deletions
src/lib/components/documents/Settings/General.svelte
View file @ 11741ea7
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
import { onMount, getContext } from 'svelte'; import { onMount, getContext } from 'svelte';
import { toast } from 'svelte-sonner'; import { toast } from 'svelte-sonner';
import Tooltip from '$lib/components/common/Tooltip.svelte';
const i18n = getContext('i18n'); const i18n = getContext('i18n');
export let saveHandler: Function; export let saveHandler: Function;
...@@ -49,16 +51,33 @@ ...@@ -49,16 +51,33 @@
}; };
const embeddingModelUpdateHandler = async () => { const embeddingModelUpdateHandler = async () => {
if ((embeddingModel.embedding_model.split("/").length -1) > 1) {
toast.error($i18n.t('Model filesystem path detected. Model shortname is required for update, cannot continue.', ));
return;
}
console.log('Update embedding model attempt:', embeddingModel.embedding_model);
loading1 = true; loading1 = true;
const res = await updateEmbeddingModel(localStorage.token, embeddingModel); const res = await updateEmbeddingModel(localStorage.token, embeddingModel);
loading1 = false; loading1 = false;
if (res) { if (res) {
console.log('embeddingModelUpdateHandler:', res); console.log('embeddingModelUpdateHandler:', res);
if (res.status == true) { if (res.status === true) {
toast.success($i18n.t('Model {{embedding_model}} update complete!', res)); toast.success(
$i18n.t('Model {{embedding_model}} update complete!', res),
{
duration: 1000 * 10,
}
);
} else { } else {
toast.error($i18n.t('Model {{embedding_model}} update failed or not required!', res)); toast.error(
$i18n.t('Model {{embedding_model}} update failed or not required!', res),
{
duration: 1000 * 10,
}
);
} }
} }
}; };
...@@ -162,65 +181,66 @@ ...@@ -162,65 +181,66 @@
</button> </button>
</div> </div>
</div>
<hr class=" dark:border-gray-700" />
<div>
<div class=" flex w-full justify-between"> <div class=" flex w-full justify-between">
<div class=" self-center text-xs font-medium"> <Tooltip content={
{$i18n.t('Update embedding model {{embedding_model}}', embeddingModel)} $i18n.t('Embedding model: {{embedding_model}}', embeddingModel)
</div> }>
<button <div class=" self-center text-xs font-medium">
class=" self-center text-xs p-1 px-3 bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 rounded flex flex-row space-x-1 items-center {loading1 {$i18n.t('Update embedding model {{embedding_model}}', { embedding_model: embeddingModel.embedding_model.slice(-40) })}
? ' cursor-not-allowed' </div>
: ''}" </Tooltip>
on:click={() => {
embeddingModelUpdateHandler(embeddingModel);
console.log('Update embedding model:', embeddingModel.embedding_model);
}}
type="button"
disabled={loading1}
>
<div class="self-center font-medium">{$i18n.t('Update')}</div>
<!-- <svg <Tooltip content={
xmlns="http://www.w3.org/2000/svg" $i18n.t('Understand that updating or changing your embedding model requires reset of the vector database and re-import of all documents. You have been warned!')
viewBox="0 0 16 16" }>
fill="currentColor"
class="w-3 h-3"
>
<path
fill-rule="evenodd"
d="M13.836 2.477a.75.75 0 0 1 .75.75v3.182a.75.75 0 0 1-.75.75h-3.182a.75.75 0 0 1 0-1.5h1.37l-.84-.841a4.5 4.5 0 0 0-7.08.932.75.75 0 0 1-1.3-.75 6 6 0 0 1 9.44-1.242l.842.84V3.227a.75.75 0 0 1 .75-.75Zm-.911 7.5A.75.75 0 0 1 13.199 11a6 6 0 0 1-9.44 1.241l-.84-.84v1.371a.75.75 0 0 1-1.5 0V9.591a.75.75 0 0 1 .75-.75H5.35a.75.75 0 0 1 0 1.5H3.98l.841.841a4.5 4.5 0 0 0 7.08-.932.75.75 0 0 1 1.025-.273Z"
clip-rule="evenodd"
/>
</svg> -->
{#if loading1} <button
<div class="ml-3 self-center"> class=" self-center text-xs p-1 px-3 bg-gray-100 dark:bg-gray-800 dark:hover:bg-gray-700 rounded flex flex-row space-x-1 items-center {loading1
<svg ? ' cursor-not-allowed'
class=" w-3 h-3" : ''}"
viewBox="0 0 24 24" on:click={() => {
fill="currentColor" embeddingModelUpdateHandler(embeddingModel);
xmlns="http://www.w3.org/2000/svg" }}
><style> type="button"
.spinner_ajPY { disabled={loading1}
transform-origin: center; >
animation: spinner_AtaB 0.75s infinite linear; <div class="self-center font-medium">{$i18n.t('Update')}</div>
}
@keyframes spinner_AtaB { {#if loading1}
100% { <div class="ml-3 self-center">
transform: rotate(360deg); <svg
class=" w-3 h-3"
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 {
</style><path 100% {
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" transform: rotate(360deg);
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" </style><path
class="spinner_ajPY" 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"
/></svg opacity=".25"
> /><path
</div> 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"
{/if} class="spinner_ajPY"
</button> /></svg
>
</div>
{/if}
</button>
</Tooltip>
</div> </div>
</div> </div>
......
src/lib/i18n/locales/en-US/translation.json
View file @ 11741ea7
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
"Edit Doc": "", "Edit Doc": "",
"Edit User": "", "Edit User": "",
"Email": "", "Email": "",
"Embedding model: {{embedding_model}}": "",
"Enable Chat History": "", "Enable Chat History": "",
"Enable New Sign Ups": "", "Enable New Sign Ups": "",
"Enabled": "", "Enabled": "",
...@@ -193,8 +194,11 @@ ...@@ -193,8 +194,11 @@
"MMMM DD, YYYY": "", "MMMM DD, YYYY": "",
"Model '{{modelName}}' has been successfully downloaded.": "", "Model '{{modelName}}' has been successfully downloaded.": "",
"Model '{{modelTag}}' is already in queue for downloading.": "", "Model '{{modelTag}}' is already in queue for downloading.": "",
"Model {{embedding_model}} update complete!": "",
"Model {{embedding_model}} update failed or not required!": "",
"Model {{modelId}} not found": "", "Model {{modelId}} not found": "",
"Model {{modelName}} already exists.": "", "Model {{modelName}} already exists.": "",
"Model filesystem path detected. Model shortname is required for update, cannot continue.": "",
"Model Name": "", "Model Name": "",
"Model not selected": "", "Model not selected": "",
"Model Tag Name": "", "Model Tag Name": "",
...@@ -332,7 +336,10 @@ ...@@ -332,7 +336,10 @@
"TTS Settings": "", "TTS Settings": "",
"Type Hugging Face Resolve (Download) URL": "", "Type Hugging Face Resolve (Download) URL": "",
"Uh-oh! There was an issue connecting to {{provider}}.": "", "Uh-oh! There was an issue connecting to {{provider}}.": "",
"Understand that updating or changing your embedding model requires reset of the vector database and re-import of all documents. You have been warned!": "",
"Unknown File Type '{{file_type}}', but accepting and treating as plain text": "", "Unknown File Type '{{file_type}}', but accepting and treating as plain text": "",
"Update": "",
"Update embedding model {{embedding_model}}": "",
"Update password": "", "Update password": "",
"Upload a GGUF model": "", "Upload a GGUF model": "",
"Upload files": "", "Upload files": "",
......
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