pinokiod 3.2.83 → 3.2.85

package/kernel/bin/aria2.js

@@ -17,7 +17,7 @@ class Aria2 {
       await this.kernel.bin.download(url, dest, ondata)
       await this.kernel.bin.unzip(dest, "aria2", ondata)
     } else {
-      await this.kernel.bin.exec({ message: "conda install -y -c conda-forge aria2", conda: { name: "base", activate: "minimal"} }, ondata)
+      await this.kernel.bin.exec({ message: "conda install -y -c conda-forge aria2" }, ondata)
     }
   }
   async installed() {

package/kernel/bin/conda.js

@@ -133,10 +133,10 @@ conda-libmamba-solver=24.7.0`)
 
     await this.kernel.bin.exec({
       message: cmds,
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
 //      [
 //        (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
 //        (this.platform === 'win32' ? `activate base` : `conda activate base`),

package/kernel/bin/cuda.js

@@ -3,32 +3,32 @@ class Cuda {
     if (this.kernel.platform === "win32") {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn libzlib-wapi -c conda-forge",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     } else {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn -c conda-forge",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     }
   }

package/kernel/bin/ffmpeg.js

@@ -6,10 +6,10 @@ class Ffmpeg {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge ffmpeg",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/git.js

@@ -7,10 +7,10 @@ class Git {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install --no-shortcuts -y -c conda-forge git git-lfs",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
     if (this.kernel.platform === 'win32') {
       let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")

package/kernel/bin/huggingface.js

@@ -2,10 +2,10 @@ class Huggingface {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge huggingface_hub",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/index.js

@@ -302,7 +302,7 @@ class Bin {
     this.installed.pip = pip
     
 
-    if (this.platform === "darwin" || this.platform === "linux") {
+    if (this.platform === "darwin") {
       // 3. brew
       console.log("## check brew")
 
@@ -356,7 +356,7 @@ class Bin {
       let result = await this.kernel.bin.exec({ message: "xcode-select --version" }, (stream) => { })
       if (result && result.stdout) {
         e4 = /xcode-select version ([0-9]+)/gi.exec(result.stdout)
-        if (e4.length > 1) {
+        if (e4 && e4.length > 1) {
           let version = Number(e4[1]) 
           console.log("xcode-select version", version)
           if (version >= 2349) {

package/kernel/bin/llvm.js

@@ -5,10 +5,10 @@ class LLVM {
     } else {
       await bin.exec({
         message: "conda install -y -c conda-forge llvm",
-        conda: {
-          name: "base",
-          activate: "minimal"
-        }
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     }
   }

package/kernel/bin/node.js

@@ -7,10 +7,10 @@ class Node {
     await this.kernel.bin.exec({
       //message: "conda install -y nodejs=22.12.0 -c conda-forge"
       message: "conda install -y nodejs=20.17.0 -c conda-forge",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/uv.js

@@ -6,10 +6,10 @@ class UV {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge uv",
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/zip.js

@@ -8,10 +8,10 @@ class Zip {
     }
     await this.kernel.bin.exec({
       message: cmd,
-      conda: {
-        name: "base",
-        activate: "minimal"
-      }
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/index.js

@@ -337,13 +337,15 @@ class Kernel {
 
 //      let contents = await fs.promises.readdir(this.homedir)
       //await this.bin.init()
-      console.time("bin.init")
+      let ts = Date.now()
+      console.time("bin.init " + ts)
       this.bin.init().then(() => {
-        console.timeEnd("bin.init")
+        console.timeEnd("bin.init" + ts)
       })
-      console.time("api.init")
+      let ts2 = Date.now()
+      console.time("api.init " + ts2)
       await this.api.init()
-      console.timeEnd("api.init")
+      console.timeEnd("api.init " + ts2)
 
       //await this.shell.init()
 
@@ -398,9 +400,10 @@ class Kernel {
         await this.update_sysinfo()
         console.timeEnd("update_sysinfo")
         */
-        console.time("shell.init")
+        let ts3 = Date.now()
+        console.time("shell.init " + ts3)
         this.shell.init().then(() => {
-          console.timeEnd("shell.init")
+          console.timeEnd("shell.init" + ts3)
           if (this.envs) {
             this.template.update({
               env: this.envs,

package/kernel/python/index.js

@@ -26,7 +26,6 @@ class Python {
           resolve() 
         }, 3000)
       })
-      this.proc = true
     }
 
     let res = await fetch("http://127.0.0.1:42001/call", {
@@ -41,6 +40,7 @@ class Python {
     }).then((res) => {
       return res.json()
     })
+    this.proc = true
     return res
   }
 }

package/package.json

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