pinokiod 1.2.4 → 1.2.6

package/kernel/bin/conda.js

@@ -31,9 +31,9 @@ class Conda {
 //      CONDA_ROOT: this.kernel.bin.path("miniconda"),
       CONDA_PREFIX: this.kernel.bin.path("miniconda"),
       PYTHON: this.kernel.bin.path("miniconda/python"),
-      PATH: this.paths[this.kernel.platform].map((p) => {
-        return this.kernel.bin.path(p)
-      })
+//      PATH: this.paths[this.kernel.platform].map((p) => {
+//        return this.kernel.bin.path(p)
+//      })
     }
     if (this.kernel.platform === "win32") {
       base.CONDA_BAT = this.kernel.bin.path("miniconda/condabin/conda.bat")
@@ -65,16 +65,17 @@ class Conda {
     }
     ondata({ raw: `${cmd}\r\n` })
     ondata({ raw: `path: ${this.kernel.bin.path()}\r\n` })
-    await this.kernel.bin.exec({ message: cmd, }, (stream) => {
+    await this.kernel.bin.exec({ message: cmd, skip_conda: true }, (stream) => {
       ondata(stream)
     })
 //    await this.activate()
     await this.kernel.bin.exec({
       message: [
-        (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-        (this.platform === 'win32' ? `activate base` : `conda activate base`),
+//        (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+//        (this.platform === 'win32' ? `activate base` : `conda activate base`),
         "conda config --add create_default_packages python=3.10",
         "conda install -y -c conda-forge pip brotli brotlipy",
+        "conda update --all",
 //        "conda update -y --all",
       ]
     }, (stream) => {

package/kernel/bin/cuda.js

@@ -3,20 +3,16 @@ class Cuda {
     if (this.kernel.platform === "win32") {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn libzlib-wapi -c conda-forge",
-        conda: "base",
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-11.8.0",
-        conda: "base",
       }, ondata)
     } else {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn -c conda-forge",
-        conda: "base",
       }, ondata)
       await this.kernel.bin.exec({
         message: "conda install -y cuda -c nvidia/label/cuda-11.8.0",
-        conda: "base",
       }, ondata)
     }
   }
@@ -42,7 +38,6 @@ class Cuda {
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda remove cudnn cuda",
-      conda: "base",
     }, ondata)
   }
 }

package/kernel/bin/ffmpeg.js

@@ -6,7 +6,6 @@ class Ffmpeg {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda install -y -c conda-forge ffmpeg",
-      conda: "base"
     }, ondata)
   }
   async installed() {
@@ -15,7 +14,6 @@ class Ffmpeg {
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({
       message: "conda remove ffmpeg",
-      conda: "base"
     }, ondata)
   }
 }

package/kernel/bin/git.js

