underpost 2.8.832 → 2.8.837

package/.github/workflows/ghpkg.yml

@@ -58,8 +58,8 @@ jobs:
       - name: Set git global credentials
         run: |
           git config --global credential.helper ""
-          git config --global user.name 'underpost.net'
-          git config --global user.email 'admin@underpost.net'
+          git config --global user.name 'underpostnet'
+          git config --global user.email 'fcoverdugoa@underpost.net'
 
       - name: Clone and Push to github package repository
         run: |
@@ -70,8 +70,8 @@ jobs:
           git config --global --add safe.directory /__w/pwa-microservices-template/pwa-microservices-template
           git remote set-url origin git@github.com:underpostnet/pwa-microservices-template-ghpkg.git
           git init
-          git config user.name 'underpost.net'
-          git config user.email 'admin@underpost.net'
+          git config user.name 'underpostnet'
+          git config user.email 'fcoverdugoa@underpost.net'
           git add .
           git status
           underpost cmt . ci package-pwa-microservices-template-ghpkg 'Update github repo package'

package/.github/workflows/npmpkg.yml

@@ -41,8 +41,8 @@ jobs:
       - name: Set git global credentials
         run: |
           git config --global credential.helper ""
-          git config --global user.name 'underpost.net'
-          git config --global user.email 'admin@underpost.net'
+          git config --global user.name 'underpostnet'
+          git config --global user.email 'fcoverdugoa@underpost.net'
 
       - name: Clone github package repository
         run: |
@@ -52,8 +52,8 @@ jobs:
           cd ../pwa-microservices-template
           git remote set-url origin git@github.com:underpostnet/pwa-microservices-template.git
           git add .       
-          git config user.name 'underpost.net'
-          git config user.email 'admin@underpost.net'
+          git config user.name 'underpostnet'
+          git config user.email 'fcoverdugoa@underpost.net'
           underpost cmt . ci package-pwa-microservices-template-ghpkg 'Update npm repo package'
           underpost push . underpostnet/pwa-microservices-template
   # cd ../engine

package/README.md

