pinokiod 3.2.207 → 3.2.208

package/kernel/api/index.js

@@ -551,6 +551,7 @@ class Api {
       memory.next = null
     }
 
+
     this.state = memory
     this.executing = request
     // get fully resolved env
@@ -558,6 +559,10 @@ class Api {
     // set template
     this.kernel.template.update({ envs: env, env })
 
+    this.kernel.memory.rpc[request.path] = rawrpc
+    this.kernel.memory.args[request.path] = args
+    this.kernel.memory.input[request.path] = input
+
     // render until `{{ }}` pattern does not exist
     // 1. render once
     let rpc = rawrpc
@@ -623,6 +628,12 @@ class Api {
 
         rpc.args = args
 
+        this.kernel.memory.rpc[request.path].current = rpc.current
+        this.kernel.memory.rpc[request.path].total = rpc.total
+
+//        this.kernel.memory.rpc[request.path] = rpc
+//        this.kernel.memory.args[request.path] = args
+
         if (rpc.hasOwnProperty("next")) {
           console.log("next already exists, don't touch", rpc.next)
           if (typeof rpc.next === "string") {
@@ -675,6 +686,9 @@ class Api {
               } else {
                 // no next rpc to execute. Finish
                 this.kernel.memory.local[request.path] = {}
+                this.kernel.memory.rpc[request.path] = null
+                this.kernel.memory.input[request.path] = null
+                this.kernel.memory.args[request.path] = null
                 this.ondata({
                   id: request.path,
                   type: "event",

package/kernel/bin/conda.js

@@ -61,6 +61,7 @@ class Conda {
     // 
     if (this.kernel.homedir) {
 //      let exists = await this.kernel.exists("condarc")
+        console.log("condarc init")
 //      if (!exists) {
         await fs.promises.writeFile(this.kernel.path('condarc'), `channels:
   - conda-forge

package/kernel/index.js

@@ -227,19 +227,69 @@ class Kernel {
     let info = this.sysinfo
     await this.update_sysinfo()
     let i = {
+      version: this.version,
       platform: this.platform,
       arch: this.arch,
-      running: this.api.running,
       home: this.homedir,
+      scripts: [],
+      shells: this.shell.shells.map(({ cols, rows, id, group, path, index, cmd, done }) => {
+        return { cols, rows, id, group, path, index, cmd, done }
+      }),
+      proxies: [],
       vars: this.vars,
       memory: this.memory,
       procs: this.procs,
       gpu: this.gpu,
       gpus: this.gpus,
-      version: this.version,
       ...info
     }
 
+    // user-friendly running
+    /*
+      running :- {
+        <relative_path>: {
+          step: <current_step>,
+          path: <full_path>,
+          app: <app_name>,
+          args: <args>,
+          local: {
+            <key>: <val>
+          }
+        }
+      }
+    */
+    let running = this.api.running
+    for(let full_path in running) {
+      let relative_path = path.relative(this.api.userdir, full_path)
+      let app = relative_path.split(path.sep)[0]
+      let app_path = path.resolve(this.api.userdir, app)
+      let script_path = path.relative(app_path, full_path)
+      let args = i.memory.args[full_path]
+      let rpc = i.memory.rpc[full_path]
+      let input = i.memory.input[full_path]
+      let local = i.memory.local[full_path]
+      i.scripts.push({
+        path: relative_path, app, script_path, step: rpc, input, args, local, full_path,
+      })
+    }
+    for(let full_path in this.api.proxies) {
+      let relative_path = path.relative(this.api.userdir, full_path)
+      let app = relative_path.split(path.sep)[0]
+      let app_path = path.resolve(this.api.userdir, app)
+      let script_path = path.relative(app_path, full_path)
+      let proxies = this.api.proxies[full_path]
+      for(let proxy of proxies) {
+        i.proxies.push({
+          path: relative_path,
+          app,
+          script_path,
+          full_path,
+          ...proxy
+        })
+      }
+    }
+      this.api.proxies,
+
     this.i = i
   }
 
@@ -323,7 +373,10 @@ class Kernel {
       global: {},
       key: (host) => {
         return this.keys[host]
-      }
+      },
+      rpc: {},
+      input: {},
+      args: {},
     }
     this.procs = {}
     this.template = new Template()

package/kernel/shell.js

@@ -537,7 +537,12 @@ class Shell {
 
     // 2. conda_activation
 
-    const timeout = "C:\\Windows\\System32\\timeout"
+    let timeout
+    if (this.platform === "win32") {
+      timeout = 'C:\\Windows\\System32\\timeout /t 1 > nul'
+    } else {
+      timeout = 'sleep 1'
+    }
 
     let conda_activation = []
     if (conda_activate) {
@@ -560,9 +565,9 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+          timeout,
           `conda activate ${env_path}`,
-          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+          timeout,
         ]
       } else {
         conda_activation = [
@@ -571,9 +576,9 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+          timeout,
           `conda activate ${env_path}`,
-          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+          timeout,
         ]
       }
     } else if (conda_name) {
@@ -583,9 +588,9 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+          timeout,
           `conda activate ${conda_name}`,
-          (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+          timeout,
         ]
       } else {
         let envs_path = this.kernel.bin.path("miniconda/envs")
@@ -597,9 +602,9 @@ class Shell {
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
-            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+            timeout,
             `conda activate ${conda_name}`,
-            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+            timeout,
           ]
         } else {
           conda_activation = [
@@ -608,9 +613,9 @@ class Shell {
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
-            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+            timeout,
             `conda activate ${conda_name}`,
-            (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
+            timeout,
           ]
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.207",
+  "version": "3.2.208",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -3080,7 +3080,11 @@ class Server {
       console.time("getInfo")
       await this.kernel.getInfo()
       console.timeEnd("getInfo")
-      res.json(this.kernel.i || {})
+      let info = Object.assign({}, this.kernel.i)
+      delete info.vars
+      delete info.shell_env
+      delete info.memory
+      res.json(info)
     }))
     this.app.get("/pinokio/port", ex(async (req, res) => {
       let port = await this.kernel.port()