enhanced graphics

This commit is contained in:
Saifeddine ALOUI
2023-10-14 04:27:37 +02:00
parent 5929ebdb44
commit c093b3d4db
15 changed files with 292 additions and 263 deletions

5
app.py
View File

@ -813,10 +813,12 @@ class LoLLMsWebUI(LoLLMsAPPI):
self.config["model_name"]=data['setting_value']
if self.config["model_name"] is not None:
try:
GG = AdvancedGarbageCollector()
GG.safeHardCollect("model", self.binding)
self.model = None
self.binding.model = None
if self.binding:
del self.binding
self.binding = None
to_remove = []
for per in self.mounted_personalities:
@ -831,6 +833,7 @@ class LoLLMsWebUI(LoLLMsAPPI):
self.mount_personality(0)
gc.collect()
self.binding = BindingBuilder().build_binding(self.config, self.lollms_paths)
self.model = self.binding.build_model()
for per in self.mounted_personalities:
if per is not None:

213
web/dist/assets/index-7169784d.js vendored Normal file

File diff suppressed because one or more lines are too long

8
web/dist/assets/index-766ad978.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -10,4 +10,4 @@ pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5p
Updated for @stackoverflow/stacks v0.64.0
Code Blocks: /blob/v0.64.0/lib/css/components/_stacks-code-blocks.less
Colors: /blob/v0.64.0/lib/css/exports/_stacks-constants-colors.less
*/.hljs{color:#fff;background:#1c1b1b}.hljs-subst{color:#fff}.hljs-comment{color:#999}.hljs-attr,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-section,.hljs-selector-tag{color:#88aece}.hljs-attribute{color:#c59bc1}.hljs-name,.hljs-number,.hljs-quote,.hljs-selector-id,.hljs-template-tag,.hljs-type{color:#f08d49}.hljs-selector-class{color:#88aece}.hljs-link,.hljs-regexp,.hljs-selector-attr,.hljs-string,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#b5bd68}.hljs-meta,.hljs-selector-pseudo{color:#88aece}.hljs-built_in,.hljs-literal,.hljs-title{color:#f08d49}.hljs-bullet,.hljs-code{color:#ccc}.hljs-meta .hljs-string{color:#b5bd68}.hljs-deletion{color:#de7176}.hljs-addition{color:#76c490}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}
*/.hljs{color:#fff;background:#1c1b1b}.hljs-subst{color:#fff}.hljs-comment{color:#999}.hljs-keyword,.hljs-selector-tag,.hljs-meta .hljs-keyword,.hljs-doctag,.hljs-section,.hljs-attr{color:#88aece}.hljs-attribute{color:#c59bc1}.hljs-name,.hljs-type,.hljs-number,.hljs-selector-id,.hljs-quote,.hljs-template-tag{color:#f08d49}.hljs-selector-class{color:#88aece}.hljs-string,.hljs-regexp,.hljs-symbol,.hljs-variable,.hljs-template-variable,.hljs-link,.hljs-selector-attr{color:#b5bd68}.hljs-meta,.hljs-selector-pseudo{color:#88aece}.hljs-built_in,.hljs-title,.hljs-literal{color:#f08d49}.hljs-bullet,.hljs-code{color:#ccc}.hljs-meta .hljs-string{color:#b5bd68}.hljs-deletion{color:#de7176}.hljs-addition{color:#76c490}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}

View File

@ -10,4 +10,4 @@ pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5p
Updated for @stackoverflow/stacks v0.64.0
Code Blocks: /blob/v0.64.0/lib/css/components/_stacks-code-blocks.less
Colors: /blob/v0.64.0/lib/css/exports/_stacks-constants-colors.less
*/.hljs{color:#2f3337;background:#f6f6f6}.hljs-subst{color:#2f3337}.hljs-comment{color:#656e77}.hljs-attr,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-section,.hljs-selector-tag{color:#015692}.hljs-attribute{color:#803378}.hljs-name,.hljs-number,.hljs-quote,.hljs-selector-id,.hljs-template-tag,.hljs-type{color:#b75501}.hljs-selector-class{color:#015692}.hljs-link,.hljs-regexp,.hljs-selector-attr,.hljs-string,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#54790d}.hljs-meta,.hljs-selector-pseudo{color:#015692}.hljs-built_in,.hljs-literal,.hljs-title{color:#b75501}.hljs-bullet,.hljs-code{color:#535a60}.hljs-meta .hljs-string{color:#54790d}.hljs-deletion{color:#c02d2e}.hljs-addition{color:#2f6f44}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}
*/.hljs{color:#2f3337;background:#f6f6f6}.hljs-subst{color:#2f3337}.hljs-comment{color:#656e77}.hljs-keyword,.hljs-selector-tag,.hljs-meta .hljs-keyword,.hljs-doctag,.hljs-section,.hljs-attr{color:#015692}.hljs-attribute{color:#803378}.hljs-name,.hljs-type,.hljs-number,.hljs-selector-id,.hljs-quote,.hljs-template-tag{color:#b75501}.hljs-selector-class{color:#015692}.hljs-string,.hljs-regexp,.hljs-symbol,.hljs-variable,.hljs-template-variable,.hljs-link,.hljs-selector-attr{color:#54790d}.hljs-meta,.hljs-selector-pseudo{color:#015692}.hljs-built_in,.hljs-title,.hljs-literal{color:#b75501}.hljs-bullet,.hljs-code{color:#535a60}.hljs-meta .hljs-string{color:#54790d}.hljs-deletion{color:#c02d2e}.hljs-addition{color:#2f6f44}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}

View File

@ -1,8 +0,0 @@
pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}/*!
Theme: Tokyo-night-Dark
origin: https://github.com/enkia/tokyo-night-vscode-theme
Description: Original highlight.js style
Author: (c) Henri Vandersleyen <hvandersleyen@gmail.com>
License: see project LICENSE
Touched: 2022
*/.hljs-comment,.hljs-meta{color:#565f89}.hljs-deletion,.hljs-doctag,.hljs-regexp,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-id,.hljs-selector-pseudo,.hljs-tag,.hljs-template-tag,.hljs-variable.language_{color:#f7768e}.hljs-link,.hljs-literal,.hljs-number,.hljs-params,.hljs-template-variable,.hljs-type,.hljs-variable{color:#ff9e64}.hljs-attribute,.hljs-built_in{color:#e0af68}.hljs-keyword,.hljs-property,.hljs-subst,.hljs-title,.hljs-title.class_,.hljs-title.class_.inherited__,.hljs-title.function_{color:#7dcfff}.hljs-selector-tag{color:#73daca}.hljs-addition,.hljs-bullet,.hljs-quote,.hljs-string,.hljs-symbol{color:#9ece6a}.hljs-code,.hljs-formula,.hljs-section{color:#7aa2f7}.hljs-attr,.hljs-char.escape_,.hljs-keyword,.hljs-name,.hljs-operator{color:#bb9af7}.hljs-punctuation{color:#c0caf5}.hljs{background:#1a1b26;color:#9aa5ce}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}

View File

@ -0,0 +1,8 @@
pre code.hljs{display:block;overflow-x:auto;padding:1em}code.hljs{padding:3px 5px}/*!
Theme: Tokyo-night-Dark
origin: https://github.com/enkia/tokyo-night-vscode-theme
Description: Original highlight.js style
Author: (c) Henri Vandersleyen <hvandersleyen@gmail.com>
License: see project LICENSE
Touched: 2022
*/.hljs-meta,.hljs-comment{color:#565f89}.hljs-tag,.hljs-doctag,.hljs-selector-id,.hljs-selector-class,.hljs-regexp,.hljs-template-tag,.hljs-selector-pseudo,.hljs-selector-attr,.hljs-variable.language_,.hljs-deletion{color:#f7768e}.hljs-variable,.hljs-template-variable,.hljs-number,.hljs-literal,.hljs-type,.hljs-params,.hljs-link{color:#ff9e64}.hljs-built_in,.hljs-attribute{color:#e0af68}.hljs-selector-tag{color:#2ac3de}.hljs-keyword,.hljs-title.function_,.hljs-title,.hljs-title.class_,.hljs-title.class_.inherited__,.hljs-subst,.hljs-property{color:#7dcfff}.hljs-selector-tag{color:#73daca}.hljs-quote,.hljs-string,.hljs-symbol,.hljs-bullet,.hljs-addition{color:#9ece6a}.hljs-code,.hljs-formula,.hljs-section{color:#7aa2f7}.hljs-name,.hljs-keyword,.hljs-operator,.hljs-char.escape_,.hljs-attr{color:#bb9af7}.hljs-punctuation{color:#c0caf5}.hljs{background:#1a1b26;color:#9aa5ce}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}

4
web/dist/index.html vendored
View File

@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>LoLLMS WebUI - Welcome</title>
<script type="module" crossorigin src="/assets/index-9780ee8e.js"></script>
<link rel="stylesheet" href="/assets/index-76946b00.css">
<script type="module" crossorigin src="/assets/index-7169784d.js"></script>
<link rel="stylesheet" href="/assets/index-766ad978.css">
</head>
<body>
<div id="app"></div>

View File

@ -17,8 +17,6 @@
</div>
</div>
</div>
</div>
<div v-if="model.isCustomModel" class="flex items-center flex-row gap-2 my-1">
@ -31,7 +29,16 @@
</button>
Custom model
</div>
<input v-if="model.isInstalled" v-model="model.selected" @click.stop="toggleSelected" type="checkbox" class='cursor-pointer border-2 border-blue-300 rounded w-10 h-10'>
<div v-if="model.selected" @click.stop="toggleSelected" class="cursor-pointer" style="background-color: white;">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<path d="M9 16.17l-4.17-4.17-1.42 1.41 5.59 5.59 12-12-1.41-1.41z"/>
</svg>
</div>
<div v-else @click.stop="toggleSelected" class="cursor-pointer" style="background-color: white;">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
</svg>
</div>
<div>
<button v-if="model.isInstalled" title="Delete file from disk" type="button" @click.stop="toggleInstall"
class="inline-flex items-center gap-2 px-3 py-2 text-xs font-medium text-center focus:outline-none text-white bg-red-700 hover:bg-red-800 focus:ring-4 focus:ring-red-300 rounded-lg dark:bg-red-600 dark:hover:bg-red-700 dark:focus:ring-red-900">
@ -111,7 +118,15 @@
<div class="grow">
<!-- EMPTY SPACE FILLER -->
</div>
<input v-if="model.isInstalled" v-model="model.selected" @click.stop="toggleSelected" type="checkbox" class='cursor-pointer border-2 border-blue-300 rounded w-10 h-10'>
<div v-if="model.selected" @click.stop="toggleSelected" class="cursor-pointer" style="background-color: white;">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<path d="M9 16.17l-4.17-4.17-1.42 1.41 5.59 5.59 12-12-1.41-1.41z"/>
</svg>
</div>
<div v-else @click.stop="toggleSelected" class="cursor-pointer" style="background-color: white;">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
</svg>
</div>
<InteractiveMenu :commands="commandsList" :force_position=2 title="Menu">

View File

@ -14,6 +14,11 @@
<h3 @click="toggleSelected" class="font-bold font-large text-lg line-clamp-3 cursor-pointer">
{{ personality.name }}
</h3>
<button
class="hover:text-secondary duration-75 active:scale-90 font-medium rounded-lg text-sm p-2 text-center inline-flex items-center "
title="Copy link to clipboard" @click.stop="toggleCopyLink()">
<i data-feather="clipboard" class="w-5"></i>
</button>
</div>
<div class="">
<div class="">
@ -103,7 +108,8 @@ export default {
onUnMount: Function,
onRemount: Function,
onReinstall: Function,
onSettings: Function
onSettings: Function,
onCopyPersonalityName: Function
},
components:{
InteractiveMenu
@ -152,6 +158,10 @@ export default {
toggleTalk() {
this.onTalk(this)
},
toggleCopyLink() {
this.onCopyPersonalityName(this)
//navigator.clipboard.writeText(this.path)
},
toggleSelected() {
if(this.isMounted){
this.onSelected(this)

View File

@ -365,12 +365,6 @@ export const store = createStore({
},
async refreshVramUsage({ commit }) {
const resp = await api_get_req("vram_usage")
// {
// "gpu_0_total_vram": 11811160064,
// "gpu_0_used_vram": 3177185280,
// "nb_gpus": 1
// }
const gpuArr = []
if (resp.nb_gpus > 0) {
@ -433,6 +427,11 @@ async function api_get_req(endpoint) {
}
}
async function refreshHardwareUsage(store) {
await store.dispatch('refreshDiskUsage');
await store.dispatch('refreshRamUsage');
await store.dispatch('refreshVramUsage');
}
let actionsExecuted = false;
app.mixin({
@ -447,10 +446,7 @@ app.mixin({
await this.$store.dispatch('getVersion');
console.log("recovered version");
await this.$store.dispatch('refreshBindings');
await this.$store.dispatch('refreshDiskUsage');
await this.$store.dispatch('refreshRamUsage');
await this.$store.dispatch('refreshVramUsage');
await refreshHardwareUsage(this.$store);
await this.$store.dispatch('refreshExtensionsZoo');
await this.$store.dispatch('refreshmountedExtensions');
await this.$store.dispatch('refreshModels');
@ -507,4 +503,4 @@ app.use(router)
app.use(store)
app.mount('#app')
export{logObjectProperties, copyObject, flattenObject}
export{logObjectProperties, copyObject, flattenObject, refreshHardwareUsage}

View File

@ -19,15 +19,6 @@
<hr
class=" mt-1 w-96 h-1 mx-auto my-2 md:my-2 dark:bg-bg-dark-tone-panel bg-bg-light-tone-panel border-0 rounded ">
<p class="text-2xl">Welcome</p>
<svg aria-hidden="true" class="w-6 h-6 animate-spin fill-secondary" viewBox="0 0 100 101"
fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill" />
</svg>
<span class="text-2xl font-bold ml-4">Loading ...</span>
</div>
@ -1150,6 +1141,10 @@ export default {
}
}
},
onCopyPersonalityName(personality) {
this.$refs.toast.showToast("Copied name to clipboard!", 4, true)
navigator.clipboard.writeText(personality.name);
},
async deleteDiscussion(id) {
// Deletes discussion from binding and frontend

View File

@ -1587,7 +1587,9 @@
:on-un-mount="unmountPersonality"
:on-remount="remountPersonality"
:on-reinstall="onPersonalityReinstall"
:on-settings="onSettingsPersonality" />
:on-settings="onSettingsPersonality"
:on-copy-personality-name="onCopyPersonalityName"
/>
</TransitionGroup>
</div>
</div>
@ -2064,6 +2066,7 @@ import ChoiceDialog from "@/components/ChoiceDialog.vue";
import Card from "@/components/Card.vue"
import RadioOptions from '../components/RadioOptions.vue';
import ExtensionEntry from "@/components/ExtensionEntry.vue"
import {refreshHardwareUsage} from "../main"
const bUrl = import.meta.env.VITE_LOLLMS_API_BASEURL
axios.defaults.baseURL = import.meta.env.VITE_LOLLMS_API_BASEURL
@ -2167,7 +2170,7 @@ export default {
socket.on('loading_text',this.on_loading_text);
this.updateHasUpdates();
//await socket.on('install_progress', this.progressListener);
//refreshHardwareUsage()
},
methods: {
async modelsZooToggleCollapse(){
@ -2634,7 +2637,9 @@ export default {
console.log("update_model",res)
this.configFile.model_name = model_object.model.name
if(res.status){
this.refreshModelsZoo().then(()=>{
this.$refs.toast.showToast("Selected model:\n" + model_object.name, 4, true)
})
}else{
this.$refs.toast.showToast("Couldn't select model:\n" + model_object.name, 4, false)
}
@ -2666,10 +2671,13 @@ export default {
navigator.clipboard.writeText(content.trim());
},
onCopyLink(modelEntry) {
this.$refs.toast.showToast("Copied link to clipboard!", 4, true)
navigator.clipboard.writeText('https://huggingface.co/'+modelEntry.model.quantizer+'/'+modelEntry.model.name);
},
onCopyPersonalityName(personality) {
this.$refs.toast.showToast("Copied name to clipboard!", 4, true)
navigator.clipboard.writeText(personality.name);
},
onCancelInstall() {
const modelEntry = this.addModel
@ -2871,11 +2879,11 @@ export default {
},
onSelectedBinding(binding_object) {
console.log("Binding selected")
this.mzc_collapsed=true;
if (!binding_object.binding.installed) {
this.$refs.toast.showToast("Binding is not installed:\n" + binding_object.binding.name, 4, false)
return
}
this.mzc_collapsed=true;
if (this.configFile.binding_name != binding_object.binding.folder) {
this.update_binding(binding_object.binding.folder)
}