pinokiod 3.2.120 → 3.2.123

package/kernel/bin/conda.js

@@ -90,10 +90,80 @@ create_default_packages:
 //    - python=3.10`)
 //    }
 //  }
+  async check() {
+    let res = await this.kernel.bin.exec({ message: `conda list` }, (stream) => {
+//        console.log("conda list check", { stream })
+    })
+
+    console.log("CONDA", res.response)
+    lines = res.response.split(/[\r\n]+/)
+    let conda_check = {}
+    for(let line of lines) {
+      let chunks = line.split(/\s+/).filter(x => x)
+      if (chunks.length > 1) {
+        let name = chunks[0]
+        let version = chunks[1]
+        conda.add(name)
+        if (name === "conda") {
+          if (String(version) === "24.11.1") {
+            conda_check.conda = true
+          }
+        }
+        // check conda-libmamba-solver is up to date
+        // sometimes it just fails silently so need to check
+        if (name === "conda-libmamba-solver") {
+          //if (String(version) === "24.7.0") {
+          let channel = chunks[3]
+          let coerced = semver.coerce(version)
+          let mamba_requirement = ">=24.11.1"
+          console.log({ name, channel, version })
+          if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
+            conda_check.mamba = true
+          }
+        }
+
+        // Use sqlite to check if `conda update -y --all` went through successfully
+        // sometimes it just fails silently so need to check
+        if (name === "sqlite") {
+          let coerced = semver.coerce(version)
+          let sqlite_requirement = ">=3.47.2"
+          console.log({ coerced, version, sqlite_requirement })
+          if (semver.satisfies(coerced, sqlite_requirement)) {
+            console.log("semver satisfied")
+            conda_check.sqlite = true
+          } else {
+            console.log("semver NOT satisfied")
+          }
+        }
+      }
+    }
+    console.log("> Check", { conda_check })
+    return conda_check.conda && conda_check.mamba && conda_check.sqlite
+  }
   async install(req, ondata) {
+    for(let i=0; i<5; i++) {
+      await this._install(req, ondata)
+      let installed = await this.check()
+      if (installed) {
+        console.log("Conda properly installed and updated")
+        return
+      } else {
+        console.log("Conda NOT roperly installed and updated. Trying again...")
+      }
+    }
+  }
+  async _install(req, ondata) {
     const installer_url = this.urls[this.kernel.platform][this.kernel.arch]
     const installer = this.installer[this.kernel.platform]
     const install_path = this.kernel.bin.path("miniconda")
+    let install_path_exists = await this.kernel.exists("miniconda")
+    if (install_path_exists) {
+      console.log("Install path already exists. Removing...", install_path)
+      await fs.promises.rm(install_path, { recursive: true }).catch((e) => {
+      })
+    } else {
+      console.log("Install path does not exist. Installing...")
+    }
 
     ondata({ raw: `downloading installer: ${installer_url}...\r\n` })
     await this.kernel.bin.download(installer_url, installer, ondata)
@@ -144,7 +214,7 @@ create_default_packages:
       `conda config --file ${this.kernel.path('condarc')} --set remote_max_retries 6`,
       `conda config --file ${this.kernel.path('condarc')} --set repodata_threads 4`,
       `conda config --file ${this.kernel.path('condarc')} --set fetch_threads 5`,
-      "conda install -y -c conda-forge conda-libmamba-solver=24.11.1",
+//      "conda install -y -c conda-forge conda-libmamba-solver=24.11.1",
 //      "conda install libsqlite --force-reinstall -y",
 //      `conda config --file ${this.kernel.path('condarc')} --set auto_update_conda False`,
       //"conda install -y conda=24.9.0 -vvv --strict-channel-priority",
@@ -152,6 +222,7 @@ create_default_packages:
       //"conda install -y conda-libmamba-solver=24.7.0 conda=24.7.1 -vvv --strict-channel-priority",
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.7.1",
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
+      "conda update -y conda-libmamba-solver",
       "conda update -y --all",
 //      "conda update -y conda",
 //      "conda update -y --all",

package/kernel/bin/index.js

@@ -278,16 +278,16 @@ class Bin {
               }
             }
 
-            // check conda-libmamba-solver is up to date
-            // sometimes it just fails silently so need to check
-            if (name === "conda-libmamba-solver") {
-              //if (String(version) === "24.7.0") {
-              let channel = chunks[3]
-              console.log({ name, channel, version })
-              if (String(version) === "24.11.1" && channel === "conda-forge") {
-                conda_check.mamba = true
-              }
-            }
+//            // check conda-libmamba-solver is up to date
+//            // sometimes it just fails silently so need to check
+//            if (name === "conda-libmamba-solver") {
+//              //if (String(version) === "24.7.0") {
+//              let channel = chunks[3]
+//              console.log({ name, channel, version })
+//              if (String(version) === "24.11.1" && channel === "conda-forge") {
+//                conda_check.mamba = true
+//              }
+//            }
 
             // Use sqlite to check if `conda update -y --all` went through successfully
             // sometimes it just fails silently so need to check
@@ -312,7 +312,8 @@ class Bin {
     }
 
     console.log({ conda_check })
-    if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+    //if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+    if (conda_check.conda && conda_check.sqlite) {
     //if (conda_check.conda) {
       this.correct_conda = true
     }

package/package.json

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