pinokiod 3.2.93 → 3.2.94

package/kernel/bin/conda.js

@@ -119,11 +119,14 @@ conda-libmamba-solver=24.7.0`)
     let cmds = [
       //"conda clean -y --index-cache",
       "conda clean -y --all",
+      `conda config --file ${this.kernel.path('condarc')} --set remote_connect_timeout_secs 20`,
       `conda config --file ${this.kernel.path('condarc')} --set remote_read_timeout_secs 300`,
+      `conda config --file ${this.kernel.path('condarc')} --set remote_max_retries 6`,
 //      "conda install libsqlite --force-reinstall -y",
 //      `conda config --file ${this.kernel.path('condarc')} --set auto_update_conda False`,
       "conda install -y conda-libmamba-solver=24.7.0 conda=24.7.1",
       "conda update -y --all",
+      "conda clean -y --all",
 //      "conda update -y conda",
 //      "conda update -y --all",
     ]

package/kernel/shell.js

@@ -110,7 +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")
@@ -454,10 +453,8 @@ class Shell {
         let delimiter
         if (this.platform === "win32") {
           delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
-          params.message.push(`echo "--- pinokio shell.run finished: %PINOKIO_SHELL_START% ---"`)
         } else {
           delimiter = " ; ";
-          params.message.push('echo "--- pinokio shell.run finished $PINOKIO_SHELL_START ---"')
         }
         return params.message.filter((m) => {
           return m && !/^\s+$/.test(m)
@@ -559,8 +556,7 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ?  `call conda activate ${env_path}` : `conda activate ${env_path}`),
-          //`conda activate ${env_path}`,
+          `conda activate ${env_path}`,
         ]
       } else {
         conda_activation = [
@@ -569,8 +565,7 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ?  `call conda activate ${env_path}` : `conda activate ${env_path}`),
-          //`conda activate ${env_path}`,
+          `conda activate ${env_path}`,
         ]
       }
     } else if (conda_name) {
@@ -580,8 +575,7 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda deactivate`,
-          (this.platform === 'win32' ?  `call conda activate ${conda_name}` : `conda activate ${conda_name}`),
-          //`conda activate ${conda_name}`,
+          `conda activate ${conda_name}`,
         ]
       } else {
         let envs_path = this.kernel.bin.path("miniconda/envs")
@@ -593,8 +587,7 @@ class Shell {
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
-            (this.platform === 'win32' ?  `call conda activate ${conda_name}` : `conda activate ${conda_name}`),
-            //`conda activate ${conda_name}`,
+            `conda activate ${conda_name}`,
           ]
         } else {
           conda_activation = [
@@ -603,8 +596,7 @@ class Shell {
             `conda deactivate`,
             `conda deactivate`,
             `conda deactivate`,
-            (this.platform === 'win32' ?  `call conda activate ${conda_name}` : `conda activate ${conda_name}`),
-            //`conda activate ${conda_name}`,
+            `conda activate ${conda_name}`,
           ]
         }
       }
@@ -849,13 +841,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(this.prompt_pattern + "[ \r\n]*$", "g")
-        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 line = cleaned.replaceAll(/[\r\n]/g, "")
         let test = line.match(termination_prompt_re)
-        console.log(">> LINE, TEST")
-        console.log("line", line)
-        console.log("test", test)
         if (test) {
           let cache = cleaned
           let cached_msg = msg

package/package.json

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