windmill-cli 1.672.0 → 1.673.0

package/esm/main.js

@@ -11812,7 +11812,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv2("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.672.0",
+    VERSION: "1.673.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -12210,6 +12210,7 @@ __export(exports_services_gen, {
   resumeSuspendedFlowAsOwner: () => resumeSuspendedFlowAsOwner,
   resumeSuspended: () => resumeSuspended,
   resultById: () => resultById,
+  restartWorkerGroup: () => restartWorkerGroup,
   restartFlowAtStep: () => restartFlowAtStep,
   resolveNpmPackageVersion: () => resolveNpmPackageVersion,
   resetPassword: () => resetPassword,
@@ -13168,6 +13169,14 @@ var backendVersion = () => {
     method: "POST",
     url: "/settings/send_stats"
   });
+}, restartWorkerGroup = (data2) => {
+  return request(OpenAPI, {
+    method: "POST",
+    url: "/settings/restart_worker_group/{worker_group}",
+    path: {
+      worker_group: data2.workerGroup
+    }
+  });
 }, getStats = () => {
   return request(OpenAPI, {
     method: "GET",
@@ -59809,6 +59818,19 @@ async function track_job(workspace, id) {
     info("Job appears to have completed, but no data can be retrieved");
   }
 }
+async function pollForJobResult(workspace, jobId) {
+  while (true) {
+    const maybeResult = await getCompletedJobResultMaybe({
+      workspace,
+      id: jobId,
+      getStarted: false
+    });
+    if (maybeResult.completed) {
+      return { result: maybeResult.result, success: maybeResult.success ?? false };
+    }
+    await new Promise((resolve7) => setTimeout(resolve7, POLL_INTERVAL_MS));
+  }
+}
 async function show(opts, path6) {
   const workspace = await resolveWorkspace(opts);
   await requireLogin(opts);
@@ -60081,7 +60103,7 @@ async function preview(opts, filePath) {
       }
     }
   } else {
-    const result = await runScriptPreviewAndWaitResult({
+    const jobId = await runScriptPreview({
       workspace: workspace.workspaceId,
       requestBody: {
         content,
@@ -60091,8 +60113,19 @@ async function preview(opts, filePath) {
         modules: modules ?? undefined
       }
     });
+    const { result, success } = await pollForJobResult(workspace.workspaceId, jobId);
+    if (!success) {
+      if (opts.silent) {
+        console.log(JSON.stringify(result));
+      } else {
+        info(colors.red.bold("Preview failed"));
+        info(JSON.stringify(result, null, 2));
+      }
+      process.exitCode = 1;
+      return;
+    }
     if (opts.silent) {
-      console.log(JSON.stringify(result, null, 2));
+      console.log(JSON.stringify(result));
     } else {
       info(colors.bold.underline.green("Preview completed"));
       info(JSON.stringify(result, null, 2));
@@ -60124,7 +60157,7 @@ async function history(opts, scriptPath) {
     ])).render();
   }
 }
-var import_yaml5, exts, languageAliases, command3, script_default;
+var import_yaml5, exts, POLL_INTERVAL_MS = 2000, languageAliases, command3, script_default;
 var init_script = __esm(async () => {
   init_colors2();
   init_mod3();
@@ -63310,9 +63343,22 @@ Push aborted: ${lockIssues.length} script(s) missing locks.`));
       }
     }
     for (const folderName of folderNames) {
-      try {
-        await stat6(path8.join("f", folderName, "folder.meta.yaml"));
-      } catch {
+      const basePath = path8.join("f", folderName, "folder.meta.yaml");
+      const branchPath = getBranchSpecificPath(`f/${folderName}/folder.meta.yaml`, specificItems, opts.branch);
+      let found = false;
+      if (branchPath) {
+        try {
+          await stat6(branchPath);
+          found = true;
+        } catch {}
+      }
+      if (!found) {
+        try {
+          await stat6(basePath);
+          found = true;
+        } catch {}
+      }
+      if (!found) {
         missingFolders.push(folderName);
       }
     }
@@ -64733,8 +64779,8 @@ async function parseMetadataFile(scriptPath, generateMetadataIfMissing) {
       }
     }
   }
-  info((await blueColor())(`Creating script metadata file for ${metadataFilePath}`));
   metadataFilePath = scriptPath + ".script.yaml";
+  info((await blueColor())(`Creating script metadata file for ${metadataFilePath}`));
   let scriptInitialMetadata = defaultScriptMetadata();
   const lockPath = scriptPath + ".script.lock";
   scriptInitialMetadata.lock = "!inline " + lockPath;
@@ -71368,30 +71414,24 @@ async function preview2(opts, flowPath) {
     info(colors.yellow(`Running flow preview for ${flowPath}...`));
   }
   debug(`Flow value: ${JSON.stringify(localFlow.value, null, 2)}`);
-  let result;
-  try {
-    result = await runFlowPreviewAndWaitResult({
-      workspace: workspace.workspaceId,
-      requestBody: {
-        value: localFlow.value,
-        path: flowPath.substring(0, flowPath.indexOf(".flow")).replaceAll(SEP19, "/"),
-        args: input
-      }
-    });
-  } catch (e) {
-    if (e.body) {
-      if (e.body.result !== undefined) {
-        if (opts.silent) {
-          console.log(JSON.stringify(e.body.result));
-        } else {
-          info(colors.yellow.bold("Flow failed, error handler result:"));
-          info(JSON.stringify(e.body.result, null, 2));
-        }
-        process.exitCode = 1;
-        return;
-      }
+  const jobId = await runFlowPreview({
+    workspace: workspace.workspaceId,
+    requestBody: {
+      value: localFlow.value,
+      path: flowPath.substring(0, flowPath.indexOf(".flow")).replaceAll(SEP19, "/"),
+      args: input
     }
-    throw e;
+  });
+  const { result, success } = await pollForJobResult(workspace.workspaceId, jobId);
+  if (!success) {
+    if (opts.silent) {
+      console.log(JSON.stringify(result));
+    } else {
+      info(colors.yellow.bold("Flow failed, error handler result:"));
+      info(JSON.stringify(result, null, 2));
+    }
+    process.exitCode = 1;
+    return;
   }
   if (opts.silent) {
     console.log(JSON.stringify(result));
@@ -82498,7 +82538,8 @@ async function generateMetadata2(opts, folder) {
     return;
   }
   info("");
-  if (!opts.yes && !await Confirm.prompt({
+  const isInteractive = process.stdin.isTTY ?? false;
+  if (!opts.yes && isInteractive && !await Confirm.prompt({
     message: "Update metadata?",
     default: true
   })) {
@@ -82657,7 +82698,7 @@ var config_default = command35;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.672.0";
+var VERSION = "1.673.0";
 var command36 = new Command().name("wmill").action(() => info(`Welcome to Windmill CLI ${VERSION}. Use -h for help.`)).description("Windmill CLI").globalOption("--workspace <workspace:string>", "Specify the target workspace. This overrides the default workspace.").globalOption("--debug --verbose", "Show debug/verbose logs").globalOption("--show-diffs", "Show diff informations when syncing (may show sensitive informations)").globalOption("--token <token:string>", "Specify an API token. This will override any stored token.").globalOption("--base-url <baseUrl:string>", "Specify the base URL of the API. If used, --token and --workspace are required and no local remote/workspace already set will be used.").globalOption("--config-dir <configDir:string>", "Specify a custom config directory. Overrides WMILL_CONFIG_DIR environment variable and default ~/.config location.").env("HEADERS <headers:string>", `Specify headers to use for all requests. e.g: "HEADERS='h1: v1, h2: v2'"`).version(VERSION).versionOption(false).command("init", init_default).command("app", app_default).command("flow", flow_default).command("script", script_default).command("workspace", workspace_default).command("resource", resource_default).command("resource-type", resource_type_default).command("user", user_default).command("variable", variable_default).command("hub", hub_default).command("folder", folder_default).command("schedule", schedule_default).command("trigger", trigger_default).command("dev", dev_default2).command("sync", sync_default).command("lint", lint_default).command("gitsync-settings", gitsync_settings_default).command("instance", instance_default).command("worker-groups", worker_groups_default).command("workers", workers_default).command("queues", queues_default).command("dependencies", dependencies_default).command("jobs", jobs_default).command("job", job_default).command("group", group_default).command("audit", audit_default).command("token", token_default).command("generate-metadata", generate_metadata_default).command("docs", docs_default).command("config", config_default).command("version --version", "Show version information").action(async (opts) => {
   console.log("CLI version: " + VERSION);
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.672.0",
+  "version": "1.673.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",