pinokiod 3.0.24 → 3.0.26

package/kernel/shell.js

@@ -110,8 +110,6 @@ class Shell {
       delete this.env.CUDA_PATH
     }
 
-    this.env.PINOKIO_SHELL_START = Date.now()
-
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
 //    this.env.NPM_CONFIG_USERCONFIG = this.kernel.path("user_npmrc")
@@ -452,17 +450,9 @@ class Shell {
 //        params.message.push(`echo "SHELL FINISHED RUNNING"\r\n`)
         // if params.message is empty, filter out
         //let delimiter = " && "
-
-        if (this.platform === "win32") {
-          params.message.push(`echo "--- pinokio shell.run finished: %PINOKIO_SHELL_START% ---"`)
-        } else {
-          params.message.push('echo "--- pinokio shell.run finished $PINOKIO_SHELL_START ---"')
-        }
-
         let delimiter
         if (this.platform === "win32") {
-          //delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
-          delimiter = " & "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+          delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
         } else {
           delimiter = " ; ";
         }
@@ -550,6 +540,8 @@ class Shell {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
           `conda activate ${env_path}`,
         ]
       } else {
@@ -557,6 +549,8 @@ class Shell {
           (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 activate ${env_path}`,
         ]
       }
@@ -565,6 +559,8 @@ class Shell {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
           `conda activate ${conda_name}`,
         ]
       } else {
@@ -575,6 +571,8 @@ class Shell {
           conda_activation = [
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             `conda deactivate`,
+            `conda deactivate`,
+            `conda deactivate`,
             `conda activate ${conda_name}`,
           ]
         } else {
@@ -582,6 +580,8 @@ class Shell {
             (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 activate ${conda_name}`,
           ]
         }
@@ -827,13 +827,9 @@ ${cleaned}
       // Decide whether to kill or continue
       if (this.ready) {
         // when ready, watch out for the prompt pattern that terminates with [\r\n ]
-
-        let termination_prompt_re = new RegExp(".*--- pinokio shell.run finished: [0-9]+ ---.*", "g")
-
-        //let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
+        let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
         let line = cleaned.replaceAll(/[\r\n]/g, "")
         let test = line.match(termination_prompt_re)
-        console.log({ line, test, termination_prompt_re })
         if (test) {
           let cache = cleaned
           let cached_msg = msg

package/package.json

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

package/server/index.js

@@ -1323,6 +1323,10 @@ class Server {
               if (config.color) this.colors.color = config.color
               if (config.symbolColor) this.colors.symbolColor = config.symbolColor
             }
+            if (config.xterm) {
+              this.xterm = config.xterm
+              console.log("this.xterm", this.xterm)
+            }
           }
         }
       }
@@ -2670,6 +2674,22 @@ class Server {
         agent: this.agent,
       })
     }))
+    this.app.get("/xterm_config", ex(async (req, res) => {
+      let exists = await fse.pathExists(this.kernel.path("web"))
+      if (exists) {
+        let config_exists = await fse.pathExists(this.kernel.path("web/config.json"))
+        if (config_exists) {
+          let config = (await this.kernel.loader.load(this.kernel.path("web/config.json"))).resolved
+          if (config) {
+            if (config.xterm) {
+              this.xterm = config.xterm
+              console.log("this.xterm", this.xterm)
+            }
+          }
+        }
+      }
+      res.json({ config: this.xterm })
+    }))
     this.app.get("/du/:name", ex(async (req, res) => {
       let p = this.kernel.path("api", req.params.name)
       let d1 = await Util.du(p)

package/server/views/editor.ejs

@@ -572,34 +572,19 @@ document.addEventListener("DOMContentLoaded", async () => {
       await this.createTerm()
       await this.start(mode)
     }
-    createTerm () {
+    async createTerm () {
       if (!this.term) {
-        const term = new Terminal({
-          //theme: xtermTheme.Piatto_Light,
-          //theme: xtermTheme.Spring,
-
-          //theme: xtermTheme.Github,
-
-          //theme: xtermTheme.Cobalt_Neon,      // top legibility
-          //theme: xtermTheme.Duotone_Dark,
-          theme: xtermTheme.FrontEndDelight,
-          //theme: xtermTheme.Seafoam_Pastel,
-          //theme: xtermTheme.IC_Green_PPL,
-          //theme: xtermTheme.FunForrest,
-          //theme: xtermTheme.Jackie_Brown,
-          //theme: xtermTheme.Ocean,
-
-          //theme: xtermTheme.Blazer,
-          //theme: xtermTheme.BirdsOfParadise,
-          //theme: xtermTheme.AtelierSulphurpool,
-          //theme: xtermTheme.Borland,
-          //rows: 20,
-          //cols: 1000,
+        let config = {
           fontSize: 12,
-          //cursorBlink: false,
-          //cursorStyle: 'block'
-
-        });
+          theme: xtermTheme.FrontEndDelight
+        }
+        let res = await fetch("/xterm_config").then((res) => {
+          return res.json()
+        })
+        if (res && res.config) {
+          config = res.config
+        }
+        const term = new Terminal(config)
         term.open(document.querySelector("#terminal"))
 
 

package/server/views/fullscreen_editor.ejs

@@ -556,35 +556,20 @@ document.addEventListener("DOMContentLoaded", async () => {
       await this.createTerm()
       await this.start(mode)
     }
-    createTerm () {
+    async createTerm () {
       if (!this.term) {
-        const term = new Terminal({
+        let config = {
           scrollback: 9999999,
-          //theme: xtermTheme.Piatto_Light,
-          //theme: xtermTheme.Spring,
-
-          //theme: xtermTheme.Github,
-
-          //theme: xtermTheme.Cobalt_Neon,      // top legibility
-          //theme: xtermTheme.Duotone_Dark,
-          //theme: xtermTheme.Batman,
-          //theme: xtermTheme.Brogrammer,
-          theme: xtermTheme.FrontEndDelight,
-          //theme: xtermTheme.Seafoam_Pastel,
-          //theme: xtermTheme.IC_Green_PPL,
-          //theme: xtermTheme.FunForrest,
-          //theme: xtermTheme.Jackie_Brown,
-          //theme: xtermTheme.Ocean,
-
-          //theme: xtermTheme.Blazer,
-          //theme: xtermTheme.BirdsOfParadise,
-          //theme: xtermTheme.AtelierSulphurpool,
-          //theme: xtermTheme.Borland,
           fontSize: 12,
-          //cursorBlink: false,
-          //cursorStyle: 'block'
-
-        });
+          theme: xtermTheme.FrontEndDelight
+        }
+        let res = await fetch("/xterm_config").then((res) => {
+          return res.json()
+        })
+        if (res && res.config) {
+          config = res.config
+        }
+        const term = new Terminal(config)
         term.open(document.querySelector("#terminal"))
 
         term.attachCustomKeyEventHandler(event => {