@underpostnet/underpost 2.99.1 → 2.99.4

package/src/cli/index.js

@@ -557,6 +557,20 @@ program
   .option('--retry-count <count>', 'Sets HTTPProxy per-route retry count (e.g., 3).')
   .option('--retry-per-try-timeout <duration>', 'Sets HTTPProxy retry per-try timeout (e.g., "150ms").')
   .option('--disable-private-conf-update', 'Disables updates to private configuration during execution.')
+  .option('--logs', 'Streams logs during the runner execution.')
+  .option('--monitor-status <status>', 'Sets the status to monitor for pod/resource (default: "Running").')
+  .option(
+    '--monitor-status-kind-type <kind-type>',
+    'Sets the Kubernetes resource kind type to monitor (default: "pods").',
+  )
+  .option(
+    '--monitor-status-delta-ms <milliseconds>',
+    'Sets the polling interval in milliseconds for status monitoring (default: 1000).',
+  )
+  .option(
+    '--monitor-status-max-attempts <attempts>',
+    'Sets the maximum number of status check attempts (default: 600).',
+  )
   .description('Runs specified scripts using various runners.')
   .action(Underpost.run.callback);
 
@@ -596,7 +610,13 @@ program
   .action(Underpost.lxd.callback);
 
 program
-  .command('baremetal [workflow-id] [ip-address] [hostname] [ip-file-server] [ip-config] [netmask] [dns-server]')
+  .command('baremetal [workflow-id]')
+  .option('--ip-address <ip-address>', 'The IP address of the control server or the local machine.')
+  .option('--hostname <hostname>', 'The hostname of the target baremetal machine.')
+  .option('--ip-file-server <ip-file-server>', 'The IP address of the file server (NFS/TFTP).')
+  .option('--ip-config <ip-config>', 'IP configuration string for the baremetal machine.')
+  .option('--netmask <netmask>', 'Netmask of network.')
+  .option('--dns-server <dns-server>', 'DNS server IP address.')
   .option('--control-server-install', 'Installs the baremetal control server.')
   .option('--control-server-uninstall', 'Uninstalls the baremetal control server.')
   .option('--control-server-restart', 'Restarts the baremetal control server.')

package/src/cli/run.js

@@ -80,6 +80,11 @@ const logger = loggerFactory(import.meta);
  * @property {string} user - The user to run as.
  * @property {string} pid - The process ID.
  * @property {boolean} disablePrivateConfUpdate - Whether to disable private configuration updates.