@@ -22,7 +22,17 @@ template
 
 <div align="center">
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+
+
+<!-- badges -->
+
+
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.837)](https://socket.dev/npm/package/underpost/overview/2.8.837) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+
+
+<!-- end-badges -->
+
+
 
 </div>
 
@@ -68,7 +78,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.832
+## underpost ci/cd cli v2.8.837
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -98,7 +108,7 @@ Commands:
   fs [options] [path]                                        Manages file storage, defaulting to file upload operations.
   test [options] [deploy-list]                               Manages and runs tests, defaulting to the current Underpost default test suite.
   monitor [options] <deploy-id> [env]                        Manages health server monitoring for specified deployments.
-  run [options] [path]                                       Runs a script from the specified path.
+  run [options] <runner-id> [path]                           Runs a script from the specified path.
   lxd [options]                                              Manages LXD containers and virtual machines.
   baremetal [options] [workflow-id] [hostname] [ip-address]  Manages baremetal server operations, including installation, database setup, commissioning, and user management.
   help [command]                                             display help for command

package/bin/deploy.js

@@ -744,7 +744,7 @@ try {
         fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
         'utf8',
       );
-      shellExec(`node bin/deploy cli-docs`);
+      shellExec(`node bin/deploy cli-docs ${version} ${newVersion}`);
       shellExec(`node bin/deploy update-dependencies`);
       shellExec(`auto-changelog`);
       shellExec(`node bin/build dd`);
@@ -1106,7 +1106,7 @@ EOF`);
     }
 
     case 'cli-docs': {
-      buildCliDoc(program);
+      buildCliDoc(program, process.argv[3], process.argv[4]);
       break;
     }
 

package/bin/file.js

@@ -136,10 +136,27 @@ try {
           JSON.stringify(templatePackageLockJson, null, 4),
           'utf8',
         );
+        const badges = fs
+          .readFileSync(`./README.md`, 'utf8')
+          .split(`<!-- badges -->`)[1]
+          .split(`<!-- end-badges -->`)[0];
+        let originMd = fs.readFileSync(`../pwa-microservices-template/README.md`, 'utf8');
+
+        originMd =
+          originMd.split(`<!-- badges -->`)[0] +
+          `
+<!-- badges -->
+` +
+          badges +
+          `
+<!-- end-badges -->
+` +
+          originMd.split(`<!-- end-badges -->`)[1];
+
         const splitKeyword = '## underpost ci/cd cli';
         fs.writeFileSync(
           `../pwa-microservices-template/README.md`,
-          fs.readFileSync(`../pwa-microservices-template/README.md`, 'utf8').split(`<!-- -->`)[0] +
+          originMd.split(`<!-- -->`)[0] +
             `<!-- -->
 ${splitKeyword + fs.readFileSync(`./README.md`, 'utf8').split(splitKeyword)[1]}`,
           'utf8',

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.832
+## underpost ci/cd cli v2.8.837
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -28,7 +28,7 @@ Commands:
   fs [options] [path]                                        Manages file storage, defaulting to file upload operations.
   test [options] [deploy-list]                               Manages and runs tests, defaulting to the current Underpost default test suite.
   monitor [options] <deploy-id> [env]                        Manages health server monitoring for specified deployments.
-  run [options] [path]                                       Runs a script from the specified path.
+  run [options] <runner-id> [path]                           Runs a script from the specified path.
   lxd [options]                                              Manages LXD containers and virtual machines.
   baremetal [options] [workflow-id] [hostname] [ip-address]  Manages baremetal server operations, including installation, database setup, commissioning, and user management.
   help [command]                                             display help for command
@@ -549,17 +549,33 @@ Options:
 
 ### `run` :
 ```
- Usage: underpost run [options] [path]
+ Usage: underpost run [options] <runner-id> [path]
 
 Runs a script from the specified path.
 
 Arguments:
-  path        The absolute or relative directory path where the script is
-              located.
+  runner-id                          The runner ID to run. Options:
+                                     spark-template, gpu-env, tf-gpu-test, ide,
+                                     tf-vae-test, deploy-job.
+  path                               The absolute or relative directory path
+                                     where the script is located.
 
 Options:
-  --dev       Sets the development context environment for the script.
-  -h, --help  display help for command
+  --command <command-array>          Array of commands to run.
+  --args <args-array>                Array of arguments to pass to the command.
+  --dev                              Sets the development context environment
+                                     for the script.
+  --pod-name <pod-name>              Optional: Specifies the pod name for test
+                                     execution.
+  --volume-name <volume-name>        Optional: Specifies the volume name for
+                                     test execution.
+  --image-name <image-name>          Optional: Specifies the image name for
+                                     test execution.
+  --container-name <container-name>  Optional: Specifies the container name for
+                                     test execution.
+  --namespace <namespace>            Optional: Specifies the namespace for test
+                                     execution.
+  -h, --help                         display help for command
  
 ```
   

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.832'
+      engine.version: '2.8.837'
     networks:
       - load-balancer
 

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.832
+          image: localhost/rockylinux9-underpost:v2.8.837
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.832
+          image: localhost/rockylinux9-underpost:v2.8.837
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.832",
+    "version": "2.8.837",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/deploy.js

@@ -296,6 +296,11 @@ kind: StatefulSet
 metadata:
   name: ...
 EOF
+
+https://org.ngc.nvidia.com/setup/api-keys
+docker login nvcr.io
+Username: $oauthtoken
+Password: <Your Key>
 `);
       if (deployList === 'dd' && fs.existsSync(`./engine-private/deploy/dd.router`))
         deployList = fs.readFileSync(`./engine-private/deploy/dd.router`, 'utf8');

package/src/cli/index.js

@@ -4,9 +4,9 @@ import Underpost from '../index.js';
 import { getNpmRootPath, getUnderpostRootPath, loadConf } from '../server/conf.js';
 import fs from 'fs-extra';
 import { commitData } from '../client/components/core/CommonJs.js';
-import { shellExec } from '../server/process.js';
 import UnderpostLxd from './lxd.js';
 import UnderpostBaremetal from './baremetal.js';
+import UnderpostRun from './run.js';
 
 // Load environment variables from .env file
 const underpostRootPath = getUnderpostRootPath();
@@ -318,10 +318,18 @@ program
 // 'run' command: Run a script
 program
   .command('run')
+  .argument('<runner-id>', `The runner ID to run. Options: ${Object.keys(UnderpostRun.RUNNERS).join(', ')}.`)
   .argument('[path]', 'The absolute or relative directory path where the script is located.')
+  .option('--command <command-array>', 'Array of commands to run.')
+  .option('--args <args-array>', 'Array of arguments to pass to the command.')
   .option('--dev', 'Sets the development context environment for the script.')
+  .option('--pod-name <pod-name>', 'Optional: Specifies the pod name for test execution.')
+  .option('--volume-name <volume-name>', 'Optional: Specifies the volume name for test execution.')
+  .option('--image-name <image-name>', 'Optional: Specifies the image name for test execution.')
+  .option('--container-name <container-name>', 'Optional: Specifies the container name for test execution.')
+  .option('--namespace <namespace>', 'Optional: Specifies the namespace for test execution.')
   .description('Runs a script from the specified path.')
