Feat/53 support gguf download

.gitignore

@@ -1,7 +1,8 @@
 .vscode/
 env/
 package_res/
-python_package_res/
+build_resources/
+build_envs/
 release/
 WebUI/external/service/
 

WebUI/build/arc-settings.json

@@ -1,5 +1,5 @@
 {
     "envType": "arc",
-    "availableThemes": ["dark"],
-    "currentTheme": "dark"
+    "availableThemes": ["dark","lnl","bmg"],
+    "currentTheme": "bmg"
 }

WebUI/build/build-config-offline.json

@@ -21,6 +21,27 @@
         "*.bat"
       ]
     },
+    {
+      "from": "external/ComfyUI",
+      "to": "ComfyUI",
+      "filter": [
+        "**/*",
+        "!models/",
+        "!.vscode/",
+        "!__pycache__/",
+        "!test/",
+        "!db/",
+        "!cache/",
+        "!static/",
+        "!temp/",
+        "!dist/",
+        "*.bat"
+      ]
+    },
+    {
+      "from": "external/workflows",
+      "to": "workflows"
+    },
     {
       "from": "external/service/models/stable_diffusion/ESRGAN",
       "to": "service/models/stable_diffusion/ESRGAN"

WebUI/build/scripts/fetch-python-package-resources.js

@@ -2,6 +2,7 @@
 const https = require('https');
 const fs = require('fs');
 const path = require('path');
+const childProcess = require('child_process');
 
 
 const argv = require('minimist')(process.argv.slice(2));
@@ -78,12 +79,35 @@ function copyLibuvDllsIfNotPresent() {
     }
 }
 
+function fetchComfyUIIfNotPresent() {
+    const comfyUICloneDir = path.join(targetDir, 'ComfyUI')
+    if (fs.existsSync(comfyUICloneDir)) {
+        console.log(`omitting fetching of comfyUI as ${comfyUICloneDir} already exists`)
+    } else {
+        gitClone("https://github.com/comfyanonymous/ComfyUI.git", comfyUICloneDir)
+        gitClone("https://github.com/city96/ComfyUI-GGUF.git", path.join(comfyUICloneDir, 'custom_nodes', 'ComfyUI-GGUF'))
+    }
+}
+
+
+function gitClone(repoURL, targetDir) {
+    const gitClone = childProcess.spawnSync("git", ["clone", repoURL, targetDir]);
+    console.log(gitClone.stdout.toString());
+    console.error(gitClone.stderr.toString());
+    if (gitClone.status!== 0) {
+        console.error('Failed to clone repo: ', repoURL);
+        process.exit(1);
+    }
+    console.log('Successfully fetched: ', repoURL);
+}
+
 
 function main() {
     prepareTargetPath()
     fetchFileIfNotPresent(embeddablePythonUrl)
     fetchFileIfNotPresent(getPipScriptUrl)
     fetchFileIfNotPresent(sevenZrExeUrl)
+    fetchComfyUIIfNotPresent()
     copyLibuvDllsIfNotPresent()
 }
 

WebUI/build/scripts/install-full-python-env.js

@@ -8,13 +8,15 @@ const childProcess = require('child_process');
 const argv = require('minimist')(process.argv.slice(2));
 const envDirArg = argv.env_dir
 const platformArg = argv.platform
+const comfyUIDIrArg = argv.comfy_ui_dir
 
