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

upgraded lightrag integration

Browse Source
This commit is contained in:
Saifeddine ALOUI 2025-01-09 00:04:11 +01:00
parent 9202b7a95a
commit a9c522973f
11 changed files with 280 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.py
View File

@ -90,7 +90,7 @@ packages: List[Tuple[str, str]] = [
("freedom_search", "0.1.9"),
("scrapemaster", "0.2.1"),
("lollms_client", "0.7.7"),
("lollmsvectordb", "1.3.5"),
("lollmsvectordb", "1.3.6"),
]
if not pm.is_installed("einops"):

BIN
books.sqlite Normal file
View File

Binary file not shown.

BIN
docs/books/books.sqlite Normal file
View File

Binary file not shown.

2
lollms_core

@ -1 +1 @@
Subproject commit 1ca026f151521747a904bd84b1cb5e733b75faa1
Subproject commit 41a1a695adef58d152d8cb46c99ad3438722e6f7

2
web/dist/assets/index-C2FoYcNI.css → web/dist/assets/index-D7riBOGp.css vendored
View File

File diff suppressed because one or more lines are too long

342
web/dist/assets/index-By7bItK0.js → web/dist/assets/index-fkrdX5dp.js vendored
View File

File diff suppressed because one or more lines are too long

4
web/dist/index.html vendored
View File

@ -6,8 +6,8 @@
<script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>LoLLMS WebUI</title>
<script type="module" crossorigin src="/assets/index-By7bItK0.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-C2FoYcNI.css">
<script type="module" crossorigin src="/assets/index-fkrdX5dp.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-D7riBOGp.css">
</head>
<body>
<div id="app"></div>

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

