nai-aclab 1.0.6 → 1.0.7

package/bin/nai-artist-lab.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { spawn } = require("child_process");
+const { spawn, spawnSync } = require("child_process");
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
@@ -58,19 +58,60 @@ function pythonCandidates() {
   return candidates;
 }
 
-function runWithCandidate(candidates, index) {
-  if (index >= candidates.length) {
-    console.error("Python 3.10+을 찾을 수 없습니다. Python을 설치한 뒤 다시 실행해주세요.");
+function versionParts(text) {
+  const match = String(text || "").match(/(\d+)\.(\d+)\.(\d+)/);
+  if (!match) {
+    return null;
+  }
+  return match.slice(1).map((part) => Number(part));
+}
+
+function supportsPython(candidate) {
+  const probe = spawnSync(
+    candidate.command,
+    [
+      ...candidate.args,
+      "-c",
+      "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}')",
+    ],
+    {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
+      windowsHide: true,
+    }
+  );
+
+  if (probe.error || probe.status !== 0) {
+    return false;
+  }
+
+  const parts = versionParts(probe.stdout);
+  if (!parts) {
+    return false;
+  }
+
+  const [major, minor] = parts;
+  return major > 3 || (major === 3 && minor >= 10);
+}
+
+function choosePython() {
+  return pythonCandidates().find((candidate) => supportsPython(candidate));
+}
+
+function runWithCandidate(candidate) {
+  if (!candidate) {
+    console.error("Python 3.10 or newer was not found.");
+    console.error("Install Python from https://www.python.org/downloads/ and run npx nai-aclab again.");
     process.exit(1);
   }
 
-  const candidate = candidates[index];
   const env = {
     ...process.env,
     NAI_ARTIST_LAB_USER_DIR: userDataDir(),
   };
 
   fs.mkdirSync(env.NAI_ARTIST_LAB_USER_DIR, { recursive: true });
+  console.log(`Starting NAI Artist Combination Lab ${packageJson.version}...`);
 
   const child = spawn(candidate.command, [...candidate.args, launcherPath], {
     cwd: rootDir,
@@ -79,21 +120,12 @@ function runWithCandidate(candidates, index) {
     windowsHide: false,
   });
 
-  let failedToStart = false;
   child.on("error", (error) => {
-    failedToStart = true;
-    if (error.code === "ENOENT") {
-      runWithCandidate(candidates, index + 1);
-      return;
-    }
     console.error(error.message);
     process.exit(1);
   });
 
   child.on("exit", (code, signal) => {
-    if (failedToStart) {
-      return;
-    }
     if (signal) {
       process.kill(process.pid, signal);
       return;
@@ -112,4 +144,4 @@ if (process.argv.includes("--version") || process.argv.includes("-v")) {
   process.exit(0);
 }
 
-runWithCandidate(pythonCandidates(), 0);
+runWithCandidate(choosePython());

package/launcher.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
 
+import os
 import socket
+import subprocess
+import sys
 import webbrowser
 from http.server import ThreadingHTTPServer
 
@@ -21,14 +24,39 @@ def find_port(start: int = 8777) -> int:
     raise RuntimeError("No available local port found.")
 
 
+def open_browser(url: str) -> bool:
+    if os.environ.get("NAI_ARTIST_LAB_NO_BROWSER", "").lower() in {"1", "true", "yes"}:
+        return False
+
+    try:
+        if sys.platform.startswith("win"):
+            os.startfile(url)  # type: ignore[attr-defined]
+            return True
+        if sys.platform == "darwin":
+            subprocess.Popen(["open", url], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+            return True
+        subprocess.Popen(["xdg-open", url], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        return True
+    except Exception:
+        pass
+
+    try:
+        return bool(webbrowser.open(url, new=2))
+    except Exception:
+        return False
+
+
 def main() -> None:
     port = find_port()
     server = ThreadingHTTPServer(("127.0.0.1", port), Handler)
     url = f"http://127.0.0.1:{port}/"
 
-    webbrowser.open(url)
-    print(f"{APP_NAME} is running at {url}")
-    print("Keep this terminal open while using the app. Press Ctrl+C to stop.")
+    print(f"{APP_NAME} is running at {url}", flush=True)
+    print("Keep this terminal open while using the app. Press Ctrl+C to stop.", flush=True)
+    if open_browser(url):
+        print("Opening your browser now...", flush=True)
+    else:
+        print("Could not open a browser automatically. Copy and paste the URL above into your browser.", flush=True)
 
     try:
         server.serve_forever()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nai-aclab",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Local web UI for experimenting with NovelAI artist tag weight combinations.",
   "license": "MIT",
   "type": "commonjs",