-if (!envDirArg || !platformArg) {
+if (!envDirArg || !platformArg || !comfyUIDIrArg) {
     console.error('Usage: node install-full-python-env.js --env_dir=$DIR ---platform=arc|ultra|ultra2\n');
     process.exit(1);
 }
 
 const envDir = existingFileOrExit(path.resolve(envDirArg));
+const comfyUIDIr = existingFileOrExit(path.resolve(comfyUIDIrArg));
 const platform = platformArg;
 
 function existingFileOrExit(filePath) {
@@ -29,7 +31,7 @@ function existingFileOrExit(filePath) {
 function installPip(pythonExe, getPipFilePath) {
     const runGetPip = childProcess.spawnSync(pythonExe, [getPipFilePath]);
     console.log(runGetPip.stdout.toString());
-    //console.error(runGetPip.stderr.toString());
+    console.error(runGetPip.stderr.toString());
     if (runGetPip.status!== 0) {
         console.error('Failed to install requirements');
         process.exit(1);
@@ -56,7 +58,7 @@ function copyToTargetDir(sourceDir, targetDir) {
 
 function prepareTargetDir(targetDir) {
     if (fs.existsSync(targetDir)) {
-        console.log("clearing previous env dir ${targetDir}")
+        console.log(`clearing previous env dir ${targetDir}`)
         fs.rmSync(targetDir, { recursive: true });
     }
 }
@@ -72,10 +74,15 @@ function main() {
 
     const platformSpecificRequirementsTxt = existingFileOrExit(path.join(__dirname, '..', '..','..', 'service', `requirements-${platform}.txt`));
     const requirementsTxt = existingFileOrExit(path.join(__dirname, '..', '..', '..', 'service', `requirements.txt`));
+    const comfyUiRequirementsTxt = existingFileOrExit(path.join(comfyUIDIr, `requirements.txt`));
+    const ggufCostomNoderequirementsTxt = existingFileOrExit(path.join(comfyUIDIr, 'custom_nodes', 'ComfyUI-GGUF', `requirements.txt`));
+
 
     installPip(pythonExe, getPipFile)
     runPipInstall(pythonExe, platformSpecificRequirementsTxt)
     runPipInstall(pythonExe, requirementsTxt)
+    runPipInstall(pythonExe, comfyUiRequirementsTxt)
+    runPipInstall(pythonExe, ggufCostomNoderequirementsTxt)
 }
 
 main();

WebUI/build/scripts/prepare-python-env.js

@@ -71,6 +71,7 @@ function createPythonEnvFromEmbedabblePythonZip(targetDir, pythonEmbedZipFile) {
 python311.zip
 .
 ../service
+../ComfyUI
 
 # Uncomment to run site.main() automatically
 import site

WebUI/build/scripts/provide-electron-build-resources.js

@@ -48,14 +48,20 @@ function zipPythonEnv(sevenZipExe, pythonEnvDir, targetPath) {
     console.log('Offline env has been compressed to:', targetPath);
 }
 
-function copyResources(targetDir, ...files) {
+function copyFiles(targetDir, ...files) {
     for (const file of files) {
-        console.log(file)
         fs.copyFileSync(file, path.join(targetDir, path.basename(file)));
         console.log('Copied:', file, 'to:', path.join(targetDir, path.basename(file)));
     }
 }
 
+function copyDirectories(targetDir, ...dirs) {
+    for (const dir of dirs) {
+        fs.cpSync(dir, path.join(targetDir, path.basename(dir)), { recursive: true });
+        console.log('Copied:', dir, 'to:', path.join(targetDir, path.basename(dir)));
+    }
+}
+
 function clearPreviousZip(zipFilePath) {
     if
     (fs.existsSync(zipFilePath)) {
@@ -66,14 +72,19 @@ function clearPreviousZip(zipFilePath) {
 
 function main() {
     const sevenZipExe = path.join(buildResourcesDir, '7zr.exe');
+    const comfyUI = path.join(buildResourcesDir, 'ComfyUI');
 
     clearPreviousZip(path.join(targetDir, `env.7z`));
     zipPythonEnv(sevenZipExe, pythenEnvDir, path.join(targetDir, `env.7z`));
 
     symlinkBackendDir(backendDir, path.join(targetDir, 'service'))
-    copyResources(targetDir,
+    copyFiles(targetDir,
         sevenZipExe
     )
+
+    copyDirectories(targetDir,
+        comfyUI
+    )
 }
 
 main()

WebUI/external/workflows/fluxQ4.json

@@ -5,6 +5,12 @@
         "Q4",
         "Fast"
     ],
+    "requiredModels": [
+        "unet:city96/FLUX.1-schnell-gguf/flux1-schnell-Q4_K_S.gguf",
+        "clip:city96/t5-v1_1-xxl-encoder-gguf/t5-v1_1-xxl-encoder-Q3_K_M.gguf",
+        "clip:comfyanonymous/flux_text_encoders/clip_l.safetensors",
+        "vae:black-forest-labs/FLUX.1-schnell/ae.safetensors"
+    ],
     "requirements": [
         "high-vram"
     ],
@@ -72,7 +78,7 @@
         },
         "170": {
             "inputs": {
-                "unet_name": "flux1-schnell-Q4_K_S.gguf"
+                "unet_name": "city96---FLUX.1-schnell-gguf\\flux1-schnell-Q4_K_S.gguf"
             },
             "class_type": "UnetLoaderGGUF",
             "_meta": {
@@ -81,7 +87,7 @@
         },
         "171": {
             "inputs": {
-                "vae_name": "ae.safetensors"
+                "vae_name": "black-forest-labs/FLUX.1-schnell\\ae.safetensors"
             },
             "class_type": "VAELoader",
             "_meta": {
@@ -192,8 +198,8 @@
         },
         "188": {
             "inputs": {
-                "clip_name1": "t5-v1_1-xxl-encoder-Q3_K_M.gguf",
-                "clip_name2": "clip_l.safetensors",
+                "clip_name1": "city96---t5-v1_1-xxl-encoder-gguf\\t5-v1_1-xxl-encoder-Q3_K_M.gguf",
+                "clip_name2": "comfyanonymous---flux_text_encoders\\clip_l.safetensors",
                 "type": "flux"
             },
             "class_type": "DualCLIPLoaderGGUF",

WebUI/external/workflows/fluxQ8.json

@@ -5,6 +5,12 @@
         "Q8",
         "Fast"
     ],
+    "requiredModels": [
+        "unet:city96/FLUX.1-schnell-gguf/flux1-schnell-Q8_0.gguf",
+        "clip:city96/t5-v1_1-xxl-encoder-gguf/t5-v1_1-xxl-encoder-Q3_K_M.gguf",
+        "clip:comfyanonymous/flux_text_encoders/clip_l.safetensors",
+        "vae:black-forest-labs/FLUX.1-schnell/ae.safetensors"
+    ],
     "requirements": [
         "high-vram"
     ],
@@ -72,7 +78,7 @@
         },
         "170": {
             "inputs": {
-                "unet_name": "flux1-schnell-Q8_0.gguf"
+                "unet_name": "city96---FLUX.1-schnell-gguf\\flux1-schnell-Q8_0.gguf"
             },
             "class_type": "UnetLoaderGGUF",
             "_meta": {
@@ -81,7 +87,7 @@
         },
         "171": {
             "inputs": {
-                "vae_name": "ae.safetensors"
+                "vae_name": "black-forest-labs---FLUX.1-schnell\\ae.safetensors"
             },
             "class_type": "VAELoader",
             "_meta": {
@@ -192,8 +198,8 @@
         },
         "188": {
             "inputs": {
-                "clip_name1": "t5-v1_1-xxl-encoder-Q3_K_M.gguf",
-                "clip_name2": "clip_l.safetensors",
+                "clip_name1": "city96---t5-v1_1-xxl-encoder-gguf\\t5-v1_1-xxl-encoder-Q3_K_M.gguf",
+                "clip_name2": "comfyanonymous---flux_text_encoders\\clip_l.safetensors",
                 "type": "flux"
             },
             "class_type": "DualCLIPLoaderGGUF",