pinokiod 3.2.117 → 3.2.119

package/kernel/bin/conda.js

@@ -131,6 +131,13 @@ conda-libmamba-solver=24.11.1`)
 //  - defaults
 //create_default_packages:
 //  - python=3.10`)
+
+
+    // 1. right after installing conda==24.11.1, run conda update --all
+    // 2. The pinned file says conda-libmamba-solver=24.11.1
+    // 3. so after conda update --all, it should be conda-libmamba-solver=24.11.1
+
+
     let cmds = [
       //"conda clean -y --index-cache",
       "conda clean -y --all",
@@ -139,6 +146,7 @@ conda-libmamba-solver=24.11.1`)
       `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 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",

package/kernel/bin/index.js

@@ -22,6 +22,7 @@ const Torch = require("./torch")
 const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
 const fse = require('fs-extra')
+const semver = require('semver')
 
 
 //const Puppet = require("./puppeteer")
@@ -276,12 +277,25 @@ class Bin {
                 conda_check.conda = true
               }
             }
-//            if (name === "conda-libmamba-solver") {
-//              //if (String(version) === "24.7.0") {
-//              if (String(version) === "24.11.1") {
-//                conda_check.mamba = true
-//              }
-//            }
+            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
+              }
+            }
+            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")
+              }
+            }
           }
         } else {
           if (/name.*version.*build.*channel/i.test(line)) {
@@ -292,8 +306,8 @@ class Bin {
     }
 
     console.log({ conda_check })
-    //if (conda_check.conda && conda_check.mamba) {
-    if (conda_check.conda) {
+    if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+    //if (conda_check.conda) {
       this.correct_conda = true
     }
 

package/package.json

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

package/server/index.js

@@ -2124,23 +2124,34 @@ class Server {
       } else {
       // update the py module if it's already installed
         console.log("not up to date")
-        let installed = await this.kernel.bin.mod.py.installed()
-        console.log("py installed", installed)
-        if (installed) {
-          // update
-          console.log("update py")
-          await this.kernel.exec({
-            message: "git pull",
-            path: this.kernel.path("bin/py")
-          }, (e) => {
-            console.log(e)
-          })
-
-        }
-        // after updating, set the version
-        console.log("set the version", this.version.pinokiod)
-        this.kernel.store.set("version", this.version.pinokiod)
-        console.log("RESTART")
+        await new Promise((resolve, reject) => {
+          let interval = setInterval(async () => {
+            console.log("checking mod.py")
+            if (this.kernel.bin.mod && this.kernel.bin.mod.py) {
+              console.log("mod.py initialized!")
+              let installed = await this.kernel.bin.mod.py.installed()
+              console.log("py installed", installed)
+              if (installed) {
+                // update
+                console.log("update py")
+                await this.kernel.exec({
+                  message: "git pull",
+                  path: this.kernel.path("bin/py")
+                }, (e) => {
+                  console.log(e)
+                })
+              }
+              // after updating, set the version
+              console.log("set the version", this.version.pinokiod)
+              this.kernel.store.set("version", this.version.pinokiod)
+              console.log("RESTART")
+              clearInterval(interval)
+              resolve()
+            } else {
+              console.log("mod.py not initialized yet")
+            }
+          }, 1000)
+        })
         this.listening = true   // set this.listening = true so all http connections get reset when restarting
         await this.start(options)
         console.log("RESTARTED")