initChatBookDbExec

chatbookai · Jun 1, 2024 · 1b28d3f · 1b28d3f
1 parent e669341
commit 1b28d3f
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 104 deletions.
diff --git a/express/main.js b/express/main.js
@@ -3,7 +3,7 @@ import isDev from 'electron-is-dev'
 import settings from 'electron-settings';
 
 import { server, getPort } from './src/app.js';
-import { initChatBookSetting, initChatBookDbExec } from './src/utils/db.js';
+import { initChatBookSetting, ChatBookDbInit } from './src/utils/db.js';
 
 const PORT = getPort();
 
@@ -26,8 +26,8 @@ function createMainWindow() {
   ipcMain.on('start-chatbook', async (event, data) => {
     ChatBookSetting = await settings.get('chatbook');
     console.log("ChatBookSetting main.js", ChatBookSetting)
-    await initChatBookSetting(ChatBookSetting);
-    await initChatBookDbExec();
+    initChatBookSetting(ChatBookSetting);
+    ChatBookDbInit();
     mainWindow.loadURL('http://localhost:' + PORT);
   });
 

diff --git a/express/src/app.js b/express/src/app.js
@@ -6,7 +6,7 @@ import cron from 'node-cron';
 import dotenv from 'dotenv';
 import { dirname, join } from 'path';
 
-import { initChatBookDbExec } from './utils/db.js';
+import { ChatBookDbInit, initChatBookSetting } from './utils/db.js';
 import { parseFilesAndWeb, vectorDdProcess } from './utils/llms.js';
 
 //import { downloadVideoFromAPI } from './utils/Backup/stability.js';
@@ -32,9 +32,17 @@ app.use(cors());
 app.use(bodyParser.json());
 dotenv.config();
 
-
 //Initial Database and Folder
-initChatBookDbExec()
+
+function isElectron() {
+  return typeof process !== 'undefined' && !!(process.versions).electron;
+}
+
+//Running in express, not in electron
+if(isElectron() == false) {
+  initChatBookSetting({NodeStorageDirectory: './data'})
+  ChatBookDbInit()
+}
 
 //Schedule Task for Parse Upload Files
 cron.schedule('*/3 * * * *', () => {

diff --git a/express/src/utils/app.js b/express/src/utils/app.js
@@ -1,9 +1,9 @@
 
-import { initChatBookDb } from './db.js'
+import { ChatBookDbPool } from './db.js'
 import { filterString, log, getNanoid } from './utils.js'
 
   export async function addApp(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       console.log("ParamsParamsParamsParamsParams", Params)
@@ -32,7 +32,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function editApp(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -60,7 +60,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function editAppById(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -87,7 +87,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deleteApp(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params.appId)
@@ -105,7 +105,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deleteAppById(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -123,7 +123,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getApp(id, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const idFilter = filterString(id)
 
@@ -141,7 +141,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getAppById(_id, id) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const _idFilter = filterString(_id)
     const idFilter = filterString(id)
@@ -160,7 +160,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getAppByPublishId(id) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const idFilter = filterString(id)
 
@@ -183,7 +183,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getAppPage(pageid, pagesize, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
     const pagesizeFiler = Number(pagesize) < 5 ? 5 : pagesize;
@@ -207,7 +207,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getAppPageAll(pageid, pagesize, data) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
     const pagesizeFiler = Number(pagesize) < 5 ? 5 : pagesize;
@@ -251,7 +251,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getChatlogPageByApp(appId, pageid, pagesize, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const appIdFileter = filterString(appId)
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
@@ -276,7 +276,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getChatlogStaticPageByApp(appId, pageid, pagesize) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const appIdFileter = filterString(appId)
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
@@ -314,7 +314,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getPublishsPageByApp(appId, pageid, pagesize, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const appIdFileter = filterString(appId)
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
@@ -339,7 +339,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getPublishsAll(pageid, pagesize) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
     const pagesizeFiler = Number(pagesize) < 5 ? 5 : pagesize;
@@ -366,7 +366,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function addPublish(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = getNanoid(32)
@@ -404,7 +404,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function editPublish(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -431,7 +431,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deletePublish(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -451,7 +451,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getPublish(id, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const idFilter = filterString(id)
     const userIdFilter = Number(userId)
@@ -469,7 +469,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getChatLogByAppIdAndUserId(appId, userId, pageid, pagesize) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const appIdFiler = filterString(appId);
     const userIdFiler = filterString(userId);
@@ -495,7 +495,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deleteUserLogByAppId(appId, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const UpdateChatLog = db.prepare("update chatlog set current = 0 where appId = ? and userId = ?");
     UpdateChatLog.run(appId, userId);
@@ -505,7 +505,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deleteUserLogByChatlogId(appId, userId, id) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const UpdateChatLog = db.prepare("delete from chatlog where appId = ? and userId = ? and _id = ?");
     UpdateChatLog.run(appId, userId, id);

diff --git a/express/src/utils/dataset.js b/express/src/utils/dataset.js
@@ -1,10 +1,10 @@
 
-import { initChatBookDb } from './db.js'
+import { ChatBookDbPool } from './db.js'
 import { filterString, log, getNanoid } from './utils.js'
 
 
   export async function addDataset(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -29,7 +29,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function editDataset(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -54,7 +54,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deleteDataset(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params.datasetId)
@@ -72,7 +72,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getDataset(id, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const idFilter = filterString(id)
     const userIdFilter = Number(userId)
@@ -90,7 +90,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getDatasetPage(pageid, pagesize, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
     const pagesizeFiler = Number(pagesize) < 5 ? 5 : pagesize;
@@ -114,7 +114,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getCollectionPageByDataset(datasetId, pageid, pagesize, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const datasetIdFileter = filterString(datasetId)
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
@@ -139,7 +139,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getCollectionAll(pageid, pagesize) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const pageidFiler = Number(pageid) < 0 ? 0 : pageid;
     const pagesizeFiler = Number(pagesize) < 5 ? 5 : pagesize;
@@ -166,7 +166,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function addCollection(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = getNanoid(32)
@@ -202,7 +202,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function editCollection(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -227,7 +227,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function uploadCollection(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       const type = filterString(Params.type)
@@ -282,7 +282,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function deleteCollection(Params) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     try{
       Params._id = filterString(Params._id)
@@ -301,7 +301,7 @@ import { filterString, log, getNanoid } from './utils.js'
   }
 
   export async function getCollection(id, userId) {
-    const { DataDir, db, getDbRecord, getDbRecordALL } = initChatBookDb()
+    const { DataDir, db, getDbRecord, getDbRecordALL } = ChatBookDbPool()
 
     const idFilter = filterString(id)
     const userIdFilter = Number(userId)