+ * @property {string} monitorStatus - The monitor status option.
+ * @property {string} monitorStatusKindType - The monitor status kind type option.
+ * @property {string} monitorStatusDeltaMs - The monitor status delta in milliseconds.
+ * @property {string} monitorStatusMaxAttempts - The maximum number of attempts for monitor status.
+ * @property {boolean} logs - Whether to enable logs.
  * @memberof UnderpostRun
  */
 const DEFAULT_OPTION = {
@@ -134,6 +139,11 @@ const DEFAULT_OPTION = {
   user: '',
   pid: '',
   disablePrivateConfUpdate: false,
+  monitorStatus: '',
+  monitorStatusKindType: '',
+  monitorStatusDeltaMs: '',
+  monitorStatusMaxAttempts: '',
+  logs: false,
 };
 
 /**
@@ -997,86 +1007,6 @@ EOF
       shellExec(`${underpostRoot}/scripts/ip-info.sh ${path}`);
     },
 
-    /**
-     * @method monitor
-     * @description Monitors a specific pod (identified by `path`) for the existence of a file (`/await`), and performs conditional actions (like file copying and opening Firefox) when the file is removed.
-     * @param {string} path - The input value, identifier, or path for the operation (used as the name of the pod to monitor).
-     * @param {Object} options - The default underpost runner options for customizing workflow
-     * @memberof UnderpostRun
-     */
-    monitor: (path, options = DEFAULT_OPTION) => {
-      const pid = getTerminalPid();
-      logger.info('monitor pid', pid);
-      const checkPath = '/await';
-      const _monitor = async () => {
-        const result = Underpost.deploy.existsContainerFile({ podName: path, path: checkPath });
-        logger.info('monitor', result);
-        if (result === true) {
-          switch (path) {
-            case 'tf-vae-test':
-              {
-                const nameSpace = options.namespace;
-                const podName = path;
-                const basePath = '/home/dd';
-                const scriptPath = '/site/en/tutorials/generative/cvae.py';
-                // shellExec(
-                //   `sudo kubectl cp ${nameSpace}/${podName}:${basePath}/docs${scriptPath} ${basePath}/lab/src/${scriptPath
-                //     .split('/')
-                //     .pop()}`,
-                // );
-                // const file = fs.readFileSync(`${basePath}/lab/src/${scriptPath.split('/').pop()}`, 'utf8');
-                //                 fs.writeFileSync(
-                //                   `${basePath}/lab/src/${scriptPath.split('/').pop()}`,
-                //                   file.replace(
-                //                     `import time`,
-                //                     `import time
-                // print('=== SCRIPT UPDATE TEST ===')`,
-                //                   ),
-                //                   'utf8',
-                //                 );
-                shellExec(
-                  `sudo kubectl cp ${basePath}/lab/src/${scriptPath
-                    .split('/')
-                    .pop()} ${nameSpace}/${podName}:${basePath}/docs${scriptPath}`,
-                );
-                // shellExec(`sudo kubectl exec -i ${podName} -- sh -c "ipython ${basePath}/docs${scriptPath}"`);
-                shellExec(`sudo kubectl exec -i ${podName} -- sh -c "rm -rf ${checkPath}"`);
-
-                {
-                  const checkPath = `/latent_space_plot.png`;
-                  const outsPaths = [];
-                  logger.info('monitor', checkPath);
-                  while (!Underpost.deploy.existsContainerFile({ podName, path: `/home/dd/docs${checkPath}` }))
-                    await timer(1000);
-
-                  {
-                    const toPath = `${basePath}/lab${checkPath}`;
-                    outsPaths.push(toPath);
-                    shellExec(`sudo kubectl cp ${nameSpace}/${podName}:${basePath}/docs${checkPath} ${toPath}`);
-                  }
-
-                  for (let i of range(1, 10)) {
-                    i = `/image_at_epoch_${setPad(i, '0', 4)}.png`;
-                    const toPath = `${basePath}/lab/${i}`;
-                    outsPaths.push(toPath);
-                    shellExec(`sudo kubectl cp ${nameSpace}/${podName}:${basePath}/docs${i} ${toPath}`);
-                  }
-                  openTerminal(`firefox ${outsPaths.join(' ')}`, { single: true });
-                }
-                shellExec(`sudo kill -9 ${pid}`);
-              }
-              break;
-
-            default:
-              break;
-          }
-          return;
-        }
-        await timer(1000);
-        _monitor();
-      };
-      _monitor();
-    },
     /**
      * @method db-client
      * @description Deploys and exposes the Adminer database client application (using `adminer:4.7.6-standalone` image) on the cluster.
@@ -1134,15 +1064,20 @@ EOF
           `git config user.email '${email}' && ` +
           `git config credential.interactive always &&` +
           `git config pull.rebase false`,
+        {
+          disableLog: true,
+          silent: true,
+        },
       );
 
-      console.log(
-        shellExec(`git config list`, { silent: true, stdout: true })
-          .replaceAll('user.email', 'user.email'.yellow)
-          .replaceAll(username, username.green)
-          .replaceAll('user.name', 'user.name'.yellow)
-          .replaceAll(email, email.green),
-      );
+      if (options.logs)
+        console.log(
+          shellExec(`git config list`, { silent: true, stdout: true })
+            .replaceAll('user.email', 'user.email'.yellow)
+            .replaceAll(username, username.green)
+            .replaceAll('user.name', 'user.name'.yellow)
+            .replaceAll(email, email.green),
+        );
     },
 
     /**
@@ -1370,7 +1305,11 @@ EOF
             });
       }
       await awaitDeployMonitor(true);
-      shellExec(`npm run dev-proxy ${deployId} ${subConf} ${host} ${_path}${options.tls ? ' tls' : ''}`);
+      shellExec(
+        `./node_modules/.bin/env-cmd -f .env.development node src/proxy proxy ${deployId} ${subConf} ${host} ${_path}${
+          options.tls ? ' tls' : ''
+        }`,
+      );
     },
 
     /**
@@ -1640,15 +1579,74 @@ EOF
      * @memberof UnderpostRun
      */
     'tf-vae-test': async (path, options = DEFAULT_OPTION) => {
-      const { underpostRoot } = options;
       const podName = 'tf-vae-test';
       await Underpost.run.CALL('deploy-job', '', {
+        logs: options.logs,
         podName,
         // volumeMountPath: '/custom_images',
         // volumeHostPath: '/home/dd/engine/src/client/public/cyberia/assets/skin',
         on: {
           init: async () => {
-            openTerminal(`node bin run --dev monitor ${podName}`);
+            // const pid = getTerminalPid();
+            // shellExec(`sudo kill -9 ${pid}`);
+            (async () => {
+              const nameSpace = options.namespace;
+              const basePath = '/home/dd';
+              const scriptPath = '/site/en/tutorials/generative/cvae.py';
+
+              const { close } = await (async () => {
+                const checkAwaitPath = '/await';
+                while (!Underpost.deploy.existsContainerFile({ podName, path: checkAwaitPath })) {
+                  logger.info('monitor', checkAwaitPath);
+                  await timer(1000);
+                }
+
+                return {
+                  close: () => shellExec(`sudo kubectl exec -i ${podName} -- sh -c "rm -rf ${checkAwaitPath}"`),
+                };
+              })();
+
+              const localScriptPath = `${basePath}/lab/src/${scriptPath.split('/').pop()}`;
+              if (!fs.existsSync(localScriptPath)) {
+                throw new Error(`Local override script not found: ${localScriptPath}`);
+              }
+
+              shellExec(`sudo kubectl cp ${localScriptPath} ${nameSpace}/${podName}:${basePath}/docs${scriptPath}`);
+
+              close();
+
+              {
+                const checkPath = `/latent_space_plot.png`;
+                const outsPaths = [];
+                const labDir = `${basePath}/lab`;
+
+                logger.info('monitor', checkPath);
+                {
+                  const checkAwaitPath = `/home/dd/docs${checkPath}`;
+                  while (!Underpost.deploy.existsContainerFile({ podName, path: checkAwaitPath })) {
+                    logger.info('waiting for', checkAwaitPath);
+                    await timer(1000);
+                  }
+                }
+
+                {
+                  const toPath = `${labDir}${checkPath}`;
+                  outsPaths.push(toPath);
+                  shellExec(`sudo kubectl cp ${nameSpace}/${podName}:${basePath}/docs${checkPath} ${toPath}`);
+                }
+
+                for (let i of range(1, 10)) {
+                  const fileName = `image_at_epoch_${setPad(i, '0', 4)}.png`;
+                  const fromPath = `/${fileName}`;
+                  const toPath = `${labDir}/${fileName}`;
+                  outsPaths.push(toPath);
+                  shellExec(`sudo kubectl cp ${nameSpace}/${podName}:${basePath}/docs${fromPath} ${toPath}`);
+                }
+
+                openTerminal(`firefox ${outsPaths.join(' ')}`, { single: true });
+                process.exit(0);
+              }
+            })();
           },
         },
         args: [
@@ -1873,10 +1871,16 @@ EOF`;
       shellExec(`kubectl delete pod ${podName} -n ${namespace} --ignore-not-found`);
       console.log(cmd);
       shellExec(cmd, { disableLog: true });
-      const successInstance = await Underpost.test.statusMonitor(podName);
+      const successInstance = await Underpost.test.statusMonitor(
+        podName,
+        options.monitorStatus || 'Running',
+        options.monitorStatusKindType || 'pods',
+        options.monitorStatusDeltaMs || 1000,
+        options.monitorStatusMaxAttempts || 600,
+      );
       if (successInstance) {
         options.on?.init ? await options.on.init() : null;
-        shellExec(`kubectl logs -f ${podName} -n ${namespace}`);
+        if (options.logs) shellExec(`kubectl logs -f ${podName} -n ${namespace}`, { async: true });
       }
     },
   };

package/src/cli/test.js

@@ -59,7 +59,19 @@ class UnderpostTest {
      * @param {number} options.maxAttempts - The maximum number of attempts.
      * @memberof UnderpostTest
      */
-    async callback(deployList = '', options = { itc: false, sh: false, logs: false }) {
+    async callback(
+      deployList = '',
+      options = {
+        itc: false,
+        sh: false,
+        logs: false,
+        podName: '',
+        podStatus: '',
+        kindType: '',
+        deltaMs: 1000,
+        maxAttempts: 60 * 5,
+      },
+    ) {
       if (
         options.podName &&
         typeof options.podName === 'string' &&