@@ -5,7 +5,7 @@ const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
   async install(req, ondata) {
-    await this.kernel.bin.exec({ conda: "base", message: "conda install -y -c conda-forge git git-lfs" }, ondata)
+    await this.kernel.bin.exec({ message: "conda install -y -c conda-forge git git-lfs" }, ondata)
     if (this.kernel.platform === 'win32') {
       let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
       // check if gitconfig exists
@@ -23,7 +23,7 @@ class Git {
     return this.kernel.bin.installed.conda.has("git")
   }
   async uninstall(req, ondata) {
-    await this.kernel.bin.exec({ conda: "base", message: "conda remove git" }, ondata)
+    await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
   }
   env() {
     if (this.kernel.platform === 'win32') {

package/kernel/bin/index.js

@@ -244,7 +244,7 @@ class Bin {
     let res
     let lines
     if (conda_exists) {
-      res = await this.exec({ message: `conda list`, conda: "base" }, (stream) => {
+      res = await this.exec({ message: `conda list` }, (stream) => {
 //        console.log("conda list check", { stream })
       })
 
@@ -431,11 +431,11 @@ class Bin {
           if (type === "conda") {
             const message = (install ? install : `conda install ${name} -y ${args}`)
             ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
-            await this.exec({ message, conda: "base" }, ondata)
+            await this.exec({ message }, ondata)
           } else if (type === "pip") {
             const message = (install ? install : `pip install ${name} ${args}`)
             ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
-            await this.exec({ message, conda: "base" }, ondata)
+            await this.exec({ message }, ondata)
           } else if (type === "brew") {
             const message = (install ? install : `brew install ${name} ${args}`)
             ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")

package/kernel/bin/llvm.js

@@ -3,7 +3,7 @@ class LLVM {
     if (this.kernel.platform === 'darwin') {
       await bin.exec({ message: "brew install llvm" }, ondata)
     } else {
-      await bin.exec({ message: "conda install -y -c conda-forge llvm", conda: "base" }, ondata)
+      await bin.exec({ message: "conda install -y -c conda-forge llvm" }, ondata)
     }
   }
   async installed() {
@@ -14,7 +14,7 @@ class LLVM {
     }
   }
   async uninstall(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda remove llvm", conda: "base" }, ondata)
+    await this.kernel.bin.exec({ message: "conda remove llvm" }, ondata)
   }
 }
 module.exports = LLVM

package/kernel/bin/zip.js

@@ -6,7 +6,7 @@ class Zip {
     } else {
       cmd = "conda install -y -c conda-forge p7zip"
     }
-    await this.kernel.bin.exec({ conda: "base", message: cmd }, ondata)
+    await this.kernel.bin.exec({ message: cmd }, ondata)
   }
   async installed() {
     if (this.kernel.platform === 'win32') {
@@ -22,7 +22,7 @@ class Zip {
     } else {
       cmd = "conda remove p7zip"
     }
-    await this.kernel.bin.exec({ conda: "base", message: cmd }, ondata)
+    await this.kernel.bin.exec({ message: cmd }, ondata)
   }
 }
 module.exports = Zip

package/kernel/python/index.js

@@ -11,7 +11,6 @@ class Python {
         this.kernel.exec({
           message: "uvicorn --port 42001 server:app",
           path: modpath,
-          conda: "base"
         }, (s) => {
   //        process.stdout.write(s)
           ondata(s)

package/kernel/shell.js

@@ -463,125 +463,115 @@ class Shell {
     }
   }
   async activate(params) {
+
+    // conda and venv can coexist
+    // 1. first process conda
+    //    - if conda is not specified => base => no need to create
+    //    - if conda is specified
+    //      - if string => the string is the path => create if doesn't exist yet
+    //      - if object => the conda.path is the path => create if doesn't exist yet
+    // 2. then process venv
+
+
+    // 1. conda
+    let conda
     if (params.conda) {
-      if (params.conda === "base") {
-        // using the base env
-        params.message = [
-          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-          `conda deactivate`,
-          `conda deactivate`,
-          `conda deactivate`,
-          `conda activate ${params.conda}`,
-//          'pip install --upgrade wheel pip setuptools',
-        ].concat(params.message)
-      } else {
-        if (typeof params.conda === "string") {
-          let env_path = path.resolve(params.path, params.conda)
-          let env_exists = await this.exists(env_path)
-          if (env_exists) {
-            params.message = [
-              (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-              //`conda activate ${params.conda}`,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda activate ${env_path}`,
-//              'pip install --upgrade wheel pip setuptools',
-            ].concat(params.message)
+      conda = params.conda
+    } else {
+      conda = null
+    }
+
+    let conda_activation
+    if (params.skip_conda) {
+      // don't activate
+      conda_activation = []
+    } else {
+      if (conda) {
+        let conda_path
+        let conda_python
+        if (typeof conda === "string") {
+          conda_path = conda
+          conda_python = "python=3.10"
+        } else {
+          if (conda.path) {
+            conda_path = conda.path
           } else {
-            params.message = [
-              (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-              `conda create -y -p ${env_path} python=3.10`,
-              //`conda activate ${params.conda}`,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda activate ${env_path}`,
-//              'pip install --upgrade wheel pip setuptools',
-            ].concat(params.message)
+            throw new Error("when specifying conda as an object, the conda.path must exist")
           }
-        } else if (typeof params.conda === "object" && params.conda.path) {
-          let env_path = path.resolve(params.path, params.conda.path)
-          let env_exists = await this.exists(env_path)
-          if (env_exists) {
-            params.message = [
-              (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda activate ${env_path}`,
-//              'pip install --upgrade wheel pip setuptools',
-            ].concat(params.message)
+          if (conda.python) {
+            conda_python = conda.python
           } else {
-            let create_command
-            if (params.conda.python) {
-              create_command = `conda create -y -p ${env_path} python=${params.conda.python}`
-            } else {
-              create_command = `conda create -y -p ${env_path} python=3.10`
-            }
-            params.message = [
-              (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-              create_command,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda deactivate`,
-              `conda activate ${env_path}`,
-//              'pip install --upgrade wheel pip setuptools',
-            ].concat(params.message)
+            conda_python = "python=3.10"
           }
         }
-      }
-      if (this.env) {
-//        this.env.CONDA_PIP_INTEROP_ENABLED = "1"
-        this.env.CONDA_AUTO_ACTIVATE_BASE = "false"
-        this.env.PYTHONNOUSERSITE = "1"
-      } else {
-        //this.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
-        this.env = { CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
-      }
-    } else 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 env_exists = await this.exists(env_path)
-      if (env_exists) {
-        params.message = [
 
-          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-          `conda deactivate`,
-          `conda deactivate`,
-          `conda deactivate`,
-          `conda activate base`,
+        let env_path = path.resolve(params.path, conda_path)
+        let env_exists = await this.exists(env_path)
+        if (env_exists) {
+          conda_activation = [
+            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda activate ${env_path}`,
+          ]
+        } else {
+          conda_activation = [
+            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            `conda create -y -p ${env_path} ${conda_python}`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda activate ${env_path}`,
+          ]
+        }
 
-          (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-          //'pip install --upgrade pip',
- //         'pip install --upgrade wheel pip setuptools',
-        ].concat(params.message)
       } else {
-        params.message = [
-
+        // base environment => no need to create
+        conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
           `conda activate base`,
+        ]
+      }
+    }
 
+    // Update env setting
+    if (this.env) {
+//        this.env.CONDA_PIP_INTEROP_ENABLED = "1"
+      this.env.CONDA_AUTO_ACTIVATE_BASE = "false"
+      this.env.PYTHONNOUSERSITE = "1"
+    } else {
+      //this.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
+      this.env = { CONDA_AUTO_ACTIVATE_BASE: "false", PYTHONNOUSERSITE: "1" }
+    }
 
+
+
+    // 2. venv
+    let venv_activation
+    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 env_exists = await this.exists(env_path)
+      if (env_exists) {
+        venv_activation = [
+          (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
+        ]
+      } else {
+        venv_activation = [
           `python -m venv ${env_path}`,
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-          //'pip install --upgrade pip',
-//          'pip install --upgrade wheel pip setuptools',
-        ].concat(params.message)
+        ]
       }
     } else {
-      params.message = [
-        (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-        `conda deactivate`,
-        `conda deactivate`,
-        `conda deactivate`,
-        `conda activate base`,
-      ].concat(params.message)
+      venv_activation = []
     }
 
+    // 3. construct params.message
+    params.message = conda_activation.concat(venv_activation).concat(params.message)
     return params
   }
   async exec(params) {

package/kernel/sysinfo.js

@@ -100,7 +100,7 @@ class Sysinfo {
     } else {
       cmd = "env"
     }
-    let res = await this.kernel.bin.exec({ message: cmd, conda: "base" }, (stream) => {
+    let res = await this.kernel.bin.exec({ message: cmd }, (stream) => {
     })
     let lines = res.response.split(/[\r\n]+/)
     let vars = []

package/package.json

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