@ -496,18 +496,15 @@ export default {
// Extract the names from the combined array and transform them into the desired format
const formattedDataSources = combinedDatabases.map(dataSource => {
console.log("entry", dataSource);
const parts = dataSource.split('::');
console.log("extracted", parts[0]);
const isMounted = dataSource.endsWith('mounted');
const icon = isMounted ? 'feather:check' : '';
const icon = dataSource.mounted ? 'feather:check' : '';
console.log("icon decision", icon);
return {
name: parts[0],
value: parts[0] || 'default_value',
icon: icon,
name: dataSource.alias,
value: dataSource.alias || 'default_value',
icon: icon,
help: 'mounts the database'
};
});
@ -515,6 +512,7 @@ export default {
console.log("formatted data sources", formattedDataSources);
return formattedDataSources;
}
},
methods: {
showSendMenu() {

161
web/src/views/SettingsView.vue
View File

@ -1126,6 +1126,14 @@
placeholder="Database URL"
>
<input
type="text"
:value="getDatabaseKey(index)"
@input="updateDatabaseKey(index, $event.target.value)"
class="w-full mx-2 mt-1 px-2 py-1 border border-gray-300 rounded dark:bg-gray-600"
placeholder="Database api key"
>
<input
type="checkbox"
:checked="getMounted(index)"
@ -1158,7 +1166,7 @@
<!-- Name input -->
<input
type="text"
:value="source.split('::')[0]"
:value="source.alias"
@input="(e) => updateRagDatabase(index, e.target.value, 'name')"
class="w-1/3 mt-1 px-2 py-1 border border-gray-300 rounded dark:bg-gray-600 mr-2"
placeholder="Database Name"
@ -1166,7 +1174,7 @@
<!-- Path input -->
<input
type="text"
:value="source.split('::')[1]"
:value="source.path"
@input="(e) => updateRagDatabase(index, e.target.value, 'path')"
class="w-1/3 mt-1 px-2 py-1 border border-gray-300 rounded dark:bg-gray-600 mr-2"
placeholder="Database Path"
@ -1175,13 +1183,14 @@
<div class="flex items-center mr-2">
<input
type="checkbox"
:checked="source.split('::')[2] === 'mounted'"
:checked="source.mounted"
@change="(e) => updateRagDatabase(index, e.target.checked, 'mounted')"
class="mr-1"
>
<span class="text-sm">Mounted</span>
</div>
<!-- Vectorize button -->
<button @click="vectorize_folder(index)"
class="w-500 ml-2 px-2 py-1 bg-green-500 text-white hover:bg-green-300 rounded flex items-center"
title="Vectorize or re-vectorize the selected folder">
@ -1190,6 +1199,7 @@
</svg>
</button>
<!-- Select folder button -->
<button @click="select_folder(index)"
class="w-500 ml-2 px-2 py-1 bg-blue-500 text-white hover:bg-blue-300 rounded flex items-center"
title="Select a folder as data source">
@ -1198,6 +1208,7 @@
</svg>
</button>
<!-- Remove button -->
<button @click="removeDataSource(index)"
class="ml-2 px-2 py-1 bg-red-500 text-white hover:bg-red-300 rounded flex items-center"
title="Remove this data source">
@ -1207,6 +1218,7 @@
</button>
</div>
<button @click="addDataSource" class="mt-2 px-2 py-1 bg-blue-500 text-white rounded">Add Data Source</button>
</td>
</tr>
@ -4530,73 +4542,72 @@ export default {
},
methods: {
updateRagDatabase(index, value, field) {
let parts = this.configFile.rag_databases[index].split('::');
switch(field) {
case 'name':
parts[0] = value;
break;
case 'path':
parts[1] = value;
break;
case 'mounted':
parts[2] = value ? 'mounted' : '';
break;
if (field) {
// For mounted, keep it as boolean, for others just set the value
if (field === 'mounted') {
this.configFile.rag_databases[index][field] = Boolean(value);
} else {
this.configFile.rag_databases[index][field] = value;
}
this.settingsChanged = true;
}
this.configFile.rag_databases[index] = parts.join('::');
this.settingsChanged = true;
},
},
getAlias(index) {
return this.configFile.remote_databases[index].split('::')[0];
return this.configFile.remote_databases[index].alias;
},
getDatabaseType(index) {
return this.configFile.remote_databases[index].split('::')[1];
return this.configFile.remote_databases[index].type;
},
getDatabaseUrl(index) {
return this.configFile.remote_databases[index].split('::')[2];
return this.configFile.remote_databases[index].url;
},
getDatabaseKey(index) {
return this.configFile.remote_databases[index].key || "";
},
getMounted(index) {
const parts = this.configFile.remote_databases[index].split('::');
return parts.length > 3 ? parts[3] === 'mounted' : false;
return this.configFile.remote_databases[index].mounted || false;
},
updateAlias(index, value) {
const parts = this.configFile.remote_databases[index].split('::');
parts[0] = value;
this.configFile.remote_databases[index] = parts.join('::');
this.settingsChanged = true;
},
updateDatabaseType(index, value) {
const parts = this.configFile.remote_databases[index].split('::');
parts[1] = value;
this.configFile.remote_databases[index] = parts.join('::');
this.settingsChanged = true;
},
updateDatabaseUrl(index, value) {
const parts = this.configFile.remote_databases[index].split('::');
parts[2] = value;
this.configFile.remote_databases[index] = parts.join('::');
this.settingsChanged = true;
},
updateMounted(index, value) {
const parts = this.configFile.remote_databases[index].split('::');
if (value) {
parts[3] = 'mounted';
} else {
parts.length = 3; // Remove mounted part if exists
}
this.configFile.remote_databases[index] = parts.join('::');
this.configFile.remote_databases[index].alias = value;
this.settingsChanged = true;
},
updateDatabaseType(index, value) {
this.configFile.remote_databases[index].type = value;
this.settingsChanged = true;
},
updateDatabaseUrl(index, value) {
this.configFile.remote_databases[index].url = value;
this.settingsChanged = true;
},
updateDatabaseKey(index, value) {
this.configFile.remote_databases[index].key = value;
this.settingsChanged = true;
},
updateMounted(index, value) {
this.configFile.remote_databases[index].mounted = value;
this.settingsChanged = true;
},
addDatabaseService() {
if (!this.configFile.remote_databases) {
this.configFile.remote_databases = [];
}
// Add new entry with default values including alias
this.configFile.remote_databases.push("new_database::lightrag::http://localhost:9621/");
// Add new entry as an object with default values
this.configFile.remote_databases.push({
alias: "new_database",
is_local: false, // this is a remote database
type: "lightrag",
url: "http://localhost:9621/",
key: "",
mounted: false
});
this.settingsChanged = true;
},
@ -4621,35 +4632,53 @@ export default {
await store.dispatch('refreshVramUsage');
},
addDataSource() {
this.$store.state.config.rag_databases.push('');
this.settingsChanged = true;
// Add new database entry with default values
this.$store.state.config.rag_databases.push({
alias: '', // Empty name initially
is_local: true, // this is a local database
path: '', // Empty path initially
mounted: false, // Not mounted by default
key: '' // No key for local databases
});
this.settingsChanged = true;
},
removeDataSource(index) {
this.$store.state.config.rag_databases.splice(index, 1);
this.settingsChanged = true;
},
async vectorize_folder(index){
await axios.post('/vectorize_folder', {client_id:this.$store.state.client_id, db_path:this.$store.state.config.rag_databases[index]}, this.posts_headers)
},
async select_folder(index){
try{
socket.on("rag_db_added", (infos)=>{
},
async select_folder(index) {
try {
socket.on("rag_db_added", (infos) => {
console.log(infos)
if (infos){
this.$store.state.config.rag_databases[index]=`${infos["database_name"]}::${infos["database_path"]}`
this.settingsChanged=true;
}
else{
if (infos) {
// Update with new dictionary structure
this.$store.state.config.rag_databases[index] = {
alias: infos["database_name"],
is_local: true,
path: infos["database_path"],
mounted: false,
key: ''
};
this.settingsChanged = true;
} else {
this.$store.state.toast.showToast("Failed to select a folder", 4, false)
}
});
await axios.post('/add_rag_database', {client_id:this.$store.state.client_id}, this.posts_headers)
}
catch{
await axios.post('/add_rag_database',
{ client_id: this.$store.state.client_id },
this.posts_headers
)
} catch {
this.$store.state.toast.showToast("Failed to select a folder", 4, false)
}
},
handleTemplateSelection(event) {
console.log("handleTemplateSelection")
const selectedOption = event.target.value;

2
zoos/bindings_zoo

@ -1 +1 @@
Subproject commit 2411827109f040abf842285ff021e5cd5bd175df
Subproject commit dee02f9dffd1842e2ef87a7c3b0cd07f1e284896

2
zoos/personalities_zoo

@ -1 +1 @@
Subproject commit 5f392e553789637036ec9918bd06fa1f386b31b8
Subproject commit 5ebf88ced591c0f4b86f88b2361cbbfe4fed8d15