setupcomfyuimodels 1.0.3 → 1.2.0

package/dist/index.js

@@ -1189,8 +1189,8 @@ var require_command = __commonJS({
   "node_modules/commander/lib/command.js"(exports2) {
     var EventEmitter = require("node:events").EventEmitter;
     var childProcess = require("node:child_process");
-    var path2 = require("node:path");
-    var fs2 = require("node:fs");
+    var path3 = require("node:path");
+    var fs3 = require("node:fs");
     var process3 = require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -2184,7 +2184,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} subcommandName
        */
       _checkForMissingExecutable(executableFile, executableDir, subcommandName) {
-        if (fs2.existsSync(executableFile)) return;
+        if (fs3.existsSync(executableFile)) return;
         const executableDirMessage = executableDir ? `searched for local subcommand relative to directory '${executableDir}'` : "no directory for search for local subcommand, use .executableDir() to supply a custom directory";
         const executableMissing = `'${executableFile}' does not exist
  - if '${subcommandName}' is not meant to be an executable command, remove description parameter from '.command()' and use '.description()' instead
@@ -2202,11 +2202,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path2.resolve(baseDir, baseName);
-          if (fs2.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path2.extname(baseName))) return void 0;
+          const localBin = path3.resolve(baseDir, baseName);
+          if (fs3.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path3.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext) => fs2.existsSync(`${localBin}${ext}`)
+            (ext) => fs3.existsSync(`${localBin}${ext}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -2218,21 +2218,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs2.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs3.realpathSync(this._scriptPath);
           } catch {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path2.resolve(
-            path2.dirname(resolvedScriptPath),
+          executableDir = path3.resolve(
+            path3.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path2.basename(
+            const legacyName = path3.basename(
               this._scriptPath,
-              path2.extname(this._scriptPath)
+              path3.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -2243,7 +2243,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path2.extname(executableFile));
+        launchWithNode = sourceExt.includes(path3.extname(executableFile));
         let proc;
         if (process3.platform !== "win32") {
           if (launchWithNode) {
@@ -3158,7 +3158,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path2.basename(filename, path2.extname(filename));
+        this._name = path3.basename(filename, path3.extname(filename));
         return this;
       }
       /**
@@ -3172,9 +3172,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path3) {
-        if (path3 === void 0) return this._executableDir;
-        this._executableDir = path3;
+      executableDir(path4) {
+        if (path4 === void 0) return this._executableDir;
+        this._executableDir = path4;
         return this;
       }
       /**
@@ -12079,10 +12079,10 @@ var require_stringify = __commonJS({
       replacer = null;
       indent = EMPTY;
     };
-    var join = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + LF + gap : two ? two.trimRight() + LF + gap : EMPTY;
+    var join2 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + LF + gap : two ? two.trimRight() + LF + gap : EMPTY;
     var join_content = (inside, value, gap) => {
       const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-      return join(comment, inside, gap);
+      return join2(comment, inside, gap);
     };
     var array_stringify = (value, gap) => {
       const deeper_gap = gap + indent;
@@ -12093,7 +12093,7 @@ var require_stringify = __commonJS({
         if (i !== 0) {
           inside += COMMA;
         }
-        const before = join(
+        const before = join2(
           after_comma,
           process_comments(value, BEFORE(i), deeper_gap),
           deeper_gap
@@ -12103,7 +12103,7 @@ var require_stringify = __commonJS({
         inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
         after_comma = process_comments(value, AFTER(i), deeper_gap);
       }
-      inside += join(
+      inside += join2(
         after_comma,
         process_comments(value, PREFIX_AFTER, deeper_gap),
         deeper_gap
@@ -12128,7 +12128,7 @@ var require_stringify = __commonJS({
           inside += COMMA;
         }
         first = false;
-        const before = join(
+        const before = join2(
           after_comma,
           process_comments(value, BEFORE(key), deeper_gap),
           deeper_gap
@@ -12138,7 +12138,7 @@ var require_stringify = __commonJS({
         after_comma = process_comments(value, AFTER(key), deeper_gap);
       };
       keys.forEach(iteratee);
-      inside += join(
+      inside += join2(
         after_comma,
         process_comments(value, PREFIX_AFTER, deeper_gap),
         deeper_gap
@@ -12494,14 +12494,6 @@ var stopProgressBar = () => {
   multibar.stop();
 };
 
-// src/getConfig.ts
-var import_fs = require("fs");
-var import_comment_json = __toESM(require_src2());
-var getConfig = async (configLocation) => {
-  const fileContent = (0, import_fs.readFileSync)(configLocation, "utf-8");
-  return (0, import_comment_json.parse)(fileContent);
-};
-
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
 var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
@@ -12998,21 +12990,29 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/downloadAssets.ts
-var { WORKSPACE, CIVITAI_TOKEN, HF_TOKEN } = process.env;
-if (!WORKSPACE) {
-  throw new Error("WORKSPACE environment variable is not set.");
-}
+var { CIVITAI_TOKEN, HF_TOKEN } = process.env;
 var MAX_CONCURRENT_DOWNLOADS = 8;
 var concurrentDownloads = 0;
-var downloadAssets = async (configLocation) => {
-  const config = await getConfig(configLocation);
+var downloadAssets = async (config, targetFolder) => {
+  const filesConfigs = [
+    config.files,
+    ...Object.entries(config.groups).filter(([groupName]) => config.groupsEnabled[groupName]).map(([_, f]) => f.files)
+  ];
+  const foldersConfigs = [
+    config.folders,
+    ...Object.entries(config.groups).filter(([groupName]) => config.groupsEnabled[groupName]).map(([_, f]) => f.folders)
+  ];
   const filePromises = [
-    ...Object.entries(config.files).map(([targetLocation, url]) => {
-      const fileName = import_path.default.basename(targetLocation), dir = import_path.default.dirname(targetLocation);
-      return scheduleDownload(dir, fileName, url);
-    }),
-    ...Object.entries(config.folders).flatMap(
-      ([folder, urls]) => urls.map((url) => scheduleDownload(folder, null, url))
+    ...filesConfigs.flatMap(
+      (config2) => Object.entries(config2.files).map(([targetLocation, url]) => {
+        const fileName = import_path.default.basename(targetLocation), dir = import_path.default.dirname(targetLocation);
+        return scheduleDownload(targetFolder, dir, fileName, url);
+      })
+    ),
+    ...foldersConfigs.flatMap(
+      (config2) => Object.entries(config2).flatMap(
+        ([folder, urls]) => urls.map((url) => scheduleDownload(targetFolder, folder, null, url))
+      )
     )
   ];
   setTotalProgress(0, filePromises.length);
@@ -13035,7 +13035,18 @@ var downloadAssets = async (configLocation) => {
 };
 var scheduledDownloads = [];
 var results = [];
-var scheduleDownload = async (targetLocation, targetFileName, url) => {
+var scheduleDownload = async (globalTargetLocation, targetLocation, targetFileName, url) => {
+  const matchingJob = scheduledDownloads.find(
+    (d) => d.targetLocation === targetLocation && d.targetFileName === targetFileName
+  );
+  if (matchingJob) {
+    if (matchingJob.url !== url) {
+      throw new Error(
+        `Conflicting download jobs for ${targetLocation}/${targetFileName || ""}: ${matchingJob.url} and ${url}`
+      );
+    }
+    return;
+  }
   scheduledDownloads.push({ targetLocation, url, targetFileName });
   if (concurrentDownloads < MAX_CONCURRENT_DOWNLOADS) {
     while (scheduledDownloads.length > 0) {
@@ -13044,6 +13055,7 @@ var scheduleDownload = async (targetLocation, targetFileName, url) => {
         concurrentDownloads++;
         try {
           const skipped = await downloadFile(
+            globalTargetLocation,
             nextDownload.targetLocation,
             nextDownload.targetFileName,
             nextDownload.url
@@ -13065,10 +13077,12 @@ var scheduleDownload = async (targetLocation, targetFileName, url) => {
     }
   }
 };
-var downloadFile = async (targetLocation, targetFileName, url) => {
+var downloadFile = async (globalTargetLocation, targetLocation, targetFileName, url) => {
   const getTargetId = () => import_path.default.join(targetLocation, targetFileName || "");
   try {
-    const targetDir = import_path.default.normalize(`${WORKSPACE}/models/${targetLocation}`);
+    const targetDir = import_path.default.normalize(
+      `${globalTargetLocation}/${targetLocation}`
+    );
     fs.mkdirSync(targetDir, { recursive: true });
     if (targetFileName && fs.existsSync(import_path.default.join(targetDir, targetFileName))) {
       log2(`File already exists, skipping: ${getTargetId()}`);
@@ -13133,11 +13147,54 @@ var downloadFile = async (targetLocation, targetFileName, url) => {
   }
 };
 
+// src/replacements.ts
+var fs2 = __toESM(require("fs"));
+var path2 = __toESM(require("path"));
+var replaceInFiles = (config, targetFolder) => {
+  const replacements = config.replacements || [];
+  for (const replacement of replacements) {
+    const filePath = path2.join(targetFolder, replacement.file);
+    if (fs2.existsSync(filePath)) {
+      let fileContent = fs2.readFileSync(filePath, "utf-8");
+      if (fileContent.includes(replacement.original)) {
+        const lines = fileContent.split("\n");
+        if (lines.length >= replacement.line && lines[replacement.line - 1].includes(replacement.original)) {
+          lines[replacement.line - 1] = lines[replacement.line - 1].replace(
+            replacement.original,
+            replacement.replacement
+          );
+          fileContent = lines.join("\n");
+        } else {
+          console.warn(
+            `Line number mismatch in ${replacement.file}. Expected line ${replacement.line} to contain the original code.`
+          );
+        }
+        fs2.writeFileSync(filePath, fileContent, "utf-8");
+        console.log(`Patched ${replacement.file} at line ${replacement.line}`);
+      } else {
+        console.warn(`Original code not found in ${replacement.file}`);
+      }
+    } else {
+      console.warn(`File not found: ${replacement.file}`);
+    }
+  }
+};
+
+// src/getConfig.ts
+var import_fs = require("fs");
+var import_comment_json = __toESM(require_src2());
+var getConfig = async (configLocation) => {
+  const fileContent = (0, import_fs.readFileSync)(configLocation, "utf-8");
+  return (0, import_comment_json.parse)(fileContent);
+};
+
 // src/index.ts
 var program2 = new Command();
 program2.name("Setup ComfyUi Models");
-program2.command("download").argument("<config>", "JSON config file location").action(async (configLocation) => {
-  await downloadAssets(configLocation);
+program2.command("download").argument("<config>", "JSON config file location").option("-l, --location <path>", "Target download location").action(async (configLocation, options) => {
+  const config = await getConfig(configLocation);
+  await downloadAssets(config, options.location || "./");
+  replaceInFiles(config, options.location || "./");
 });
 program2.parse();
 //# sourceMappingURL=index.js.map