pinokiod 3.2.196 → 3.2.198

package/kernel/bin/conda.js

@@ -251,6 +251,9 @@ create_default_packages:
 
     await this.kernel.bin.exec({
       message: cmds,
+      env: {
+        PIP_REQUIRE_VIRTUALENV: "false"
+      }
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/kernel/index.js

@@ -35,7 +35,8 @@ const VARS = {
 class Kernel {
   //schema = ">=1.0.0"
   //schema = "<=2.1.0"
-  schema = "<=3.2.0"
+  //schema = "<=3.2.0"
+  schema = "<=3.3.0"
   constructor(store) {
     this.fetch = fetch
     this.store = store

package/kernel/shell.js

@@ -113,7 +113,7 @@ class Shell {
 
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
-    this.env.PIP_REQUIRE_VIRTUALENV = "True"
+    this.env.PIP_REQUIRE_VIRTUALENV = "true"
 //    this.env.NPM_CONFIG_USERCONFIG = this.kernel.path("user_npmrc")
 //    this.env.NPM_CONFIG_GLOBALCONFIG = this.kernel.path("global_npmrc")
 //    this.env.npm_config_userconfig = this.kernel.path("user_npmrc")

package/package.json

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

package/server/index.js

@@ -2101,6 +2101,22 @@ class Server {
 
     console.log("available port", this.port)
 
+    let version = this.kernel.store.get("version")
+    let home = this.kernel.store.get("home")
+    console.log({ home, version })
+    if (home) {
+      if (version === this.version.pinokiod) {
+        console.log("version up to date")
+      } else {
+        console.log("not up to date. update py.")
+        // remove ~/bin/miniconda/py
+        let p = path.resolve(home, "bin/py")
+        console.log(`[TRY] reset ${p}`)
+        await fse.remove(p)
+        console.log(`[DONE] reset ${p}`)
+      }
+    }
+
     // initialize kernel
     await this.kernel.init({ port: this.port})
 
@@ -2131,64 +2147,64 @@ class Server {
 //    }
     await this.startLogging()
 
-    // check version from this.store
-    let version = this.kernel.store.get("version")
-    // if the version is different from package.json version, run update logic
-    console.log({_homedir: this.kernel.homedir, version, pinokiod: this.version.pinokiod })
-    if (this.kernel.homedir) {
-      if (version === this.version.pinokiod) {
-        console.log("version up to date")
-      } else {
-      // update the py module if it's already installed
-        console.log("not up to date")
-
-//        // give full permission to pinokio folder on windows
-//        if (this.kernel.platform === "win32") {
-//          console.log("1 Give full permission")
-//          await this.kernel.bin.exec({
-//            sudo: true,
-//            message: `icacls ${this.kernel.homedir} /grant Users:(OI)(CI)F /T`
-//          }, (stream) => {
-//            console.log({ stream })
-//          })
-//          console.log("1 Give full permission done")
-//        }
-
-
-        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")
-        return
-      }
-    }
+//    // check version from this.store
+//    //let version = this.kernel.store.get("version")
+//    // if the version is different from package.json version, run update logic
+//    console.log({_homedir: this.kernel.homedir, version, pinokiod: this.version.pinokiod })
+//    if (this.kernel.homedir) {
+//      if (version === this.version.pinokiod) {
+//        console.log("version up to date")
+//      } else {
+//      // update the py module if it's already installed
+//        console.log("not up to date")
+//
+////        // give full permission to pinokio folder on windows
+////        if (this.kernel.platform === "win32") {
+////          console.log("1 Give full permission")
+////          await this.kernel.bin.exec({
+////            sudo: true,
+////            message: `icacls ${this.kernel.homedir} /grant Users:(OI)(CI)F /T`
+////          }, (stream) => {
+////            console.log({ stream })
+////          })
+////          console.log("1 Give full permission done")
+////        }
+//
+//
+//        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")
+//        return
+//      }
+//    }
 
     
 
@@ -2223,7 +2239,7 @@ class Server {
 
 
     //let home = this.kernel.homedir
-    let home = this.kernel.store.get("home")
+    //let home = this.kernel.store.get("home")
     this.app.get("/", ex(async (req, res) => {
       if (req.query.mode !== "settings" && !home) {
         res.redirect("/?mode=settings")

package/server/views/pre.ejs

@@ -126,9 +126,9 @@ footer a.btn {
               <div class='title'><%=item.title%></div>
               <div class='description'><%=item.description%></div>
               <% if (item.href.startsWith("http")) { %>
-                <a target="_blank" features="browser" href='<%=item.href%>' class='btn'><i class="fa-solid fa-square-arrow-up-right"></i> Get</a>
+                <a target="_blank" features="browser" href='<%=item.href%>' class='btn'><i class="fa-solid fa-square-arrow-up-right"></i> Install</a>
               <% } else { %>
-                <button class='btn' data-filepath="<%=item.href%>"><i class="fa-solid fa-square-arrow-up-right"></i> Get</button>
+                <button class='btn' data-filepath="<%=item.href%>"><i class="fa-solid fa-square-arrow-up-right"></i> Install</button>
               <% } %>
             </div>
             <!--