-  .action(Underpost.run.callback);
+  .action(UnderpostRun.API.callback);
 
 // 'lxd' command: LXD management
 program

package/src/cli/run.js

@@ -1,48 +1,154 @@
 import { pbcopy, shellCd, shellExec } from '../server/process.js';
 import read from 'read';
 import { getNpmRootPath } from '../server/conf.js';
+import { loggerFactory } from '../server/logger.js';
+import UnderpostTest from './test.js';
+import fs from 'fs-extra';
+
+const logger = loggerFactory(import.meta);
 
 class UnderpostRun {
+  static DEFAULT_OPTION = {
+    dev: false,
+    podName: '',
+    volumeName: '',
+    imageName: '',
+    containerName: '',
+    namespace: '',
+  };
+  static RUNNERS = {
+    'spark-template': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const dir = '/home/dd/spark-template';
+      shellExec(`sudo rm -rf ${dir}`);
+      shellCd('/home/dd');
+
+      // pbcopy(`cd /home/dd && sbt new underpostnet/spark-template.g8`);
+      // await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
+      shellExec(`cd /home/dd && sbt new underpostnet/spark-template.g8 '--name=spark-template'`);
+
+      shellCd(dir);
+
+      shellExec(`git init && git add . && git commit -m "Base implementation"`);
+      shellExec(`chmod +x ./replace_params.sh`);
+      shellExec(`chmod +x ./build.sh`);
+
+      shellExec(`./replace_params.sh`);
+      shellExec(`./build.sh`);
+
+      shellCd('/home/dd/engine');
+    },
+    'gpu-env': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(
+        `node bin cluster --dev --reset && node bin cluster --dev --dedicated-gpu --kubeadm && kubectl get pods --all-namespaces -o wide -w`,
+      );
+    },
+    'tf-gpu-test': (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const { underpostRoot } = options;
+      shellExec(`kubectl delete configmap tf-gpu-test-script`);
+      shellExec(`kubectl delete pod tf-gpu-test-pod`);
+      shellExec(`kubectl apply -f ${underpostRoot}/manifests/deployment/tensorflow/tf-gpu-test.yaml`);
+    },
+    ide: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const { underpostRoot } = options;
+      shellExec(`node ${underpostRoot}/bin/vs ${path}`);
+    },
+    'tf-vae-test': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const { underpostRoot } = options;
+      await UnderpostRun.RUNNERS['deploy-job']('', {
+        args: [
+          `pip install --upgrade \
+               nbconvert \
+               tensorflow-probability==0.23.0 \
+               imageio \
+               git+https://github.com/tensorflow/docs \
+               matplotlib \
+               "numpy<1.25,>=1.21"`,
+          'mkdir -p /home/dd',
+          'cd /home/dd',
+          'git clone https://github.com/tensorflow/docs.git',
+          'cd docs',
+          'jupyter nbconvert --to python site/en/tutorials/generative/cvae.ipynb',
+          'ipython site/en/tutorials/generative/cvae.py',
+        ],
+      });
+    },
+    'deploy-job': async (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      const podName = options.podName || 'deploy-job';
+      const volumeName = options.volumeName || `${podName}-volume`;
+      const args = (options.args ? options.args : path ? [`python ${path}`] : []).filter((c) => c.trim());
+      const imageName = options.imageName || 'nvcr.io/nvidia/tensorflow:24.04-tf2-py3';
+      const containerName = options.containerName || `${podName}-container`;
+      const gpuEnable = imageName.match('nvidia');
+      const runtimeClassName = gpuEnable ? 'nvidia' : '';
+      const namespace = options.namespace || 'default';
+
+      const cmd = `kubectl apply -f - <<EOF
+apiVersion: v1
+kind: Pod
+metadata:
+  name: ${podName}
+  namespace: ${namespace}
+spec:
+  restartPolicy: Never
+${runtimeClassName ? `  runtimeClassName: ${runtimeClassName}` : ''}
+  containers:
+    - name: ${containerName}
+      image: ${imageName}
+      imagePullPolicy: IfNotPresent
+      tty: true
+      stdin: true
+      command: ${JSON.stringify(options.command ? options.command : ['/bin/bash', '-c'])}
+${
+  args.length > 0
+    ? `      args:
+        - |
+${args.map((arg) => `          ${arg}`).join('\n')}`
+    : ''
+}
+${
+  gpuEnable
+    ? `      resources:
+        limits:
+          nvidia.com/gpu: '1'
+      env:
+        - name: NVIDIA_VISIBLE_DEVICES
+          value: all`
+    : ''
+}
+${
+  path
+    ? `
+      volumeMounts:
+        - name: ${volumeName}
+          mountPath: ${path}
+  volumes:
+    - name: ${volumeName}
+      hostPath:
+        path: ${path}
+        type: ${fs.statSync(path).isDirectory() ? 'Directory' : 'File'}`
+    : ''
+}
+EOF`;
+      shellExec(`kubectl delete pod ${podName}`);
+      console.log(cmd);
+      shellExec(cmd, { disableLog: true });
+      const successInstance = await UnderpostTest.API.statusMonitor(podName);
+      if (successInstance) {
+        shellExec(`kubectl logs -f ${podName}`);
+      }
+    },
+  };
   static API = {
-    async callback(path, options = { dev: false }) {
-      const fileName = path.split('/').pop();
+    async callback(runner, path, options = UnderpostRun.DEFAULT_OPTION) {
       const npmRoot = getNpmRootPath();
       const underpostRoot = options?.dev === true ? '.' : `${npmRoot}/underpost`;
-
-      switch (fileName) {
-        case 'spark-template': {
-          const path = '/home/dd/spark-template';
-          shellExec(`sudo rm -rf ${path}`);
-          shellCd('/home/dd');
-
-          // pbcopy(`cd /home/dd && sbt new underpostnet/spark-template.g8`);
-          // await read({ prompt: 'Command copy to clipboard, press enter to continue.\n' });
-          shellExec(`cd /home/dd && sbt new underpostnet/spark-template.g8 '--name=spark-template'`);
-
-          shellCd(path);
-
-          shellExec(`git init && git add . && git commit -m "Base implementation"`);
-          shellExec(`chmod +x ./replace_params.sh`);
-          shellExec(`chmod +x ./build.sh`);
-
-          shellExec(`./replace_params.sh`);
-          shellExec(`./build.sh`);
-
-          shellCd('/home/dd/engine');
-          break;
-        }
-        case 'gpu': {
-          shellExec(
-            `node bin cluster --dev --reset && node bin cluster --dev --dedicated-gpu --kubeadm && kubectl get pods --all-namespaces -o wide -w`,
-          );
-          break;
-        }
-        case 'tf':
-          shellExec(`kubectl delete configmap tf-gpu-test-script`);
-          shellExec(`kubectl delete pod tf-gpu-test-pod`);
-          shellExec(`kubectl apply -f ${underpostRoot}/manifests/deployment/tensorflow/tf-gpu-test.yaml`);
-          break;
-      }
+      if (options.command) options.command = options.command.split(',');
+      if (options.args) options.args = options.args.split(',');
+      options.underpostRoot = underpostRoot;
+      options.npmRoot = npmRoot;
+      logger.info('callback', { path, options });
+      const result = await UnderpostRun.RUNNERS[runner](path, options);
+      return result;
     },
   };
 }

