pinokiod 1.2.9 → 1.2.11

package/kernel/bin/cuda.js

@@ -5,14 +5,14 @@ class Cuda {
         message: "conda install -y cudnn libzlib-wapi -c conda-forge",
       }, ondata)
       await this.kernel.bin.exec({
-        message: "conda install -y cuda -c nvidia/label/cuda-11.8.0",
+        message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
       }, ondata)
     } else {
       await this.kernel.bin.exec({
         message: "conda install -y cudnn -c conda-forge",
       }, ondata)
       await this.kernel.bin.exec({
-        message: "conda install -y cuda -c nvidia/label/cuda-11.8.0",
+        message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
       }, ondata)
     }
   }

package/kernel/index.js

@@ -28,7 +28,7 @@ const VARS = {
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
   //schema = ">=1.0.0"
-  schema = "<=1.2.0"
+  schema = "<=1.3.0"
   constructor(store) {
     this.fetch = fetch
     this.store = store

package/kernel/shell.js

@@ -474,37 +474,47 @@ class Shell {
 
 
     // 1. conda
-    let conda
+
+    let conda_activation = []
     if (params.conda) {
-      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"
+      // 1. conda_path/conda_name/conda_python
+      let conda_path
+      let conda_name
+      let conda_python = "python=3.10"
+      if (typeof params.conda === "string") {
+        // params.conda => interpret as path
+        conda_path = params.conda
+      } else {
+        // params.conda.skip
+        if (params.conda.skip) {
+          // do nothing
         } else {
-          if (conda.path) {
-            conda_path = conda.path
+          if (typeof conda === "string") {
+            conda_path = conda
           } else {
-            throw new Error("when specifying conda as an object, the conda.path must exist")
-          }
-          if (conda.python) {
-            conda_python = conda.python
-          } else {
-            conda_python = "python=3.10"
+            // conda_path
+            if (conda.path) {
+              conda_path = conda.path
+            } else if (conda.name) {
+              conda_name = conda.name
+            } else {
+              throw new Error("when specifying conda as an object, the conda.name or conda.path must exist")
+            }
+
+            // conda_python
+            if (conda.python) {
+              conda_python = conda.python
+            }
           }
         }
+      }
+
+      console.log("CONDA STEP 1", { conda: params.conda, conda_path, conda_name, conda_python })
+
 
+      // 2. conda_activation
+      if (conda_path) {
         let env_path = path.resolve(params.path, conda_path)
         let env_exists = await this.exists(env_path)
         if (env_exists) {
@@ -525,19 +535,37 @@ class Shell {
             `conda activate ${env_path}`,
           ]
         }
-
+      } else if (conda_name) {
+        let envs_path = this.kernel.bin.path("miniconda/envs")
+        let env_path = path.resolve(envs_path, conda_name)
+        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 ${conda_name}`,
+          ]
+        } else {
+          conda_activation = [
+            (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+            `conda create -y -n ${conda_name} ${conda_python}`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
+            `conda activate ${conda_name}`,
+          ]
+        }
       } else {
-        // 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`,
-        ]
+        // no conda name or conda path => means don't activate any env
+        conda_activation = []
       }
     }
 
+    console.log("CONDA STEP 2", { conda_activation })
+
+
     // Update env setting
     if (this.env) {
 //        this.env.CONDA_PIP_INTEROP_ENABLED = "1"
@@ -549,7 +577,6 @@ class Shell {
     }
 
 
-
     // 2. venv
     let venv_activation
     if (params.venv) {

package/package.json

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

package/server/index.js

@@ -2034,12 +2034,14 @@ class Server {
         console.log({ config })
 
       }
+      let platform = os.platform()
 
 
 
 
       console.log("MEMORY", this.kernel.memory)
       res.render("browser", {
+        platform,
         running:this.kernel.api.running,
         memory: this.kernel.memory,
         sidebar: "/pinokio/sidebar/" + name,

package/server/public/electron.css

@@ -46,3 +46,7 @@ nav .bar #location {
   cursor: grab;
   -webkit-app-region: drag;
 }
+
+[data-platform='darwin'] #menu {
+  margin-left: 70px; 
+}

package/server/views/browser.ejs

@@ -457,7 +457,7 @@ body.dark .loader-container {
 }
 </style>
 </head>
-<body class='<%=theme%>'>
+<body class='<%=theme%>' data-platform="<%=platform%>">
 <aside class='active'>
   <div class='header-top header-item'>
     <div class='app-info'>