v1.01b

v1.01b

Author: qiacheng

.gitignore

@@ -0,0 +1 @@
+env/

WebUI/electron/electron-env.d.ts

@@ -35,6 +35,7 @@ type LocalSettings = {
   settingPath: string;
   debug: number;
   envType: string;
+  port:number;
 } & KVObject;
 
 type ModelPaths = {
@@ -57,6 +58,7 @@ type ModelLists = {
 } & { [key: string]: Array<string> }
 
 type SetupData = {
+  apiHost:string,
   modelPaths: ModelPaths,
   modelLists: ModelLists,
   envType: string,

WebUI/electron/main.ts

@@ -67,7 +67,8 @@ const settings: LocalSettings = {
   settingPath: "",
   isAdminExec: false,
   debug: 0,
-  envType: "ultra"
+  envType: "ultra",
+  port: 59999
 };
 
 
@@ -86,6 +87,7 @@ function loadSettings() {
       }
     });
   }
+  settings.apiHost = `http://127.0.0.1:${settings.port}`;
 }
 
 async function createWindow() {
@@ -263,14 +265,14 @@ function initEventHandle() {
   ipcMain.handle(
     "restorePathsSettings",
     (event: IpcMainInvokeEvent) => {
-      const paths = app.isPackaged ?  {
+      const paths = app.isPackaged ? {
         "llm": "./resources/service/models/llm/checkpoints",
         "embedding": "./resources/service/models/llm/embedding",
         "stableDiffusion": "./resources/service/models/stable_diffusion/checkpoints",
         "inpaint": "./resources/service/models/stable_diffusion/inpaint",
         "lora": "./resources/service/models/stable_diffusion/lora",
         "vae": "./resources/service/models/stable_diffusion/vae"
-      }:{
+      } : {
         "llm": "../service/models/llm/checkpoints",
         "embedding": "../service/models/llm/embedding",
         "stableDiffusion": "../service/models/stable_diffusion/checkpoints",
@@ -362,11 +364,12 @@ function initEventHandle() {
     const win = BrowserWindow.fromWebContents(event.sender);
     if (!win) { return; }
     return {
+      apiHost:settings.apiHost,
       modelLists: pathsManager.sacanAll(),
       modelPaths: pathsManager.modelPaths,
       envType: settings.envType,
       isAdminExec: settings.isAdminExec,
-      version :app.getVersion()
+      version: app.getVersion()
     };
 
   });
@@ -451,25 +454,27 @@ function isProcessRunning(pid: number) {
 function wakeupApiService() {
   const wordkDir = path.resolve(app.isPackaged ? path.join(process.resourcesPath, "service") : path.join(__dirname, "../../../service"));
   const baseDir = app.isPackaged ? process.resourcesPath : path.join(__dirname, "../../../");
-  const pytonExe = path.resolve(path.join(baseDir, "env/python.exe"));
+  const pythonExe = path.resolve(path.join(baseDir, "env/python.exe"));
   const newEnv = {
     "SYCL_ENABLE_DEFAULT_CONTEXTS": "1",
     "SYCL_CACHE_PERSISTENT": "1",
     "PYTHONIOENCODING": "utf-8"
   };
 
-  const options = settings.debug ? {
-    cwd: wordkDir,
-    detached: true,
-    windowsHide: false,
-    env: Object.assign(process.env, newEnv)
-  } : {
-    cwd: wordkDir,
-    windowsHide: true,
-    env: Object.assign(process.env, newEnv)
+  if (settings.debug) {
+    apiService.webProcess = spawn("cmd.exe", ["/c", pythonExe, "web_api.py", "--port", settings.port.toString()], {
+      cwd: wordkDir,
+      detached: true,
+      windowsHide: false,
+      env: Object.assign(process.env, newEnv)
+    });
+  } else {
+    apiService.webProcess = spawn(pythonExe, ["web_api.py", "--port", settings.port.toString()], {
+      cwd: wordkDir,
+      windowsHide: true,
+      env: Object.assign(process.env, newEnv)
+    });
   }
-
-  apiService.webProcess = spawn("cmd.exe", ["/c", pytonExe, "web_api.py"], options);
 }
 
 function closeApiService() {
@@ -584,4 +589,4 @@ app.whenReady().then(async () => {
     createWindow();
     wakeupApiService();
   }
-});
+});

WebUI/external/settings-dev.json

@@ -1,4 +1,5 @@
 {
     "envType": "arc",
-    "debug":1
+    "debug":1,
+    "port":56789
 }