pinokiod 3.2.198 → 3.2.201

package/kernel/api/index.js

@@ -623,10 +623,26 @@ class Api {
 
         rpc.args = args
 
-        if (i < script.run.length-1) {
-          rpc.next = i+1
+        if (rpc.hasOwnProperty("next")) {
+          console.log("next already exists, don't touch", rpc.next)
+          if (typeof rpc.next === "string") {
+            let run = script.run
+            console.log("run", run)
+            for(let i=0; i<run.length; i++) {
+              let step = run[i]
+              if (step && step.id === rpc.next) {
+                rpc.next = i
+                break
+              }
+            }
+          }
         } else {
-          rpc.next = null
+          if (i < script.run.length-1) {
+            rpc.next = i+1
+          } else {
+            rpc.next = null
+          }
+          console.log("next is not set. compute the next value", rpc.next)
         }
 
         if (rpc.hasOwnProperty("when")) {

package/kernel/api/local/index.js

@@ -64,7 +64,7 @@ class Local {
     */
 
     let current_env = await Environment.get2(req.parent.path, kernel)
-    console.log({ current_env })
+//    console.log({ current_env })
 
     // if the key at current_env.PINOKIO_SHARE_VAR (by default it's 'url') is the variable being set, trigger the share logic
     if (current_env.PINOKIO_SHARE_VAR && current_env.PINOKIO_SHARE_VAR in req.params) {

package/kernel/bin/conda.js

@@ -96,13 +96,11 @@ create_default_packages:
 //        console.log("conda list check", { stream })
     })
 
-    console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     let conda_check = {}
     let conda = new Set()
     let start = false
     for(let line of lines) {
-      console.log({ line, start })
       if (start) {
         let chunks = line.split(/\s+/).filter(x => x)
         if (chunks.length > 1) {
@@ -122,7 +120,6 @@ create_default_packages:
             let channel = chunks[3]
             let coerced = semver.coerce(version)
             let mamba_requirement = ">=24.11.1"
-            console.log({ name, channel, version })
             if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
               conda_check.mamba = true
             }
@@ -133,7 +130,6 @@ create_default_packages:
           if (name === "sqlite") {
             let coerced = semver.coerce(version)
             let sqlite_requirement = ">=3.47.2"
-            console.log({ coerced, version, sqlite_requirement })
             if (semver.satisfies(coerced, sqlite_requirement)) {
               console.log("semver satisfied")
               conda_check.sqlite = true

package/kernel/bin/index.js

@@ -142,9 +142,7 @@ class Bin {
         this.vs_path_env = mod.mod.env(this.kernel)
         return null
       } else {
-        console.log({ mod })
         if (mod.mod.env) {
-          console.log("env", mod.mod.env)
           return mod.mod.env(this.kernel)
         } else {
           return null
@@ -238,63 +236,87 @@ class Bin {
     let start
     let conda_check = {}
     let conda = new Set()
-    res = await this.exec({ message: `conda list` }, (stream) => {
-//      process.stdout.write(stream.raw)
-//        console.log("conda list check", { stream })
+
+    //////////////////////////////////////////////////////////////////
+    // exception handling
+    // if importlib_metadata || uvicorn || fastapi exist in the base environment, this.correct_conda = false
+    let site_packages_path
+    if (this.platform === "win32") {
+      site_packages_path = path.resolve(this.kernel.homedir, "bin/miniconda/Lib/site-packages")
+    } else {
+      site_packages_path = path.resolve(this.kernel.homedir, "bin/miniconda/lib/python3.10/site-packages")
+    }
+    // check if any of 'uvicorn', 'importlib_metadata', 'fastapi' exists
+    let module_paths = ["fastapi", "uvicorn", "importlib_metadata"].map((name) => {
+      return path.resolve(site_packages_path, name)
     })
+    let to_reset_exists = false
+    for(let module_path of module_paths) {
+      let e = await this.kernel.exists(module_path)
+      if (!e) {
+        to_reset_exists = true
+        break;
+      }
+    }
+    console.log({ to_reset_exists })
+    if (to_reset_exists) {
+      this.correct_conda = false
+    } else {
+      res = await this.exec({ message: `conda list` }, (stream) => {
+  //      process.stdout.write(stream.raw)
+  //        console.log("conda list check", { stream })
+      })
 
-    console.log("CONDA", res.response)
-    let lines = res.response.split(/[\r\n]+/)
-    for(let line of lines) {
-      console.log({ line, start })
-      if (start) {
-        let chunks = line.split(/\s+/).filter(x => x)
-        if (chunks.length > 1) {
-          let name = chunks[0]
-          let version = chunks[1]
-          conda.add(name)
-          if (name === "conda") {
-            //if (String(version) === "24.11.1") {
-            if (String(version) === "24.11.3") {
-              conda_check.conda = true
+      let lines = res.response.split(/[\r\n]+/)
+      for(let line of lines) {
+        if (start) {
+          let chunks = line.split(/\s+/).filter(x => x)
+          if (chunks.length > 1) {
+            let name = chunks[0]
+            let version = chunks[1]
+            conda.add(name)
+            if (name === "conda") {
+              //if (String(version) === "24.11.1") {
+              if (String(version) === "24.11.3") {
+                conda_check.conda = true
+              }
             }
-          }
-          if (name === "conda-libmamba-solver") {
-            //if (String(version) === "24.7.0") {
-            let channel = chunks[3]
-            let coerced = semver.coerce(version)
-            let mamba_requirement = ">=24.11.1"
-            console.log({ name, channel, version })
-            if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
-              conda_check.mamba = true
+            if (name === "conda-libmamba-solver") {
+              //if (String(version) === "24.7.0") {
+              let channel = chunks[3]
+              let coerced = semver.coerce(version)
+              let mamba_requirement = ">=24.11.1"
+              console.log({ name, channel, version })
+              if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
+                conda_check.mamba = true
+              }
             }
-          }
-          // Use sqlite to check if `conda update -y --all` went through successfully
-          // sometimes it just fails silently so need to check
-          if (name === "sqlite") {
-            let coerced = semver.coerce(version)
-            let sqlite_requirement = ">=3.47.2"
-            console.log({ coerced, version, sqlite_requirement })
-            if (semver.satisfies(coerced, sqlite_requirement)) {
-              console.log("semver satisfied")
-              conda_check.sqlite = true
-            } else {
-              console.log("semver NOT satisfied")
+            // Use sqlite to check if `conda update -y --all` went through successfully
+            // sometimes it just fails silently so need to check
+            if (name === "sqlite") {
+              let coerced = semver.coerce(version)
+              let sqlite_requirement = ">=3.47.2"
+  //            console.log({ coerced, version, sqlite_requirement })
+              if (semver.satisfies(coerced, sqlite_requirement)) {
+                console.log("semver satisfied")
+                conda_check.sqlite = true
+              } else {
+                console.log("semver NOT satisfied")
+              }
             }
           }
-        }
-      } else {
-        if (/.*name.*version.*build.*channel/i.test(line)) {
-          start = true 
+        } else {
+          if (/.*name.*version.*build.*channel/i.test(line)) {
+            start = true 
+          }
         }
       }
-    }
 
-    console.log({ conda_check })
-    if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
-      this.correct_conda = true
+      console.log({ conda_check })
+      if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+        this.correct_conda = true
+      }
     }
-
     this.installed.conda = conda
   }
   async refreshInstalled() {
@@ -325,38 +347,38 @@ class Bin {
       // Try 3 times, because sometimes conda just silently quits with no error message
       for(let i=0; i<5; i++) {
         await this.tryList()
-        console.log(`> conda list ${i}`, Array.from(this.installed.conda))
+//        console.log(`> conda list ${i}`, Array.from(this.installed.conda))
         if (this.installed.conda.size > 0) {
           break 
         }
       }
     }
 
-    // 2. pip
-    let pip = new Set()
-    if (conda_exists) {
-      // conda comes with pip
-      console.log("## check pip")
-      start = false
-      res = await this.exec({ message: `pip list` }, (stream) => {
-//        console.log("pip list check", { stream })
-      })
-      console.log("PIP", res.response)
-      lines = res.response.split(/[\r\n]+/)
-      for(let line of lines) {
-        if (start) {
-          let chunks = line.split(/\s+/).filter(x => x)
-          if (chunks.length > 1) {
-            pip.add(chunks[0])
-          }
-        } else {
-          if (/-------.*/i.test(line)) {
-            start = true 
-          }
-        }
-      }
-    }
-    this.installed.pip = pip
+//    // 2. pip
+//    let pip = new Set()
+//    if (conda_exists) {
+//      // conda comes with pip
+//      console.log("## check pip")
+//      start = false
+//      res = await this.exec({ message: `pip list` }, (stream) => {
+////        console.log("pip list check", { stream })
+//      })
+//      console.log("PIP", res.response)
+//      lines = res.response.split(/[\r\n]+/)
+//      for(let line of lines) {
+//        if (start) {
+//          let chunks = line.split(/\s+/).filter(x => x)
+//          if (chunks.length > 1) {
+//            pip.add(chunks[0])
+//          }
+//        } else {
+//          if (/-------.*/i.test(line)) {
+//            start = true 
+//          }
+//        }
+//      }
+//    }
+//    this.installed.pip = pip
     
 
     if (this.platform === "darwin") {
@@ -427,7 +449,7 @@ class Bin {
       } else {
         e4 = false
       }
-      console.log({ e, e2, e3, e4, stdout })
+      console.log("BREW CHECK", { e, e2, e3, e4 })
       this.brew_installed = e && e2 && e3 && e4
 
     }
@@ -644,7 +666,7 @@ class Bin {
     if (type === "conda") {
       return this.kernel.bin.installed.conda.has(name)
     } else if (type === "pip") {
-      return this.kernel.bin.installed.pip.has(name)
+      return this.kernel.bin.installed.pip && this.kernel.bin.installed.pip.has(name)
     } else if (type === "brew") {
       return this.kernel.bin.installed.brew.has(name)
     } else {

package/kernel/index.js

@@ -14,6 +14,7 @@ const Api = require("./api")
 const Python = require("./python")
 //const Template = require('./template')
 const Template = require('jimini')
+const which = require('which')
 const Shells = require("./shells")
 const Key = require("./key")
 const Script = require('./script')
@@ -222,6 +223,25 @@ class Kernel {
   async wait(options) {
     await waitOn(options)
   }
+  async getInfo(){
+    let info = this.sysinfo
+    await this.update_sysinfo()
+    let i = {
+      platform: this.platform,
+      arch: this.arch,
+      running: this.api.running,
+      home: this.homedir,
+      vars: this.vars,
+      memory: this.memory,
+      procs: this.procs,
+      gpu: this.gpu,
+      gpus: this.gpus,
+      version: this.version,
+      ...info
+    }
+
+    this.i = i
+  }
 
   async synchronize_proxies() {
     let proxy_registry_path = path.resolve(this.homedir, "proxy_registry")
@@ -309,7 +329,6 @@ class Kernel {
     this.template = new Template()
     try {
       let grant_permission = false
-      console.log(">>>>>> this.homedir", this.homedir)
       if (this.homedir) {
 
         // 0. create homedir
@@ -357,7 +376,10 @@ class Kernel {
             if (this.envs) {
               this.template.update({
                 env: this.envs,
-                envs: this.envs
+                envs: this.envs,
+                which: (name) => {
+                  return which.sync(name, { nothrow: true, path: this.envs.PATH })
+                }
               })
             }
 //            console.log({ grant_permission })
@@ -381,9 +403,7 @@ class Kernel {
 
       //await this.shell.init()
 
-      console.log("homedir", this.homedir)
       if (this.homedir) {
-        console.log("> 1")
         await this.template.init({
           kernel: this,
           system,
@@ -393,19 +413,16 @@ class Kernel {
             return this.api.get_proxy_url("/proxy", port)
           },
         })
-        console.log("> 2")
         this.sys = new Sysinfo()
         await this.sys.init(this)
         let info = this.sys.info
-        await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
-        await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify({
-          platform: this.platform,
-          arch: this.arch,
-          home: this.homedir,
-          ...info
-        }, null, 2))
+
         this.sysinfo = info
-        await this.update_sysinfo()
+
+        await this.getInfo()
+
+        await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
+        await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify(this.i, null, 2))
       /*
         this.sys = new Sysinfo()
         await this.sys.init(this)

package/kernel/shell.js

@@ -659,7 +659,7 @@ class Shell {
     if (params.venv) {
       let env_path = path.resolve(params.path, params.venv)
       let activate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "activate") : path.resolve(env_path, "bin", "activate"))
-      let deactivate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "deactivate") : path.resolve(env_path, "bin", "deactivate"))
+      let deactivate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "deactivate") : "deactivate")
       let env_exists = await this.exists(env_path)
       if (env_exists) {
         venv_activation = [
@@ -671,7 +671,7 @@ class Shell {
           `python -m venv ${env_path}`,
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           `python -m pip install --upgrade pip setuptools wheel`,
-          (this.platform === "win32" ? `${deactivate_path}` : `source ${deactivate_path}`),
+          deactivate_path,
           (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           (this.platform === 'win32' ? `${timeout} /t 1 > nul` : 'sleep 1'),
@@ -721,9 +721,9 @@ class Shell {
               this.queue.push(data)
             }
           });
-          this.ptyProcess.onExit((result) => {
-            console.log(">>>>>>>>>>>>>>>>>>> exec onExit", result)
-          })
+//          this.ptyProcess.onExit((result) => {
+//            console.log(">>>>>>>>>>>>>>>>>>> exec onExit", result)
+//          })
         }
       } catch (e) {
         console.log("** Error", e)
@@ -747,7 +747,6 @@ class Shell {
     }
   }
   kill(message, force) {
-    console.log("> KILL", { message, force })
 
     this.done = true
     this.ready = false
@@ -877,7 +876,6 @@ ${cleaned}
           let cached_msg = msg
           // todo: may need to handle cases when the command returns immediately with no output (example: 'which brew' returns immediately with no text if brew doesn't exist)
           setTimeout(() => {
-            console.log({ cache, cleaned })
             if (cache === cleaned) {
               if (this.persistent) {
                 if (this.cb) this.cb({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.198",
+  "version": "3.2.201",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -59,6 +59,7 @@
     "systeminformation": "^5.18.4",
     "uuid": "^9.0.0",
     "wait-on": "^7.2.0",
+    "which": "^5.0.0",
     "ws": "^8.13.0",
     "xterm-addon-fit": "^0.8.0",
     "xterm-addon-serialize": "^0.9.0",

package/server/index.js

@@ -229,7 +229,7 @@ class Server {
     let error = null
     if (config && config.version) {
       let coerced = semver.coerce(config.version)
-      console.log("version", { coerced, v: config.version })
+//      console.log("version", { coerced, v: config.version })
       if (semver.satisfies(coerced, this.kernel.schema)) {
         console.log("semver satisfied", config.version, this.kernel.schema)
       } else {
@@ -1761,7 +1761,7 @@ class Server {
     if (type === "conda") {
       return this.kernel.bin.installed.conda.has(name)
     } else if (type === "pip") {
-      return this.kernel.bin.installed.pip.has(name)
+      return this.kernel.bin.installed.pip && this.kernel.bin.installed.pip.has(name)
     } else if (type === "brew") {
       return this.kernel.bin.installed.brew.has(name)
     } else {
@@ -2114,6 +2114,9 @@ class Server {
         console.log(`[TRY] reset ${p}`)
         await fse.remove(p)
         console.log(`[DONE] reset ${p}`)
+        console.log("[TRY] Updating to the new version")
+        this.kernel.store.set("version", this.version.pinokiod)
+        console.log("[DONE] Updating to the new version")
       }
     }
 
@@ -3073,6 +3076,12 @@ class Server {
       await compressing.zip.compressDir(folder, zipPath)
       res.json({ success: true })
     }))
+    this.app.get("/pinokio/info", ex(async (req, res) => {
+      console.time("getInfo")
+      await this.kernel.getInfo()
+      console.timeEnd("getInfo")
+      res.json(this.kernel.i || {})
+    }))
     this.app.get("/pinokio/port", ex(async (req, res) => {
       let port = await this.kernel.port()
       res.json({ result: port })