pinokiod 3.5.18 → 3.5.20

package/kernel/bin/cuda.js

@@ -55,9 +55,9 @@ class Cuda {
     }
   }
   env() {
-//    return {
-//      CUDA_HOME: "$CONDA_PREFIX"
-//    }
+    return {
+      CUDA_HOME: this.kernel.bin.path("miniconda")
+    }
   }
 //  env() {
 //    return {

package/kernel/bin/py.js

@@ -2,6 +2,7 @@ const fse = require('fs-extra')
 const path = require('path')
 class Py {
   async install(req, ondata) {
+    // set the permission
     await fse.remove(this.kernel.path('bin/py'))
     await this.kernel.exec({
       message: "git clone https://github.com/pinokiocomputer/python py",

package/kernel/index.js

@@ -372,28 +372,16 @@ class Kernel {
   }
   async initHome() {
     if (this.homedir) {
-      let home_exists = await this.exists(this.homedir)
-      if (!home_exists) {
-        // first make dir
-        await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
-        // then wait until the app launches, and when it launches, grant access
-        if (this.platform === "win32") {
-          console.log("[initHome] Wait until the app launches")
-          let interval = setInterval(async () => {
-            console.log("[initHome] Has the app launched?", this.launch_complete)
-            if (this.launch_complete) {
-              console.log("[initHome] 1 Give full permission")
-              clearInterval(interval)
-              await this.bin.exec({
-                sudo: true,
-                message: `icacls ${this.homedir} /grant *S-1-1-0:(OI)(CI)F /T`
-              }, (stream) => {
-                process.stdout.write(stream.raw)
-              })
-              console.log("[initHome] 2 Give full permission done")
-            }
-          }, 1000)
-        }
+      await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
+      if (this.platform === "win32") {
+        console.log("[initHome] 1 Give full permission")
+        await this.bin.exec({
+          sudo: true,
+          message: `icacls ${this.homedir} /grant *S-1-1-0:(OI)(CI)F /T`
+        }, (stream) => {
+          process.stdout.write(stream.raw)
+        })
+        console.log("[initHome] 2 Give full permission done")
       }
     }
   }
@@ -471,6 +459,10 @@ class Kernel {
         let home_exists = await this.exists(this.homedir)
         console.log({ home_exists, homedir: this.homedir })
         if (!home_exists) {
+          // home didn't exist.
+          // 1. mkdir
+          await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
+          // 2. and then add permission
           await this.initHome()
         }
 

package/kernel/shell.js

@@ -596,35 +596,35 @@ class Shell {
       if (env_exists) {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//          `conda deactivate`,
-//          `conda deactivate`,
-//          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
 //          timeout,
           `conda activate ${env_path}`,
-          timeout,
+//          timeout,
         ]
       } else {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
-//          `conda deactivate`,
-//          `conda deactivate`,
-//          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
 //          timeout,
           `conda activate ${env_path}`,
-          timeout,
+//          timeout,
         ]
       }
     } else if (conda_name) {
       if (conda_name === "base") {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//          `conda deactivate`,
-//          `conda deactivate`,
-//          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
 //          timeout,
           `conda activate ${conda_name}`,
-          timeout,
+//          timeout,
         ]
       } else {
         let envs_path = this.kernel.bin.path("miniconda/envs")
@@ -633,23 +633,23 @@ class Shell {
         if (env_exists) {
           conda_activation = [
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//            `conda deactivate`,
-//            `conda deactivate`,
-//            `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
 //            timeout,
             `conda activate ${conda_name}`,
-            timeout,
+//            timeout,
           ]
         } else {
           conda_activation = [
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//            `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
-//            `conda deactivate`,
-//            `conda deactivate`,
-//            `conda deactivate`,
+            `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
 //            timeout,
             `conda activate ${conda_name}`,
-            timeout,
+//            timeout,
           ]
         }
       }
@@ -793,13 +793,13 @@ class Shell {
 //              `python -m venv --upgrade ${env_path}`,
 //              `uv venv --allow-existing ${env_path}${python_version}`,
               (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-              timeout,
+//              timeout,
             ]
           } else {
             venv_activation = [
 //              `python -m venv --upgrade ${env_path}`,
               (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-              timeout,
+//              timeout,
             ]
           }
         } else {
@@ -810,9 +810,9 @@ class Shell {
               (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
               `uv pip install --upgrade pip setuptools wheel`,
               deactivate_path,
-              timeout,
+//              timeout,
               (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-              timeout,
+//              timeout,
             ]
           } else {
             // when python version is not specified, use the default python -m venv
@@ -821,9 +821,9 @@ class Shell {
               (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
               `python -m pip install --upgrade pip setuptools wheel`,
               deactivate_path,
-              timeout,
+//              timeout,
               (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-              timeout,
+//              timeout,
             ]
           }
         }

package/package.json

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

package/server/index.js

@@ -2025,7 +2025,6 @@ class Server {
         console.log({ homedir })
         let logsdir = path.resolve(homedir, "logs")
         console.log({ logsdir })
-        await this.kernel.initHome()
         await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { console.log(e) })
         console.log("this.log", this.log)
         if (!this.log) {
@@ -2131,10 +2130,16 @@ class Server {
     let version = this.kernel.store.get("version")
     let home = this.kernel.store.get("home")
     console.log({ home, version })
+
+    let needInitHome = false
     if (home) {
       if (version === this.version.pinokiod) {
         console.log("version up to date")
       } else {
+        // For every update, this gets triggered exactly once.
+        // 1. first mkdir if it doesn't exist (this step is irrelevant since at this point the home dir will exist)
+
+        needInitHome = true
         console.log("not up to date. update py.")
         // remove ~/bin/miniconda/py
         let p = path.resolve(home, "bin/py")
@@ -2150,6 +2155,10 @@ class Server {
     // initialize kernel
     await this.kernel.init({ port: this.port})
 
+    console.log({ needInitHome })
+    if (needInitHome) {
+      await this.kernel.initHome()
+    }
 
     if (this.kernel.homedir) {
       let ex = await this.kernel.exists(this.kernel.homedir, "ENVIRONMENT")