ExternalVendorCode/lollms-webui
1
0
Fork 0
mirror of https://github.com/ParisNeo/lollms-webui.git synced 2025-02-21 01:31:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgraded

Browse Source
This commit is contained in:
Saifeddine ALOUI 2023-07-09 19:32:25 +02:00
parent 02dd6aadf4
commit 0569efaaea
6 changed files with 255 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.py
View File

@ -383,6 +383,8 @@ class LoLLMsWebUI(LoLLMsAPPI):
personality_info['author'] = config_data.get('author', 'ParisNeo')
personality_info['version'] = config_data.get('version', '1.0.0')
personality_info['installed'] = (self.lollms_paths.personal_configuration_path/f"personality_{personality_folder.stem}.yaml").exists() or personality_info['has_scripts']
personality_info['help'] = config_data.get('help', '')
personality_info['commands'] = config_data.get('commands', '')
real_assets_path = personality_folder/ 'assets'
assets_path = Path("personalities") / lang / cat / pers / 'assets'
gif_logo_path = assets_path / 'logo.gif'

14
web/src/App.vue
View File

@ -1,30 +1,22 @@
<template>
<div
class="flex flex-col h-screen font-sans bg-bg-light text-slate-950 dark:bg-bg-dark dark:text-slate-50">
<div class="flex flex-col h-screen font-sans bg-bg-light text-slate-950 dark:bg-bg-dark dark:text-slate-50">
<TopBar />
<div class="flex overflow-hidden flex-grow">
<!-- VIEW CONTAINER -->
<RouterView v-slot="{ Component }">
<KeepAlive>
<component :is="Component" />
</KeepAlive>
</RouterView>
</div>
<!-- FOOTER -->
<!-- <Footer /> -->
</div>
</template>
<script setup>
import { RouterView } from 'vue-router'
import TopBar from './components/TopBar.vue';
import Footer from './components/Footer.vue';
import TopBar from './components/TopBar.vue'
</script>

38
web/src/components/ChatBox.vue
View File