package/src/cli/test.js

@@ -94,7 +94,7 @@ class UnderpostTest {
         const _monitor = async () => {
           await timer(deltaMs);
           const pods = UnderpostDeploy.API.get(podName, kindType);
-          const result = pods.find((p) => p.STATUS === status);
+          let result = pods.find((p) => p.STATUS === status || (status === 'Running' && p.STATUS === 'Completed'));
           logger.info(
             `Testing pod ${podName}... ${result ? 1 : 0}/1 - elapsed time ${deltaMs * (index + 1)}s - attempt ${
               index + 1

package/src/index.js

@@ -34,7 +34,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.832';
+  static version = 'v2.8.837';
   /**
    * Repository cli API
    * @static

package/src/server/conf.js

@@ -1171,7 +1171,7 @@ const writeEnv = (envPath, envObj) =>
     'utf8',
   );
 
-const buildCliDoc = (program) => {
+const buildCliDoc = (program, oldVersion, newVersion) => {
   let md = shellExec(`node bin help`, { silent: true, stdout: true }).split('Options:');
   const baseOptions =
     `## ${md[0].split(`\n`)[2]}
@@ -1207,13 +1207,15 @@ const buildCliDoc = (program) => {
       `
   `;
   });
+  md = md.replaceAll(oldVersion, newVersion);
   fs.writeFileSync(`./src/client/public/nexodev/docs/references/Command Line Interface.md`, md, 'utf8');
   fs.writeFileSync(`./cli.md`, md, 'utf8');
   const readmeSplit = `pwa-microservices-template</a>`;
   const readme = fs.readFileSync(`./README.md`, 'utf8').split(readmeSplit);
   fs.writeFileSync(
     './README.md',
-    readme[0] +
+    (
+      readme[0] +
       readmeSplit +
       `
 
@@ -1223,7 +1225,8 @@ const buildCliDoc = (program) => {
       
 <a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
       
-`,
+`
+    ).replaceAll(oldVersion, newVersion),
     'utf8',
   );
 };