pinokiod 3.0.37 → 3.0.38

package/kernel/api/index.js

@@ -556,6 +556,7 @@ class Api {
     // get fully resolved env
     let env = await Environment.get2(request.path, this.kernel)
     // set template
+    console.log("step env", env)
     this.kernel.template.update({ envs: env, env })
 
     // render until `{{ }}` pattern does not exist

package/kernel/bin/conda.js

@@ -122,7 +122,7 @@ create_default_packages:
         //"conda install conda=24.5.0",
         "conda clean -y --index-cache",
         "conda update -y --all",
-        "conda install -y conda=24.9.0",
+//        "conda install -y conda=24.9.0",
 
 
         // handling the conda-libmamba-solver bug here: https://github.com/conda/conda-libmamba-solver/issues/283

package/kernel/bin/node.js

@@ -6,7 +6,7 @@ class Node {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       //message: "conda install -y nodejs=22.12.0 -c conda-forge"
-      message: "conda install -y nodejs -c conda-forge"
+      message: "conda install -y nodejs=20.9.0 -c conda-forge"
     }, ondata)
   }
   async installed() {

package/kernel/environment.js

@@ -380,7 +380,8 @@ const get2 = async (filepath, kernel) => {
   let api_path = Util.api_path(filepath, kernel)
   let default_env = await get(kernel.homedir)
   let api_env = await get(api_path)
-  let current_env = Object.assign({}, process.env, default_env, api_env)
+  let process_env = kernel.envs || process.env
+  let current_env = Object.assign({}, process_env, default_env, api_env)
   return current_env
 }
 

package/kernel/index.js

@@ -341,7 +341,6 @@ class Kernel {
       await this.api.init()
 
       //await this.shell.init()
-      this.shell.init()
 
       if (this.homedir) {
         this.sys = new Sysinfo()
@@ -360,17 +359,33 @@ class Kernel {
           system,
           platform: this.platform,
           arch: this.arch,
-          env: this.envs,
-          envs: this.envs,
+//          env: this.envs,
+//          envs: this.envs,
           proxy: (port) => {
             return this.api.get_proxy_url("/proxy", port)
           },
           ...info
         })
+        console.time("update_sysinfo")
         await this.update_sysinfo()
+        console.timeEnd("update_sysinfo")
       }
 
 
+      console.time("shell.init")
+      this.shell.init().then(() => {
+        console.timeEnd("shell.init")
+        console.log("this.envs", this.envs)
+        console.log("this.template.keys before", this.template.keys)
+        console.log("this.template.vals before", this.template.vals)
+        this.template.update({
+          env: this.envs,
+          envs: this.envs
+        })
+        console.log("this.template.keys after", this.template.keys)
+        console.log("this.template.vals after", this.template.vals)
+      })
+
       let pwpath
       if (this.platform === "win32") {
         pwpath = this.bin.path("miniconda/node_modules/playwright")
@@ -404,6 +419,7 @@ class Kernel {
     try {
       await this.sys.refresh()
       let info = this.sys.info
+      console.log("template.update", info)
       this.template.update(info)
       this.sysinfo = info
       this.gpu = info.gpu

package/kernel/python/index.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const fetch = require('cross-fetch')
 class Python {
   constructor(kernel) {
     this.kernel = kernel

package/package.json

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