@ -100,18 +100,22 @@
</button>
</div>
<div v-if="showPersonalities" class="mx-1">
<MountedPersonalitiesList ref="mountedPersList" :onShowPersList="onShowPersListFun"
:on-mount-unmount="onMountUnmountFun" :discussionPersonalities="allDiscussionPersonalities" />
</div>
<!-- CHAT BOX -->
<div class="flex flex-row flex-grow items-center gap-2 overflow-visible">
<div class="w-fit">
<MountedPersonalities ref="mountedPers" :onShowPersList="onShowPersListFun" />
<MountedPersonalities ref="mountedPers" :onShowPersList="onShowPersListFun" :onReady="onPersonalitiesReadyFun"/>
<!-- :onShowPersList="onShowPersListFun" -->
</div>
<div class="w-fit">
<PersonalitiesCommands
v-if="personalities_ready"
:commandsList="this.$store.state.mountedPersArr[this.$store.state.config.active_personality_id].commands"
ref="personalityCMD"
></PersonalitiesCommands>
</div>
<div class="relative grow">
<textarea id="chat" rows="1" v-model="message" title="Hold SHIFT + ENTER to add new line"
@ -130,7 +134,6 @@
</div>
<!-- BUTTONS -->
<div class="inline-flex justify-center rounded-full ">
<button v-if="!loading" type="button" @click="submit"
class=" w-6 hover:text-secondary duration-75 active:scale-90">
@ -195,6 +198,9 @@ import feather from 'feather-icons'
import filesize from '../plugins/filesize'
import MountedPersonalities from './MountedPersonalities.vue'
import MountedPersonalitiesList from './MountedPersonalitiesList.vue'
import PersonalitiesCommands from './PersonalitiesCommands.vue';
import { useStore } from 'vuex'; // Import the useStore function
import { inject } from 'vue';
export default {
name: 'ChatBox',
emits: ["messageSentEvent", "stopGenerating"],
@ -205,7 +211,8 @@ export default {
},
components: {
MountedPersonalities,
MountedPersonalitiesList
MountedPersonalitiesList,
PersonalitiesCommands
},
setup() {
@ -218,10 +225,17 @@ export default {
fileList: [],
totalSize: 0,
showFileList: true,
showPersonalities: false
showPersonalities: false,
personalities_ready: false,
}
},
computed: {
config() {
return this.$store.state.config;
},
mountedPers(){
return this.$store.state.mountedPers;
},
allDiscussionPersonalities() {
if (this.discussionList.length > 0) {
@ -232,9 +246,6 @@ export default {
};
}
console.log('conputer pers', persArray)
console.log('dis conputer pers', this.discussionList)
return persArray
@ -243,12 +254,17 @@ export default {
}
},
methods: {
onPersonalitiesReadyFun(){
console.log("Personalities ready")
console.log(this.$store.state.mountedPersArr[this.$store.state.config.active_personality_id]);
this.personalities_ready = true;
},
onShowPersListFun(comp) {
this.showPersonalities = !this.showPersonalities
},
onMountUnmountFun(comp) {
console.log('mountunmount chat')
console.log('Mounting/unmounting chat')
this.$refs.mountedPers.constructor()
},
computedFileSize(size) {

67
web/src/components/MountedPersonalities.vue
View File

@ -4,10 +4,7 @@
<div class="w-fit select-none">
<div class="flex -space-x-4 " v-if="mountedPersArr.length > 1">
<img :src="bUrl + mountedPers.avatar" @error="personalityImgPlacehodler"
class="w-8 h-8 rounded-full object-fill text-red-700 border-2 active:scale-90 hover:z-20 hover:-translate-y-2 duration-150 border-secondary cursor-pointer"
:title="'Active personality: '+mountedPers.name" >
@ -20,6 +17,21 @@
class="w-8 h-8 rounded-full object-fill text-red-700 border-2 active:scale-90 hover:z-20 cursor-pointer border-secondary"
:title="'Active personality: '+mountedPers.name" @click.stop="toggleShowPersList" >
</div>
<div v-if="mountedPersArr.length == 0" title="Loading personalities">
<!-- SPINNER -->
<div role="status">
<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="sr-only">Loading...</span>
</div>
</div>
</div>
</template>
@ -28,19 +40,23 @@
import axios from "axios";
import defaultPersonalityImgPlaceholder from "../assets/logo.svg"
import { nextTick } from "vue";
import { useStore } from 'vuex'; // Import the useStore function
import { computed } from 'vue'; // Import the computed function
import { watch, ref } from 'vue';
const bUrl = import.meta.env.VITE_GPT4ALL_API_BASEURL
axios.defaults.baseURL = import.meta.env.VITE_GPT4ALL_API_BASEURL
export default {
name: 'MountedPersonalities',
props: {
onShowPersList: Function,
onReady:Function,
},
data() {
return {
configFile: {},
configFile: null,
mountedPersArr: [],
personalities: [],
bUrl: bUrl,
@ -66,16 +82,37 @@ export default {
this.onShowPersList()
},
async constructor() {
this.configFile = await this.api_get_req("get_config")
this.getPersonalitiesArr()
let personality_path_infos = await this.api_get_req("get_current_personality_path_infos")
this.configFile.personality_language = personality_path_infos["personality_language"]
this.configFile.personality_category = personality_path_infos["personality_category"]
this.configFile.personality_folder = personality_path_infos["personality_name"]
const store = useStore();
this.configFile = store.state.config
console.log('configFile')
console.log(this.configFile)
await new Promise((resolve) => {
const waitForPersonalities = setInterval(() => {
if (store.state.personalities) {
clearInterval(waitForPersonalities);
resolve();
}
}, 100);
});
this.personalities = store.state.personalities
console.log('personalities')
console.log(this.personalities)
let personality_path_infos = store.state.personality_path_infos
console.log('personality_path_infos')
console.log(personality_path_infos)
this.configFile.personality_language = personality_path_infos["personality_language"];
this.configFile.personality_category = personality_path_infos["personality_category"];
this.configFile.personality_folder = personality_path_infos["personality_name"];
this.mountedPersArr = store.state.mountedPersArr
console.log(this.mountedPersArr);
console.log("Ready")
this.onReady();
/*
if(this.configFile===null){
console.log("No config file found.\nreloading")
this.configFile = await this.api_get_req("get_config")
} */
},
async api_get_req(endpoint) {
try {

29
web/src/components/MountedPersonalitiesList.vue
View File

@ -129,13 +129,28 @@ export default {
this.onMountUnmount(this)
},
async constructor() {
this.isLoading = true
this.configFile = await this.api_get_req("get_config")
this.getPersonalitiesArr()
let personality_path_infos = await this.api_get_req("get_current_personality_path_infos")
this.configFile.personality_language = personality_path_infos["personality_language"]
this.configFile.personality_category = personality_path_infos["personality_category"]
this.configFile.personality_folder = personality_path_infos["personality_name"]
this.configFile = this.$store.state.config
console.log('configFile')
console.log(this.configFile)
await new Promise((resolve) => {
const waitForPersonalities = setInterval(() => {
if (this.$store.state.personalities) {
clearInterval(waitForPersonalities);
resolve();
}
}, 100);
});
this.personalities = this.$store.state.personalities
console.log('personalities')
console.log(this.personalities)
let personality_path_infos = this.$store.state.personality_path_infos
console.log('personality_path_infos')
console.log(personality_path_infos)
this.configFile.personality_language = personality_path_infos["personality_language"];
this.configFile.personality_category = personality_path_infos["personality_category"];
this.configFile.personality_folder = personality_path_infos["personality_name"];
this.mountedPersArr = this.$store.state.mountedPersArr
},

150
web/src/main.js
View File

@ -1,11 +1,13 @@
import { createApp, ref } from 'vue'
import { createStore } from 'vuex'
import axios from "axios";
import App from './App.vue'
import router from './router'
import './assets/tailwind.css'
const app = createApp(App)
console.log("Loaded main.js")
// Create a new store instance.
export const store = createStore({
@ -15,14 +17,160 @@ export const store = createStore({
mountedPersonalities: [],
settingsChanged:false,
isConnected: false, // Add the isConnected property
config:null,
mountedPers:null,
personalities:null,
personality_path_infos:null
}
},
mutations: {
setConfig(state, config) {
state.config = config;
},
setPersonalities(state, personalities) {
state.personalities = personalities;
},
setMountedPers(state, mountedPers) {
state.mountedPers = mountedPers;
},
setPersonalityPathInfos(state, personality_path_infos) {
state.personality_path_infos = personality_path_infos;
}
// increment (state) {
// state.count++
// }
},
getters: {
getConfig(state) {
return state.config
},
getIsConnected(state) {
return state.isConnected
},
getMountedPers(state) {
return state.mountedPers;
}
},
actions: {
async refreshConfig({ commit }) {
console.log("Fetching configuration");
try {
const configFile = await api_get_req('get_config');
commit('setConfig', configFile);
console.log("Configurations recovered")
console.log(configFile)
console.log(this.state.config)
} catch (error) {
console.log(error.message, 'refreshConfig');
// Handle error
}
},
async refreshPersonalitiesArr({ commit }) {
let personalities = []
console.log("Getting personalities 0")
const dictionary = await api_get_req("get_all_personalities")
console.log("Getting personalities 2")
const langkeys = Object.keys(dictionary); // returns languages folder names
console.log("Getting personalities 3")
for (let i = 0; i < langkeys.length; i++) {
const langkey = langkeys[i];
const catdictionary = dictionary[langkey];
const catkeys = Object.keys(catdictionary); // returns categories
for (let j = 0; j < catkeys.length; j++) {
const catkey = catkeys[j];
const personalitiesArray = catdictionary[catkey];
const modPersArr = personalitiesArray.map((item) => {
const isMounted = this.state.config.personalities.includes(langkey + '/' + catkey + '/' + item.folder)
// if (isMounted) {
// console.log(item)
// }
let newItem = {}
newItem = item
newItem.category = catkey // add new props to items
newItem.language = langkey // add new props to items
newItem.full_path = langkey + '/' + catkey + '/' + item.folder // add new props to items
newItem.isMounted = isMounted // add new props to items
return newItem
})
if (personalities.length == 0) {
personalities = modPersArr
} else {
personalities = personalities.concat(modPersArr)
}
}
}
console.log("Getting personalities 3")
personalities.sort((a, b) => a.name.localeCompare(b.name))
commit('setPersonalities',personalities)
console.log("Done")
},
refreshMountedPersonalities({ commit }) {
let mountedPersArr = []
console.log(this.state.config.personalities.length)
// console.log('perrs listo',this.state.personalities)
for (let i = 0; i < this.state.config.personalities.length; i++) {
const full_path_item = this.state.config.personalities[i]
const index = this.state.personalities.findIndex(item => item.full_path == full_path_item)
const pers = this.state.personalities[index]
if (pers) {
mountedPersArr.push(pers)
}
else {
mountedPersArr.push(this.state.personalities[this.state.personalities.findIndex(item => item.full_path == "english/generic/lollms")])
}
}
this.mountedPersArr = []
this.state.mountedPersArr = mountedPersArr
console.log('refreshMountedPersonalities', mountedPersArr)
console.log('fig', this)
this.state.mountedPers = this.state.personalities[this.state.personalities.findIndex(item => item.full_path == this.state.config.personalities[this.state.config.active_personality_id])]
},
async refreshPersonalityPath({ commit }){
this.state.personality_path_infos = await api_get_req("get_current_personality_path_infos")
}
}
})
async function api_get_req(endpoint) {
try {
const res = await axios.get('/' + endpoint);
if (res) {
return res.data;
}
})
} catch (error) {
console.log(error.message, 'api_get_req');
throw error;
}
}
let actionsExecuted = false;
app.mixin({
beforeMount() {
if (!actionsExecuted) {
actionsExecuted = true;
this.$store.dispatch('refreshConfig').then(() => {
this.$store.dispatch('refreshPersonalitiesArr').then(() => {
this.$store.dispatch('refreshMountedPersonalities');
this.$store.dispatch('refreshPersonalityPath');
});
});
}
}
})
app.use(router)
app.use(store)