pinokiod 3.2.200 → 3.2.201

package/kernel/bin/index.js

@@ -236,61 +236,87 @@ class Bin {
     let start
     let conda_check = {}
     let conda = new Set()
-    res = await this.exec({ message: `conda list` }, (stream) => {
-//      process.stdout.write(stream.raw)
-//        console.log("conda list check", { stream })
+
+    //////////////////////////////////////////////////////////////////
+    // exception handling
+    // if importlib_metadata || uvicorn || fastapi exist in the base environment, this.correct_conda = false
+    let site_packages_path
+    if (this.platform === "win32") {
+      site_packages_path = path.resolve(this.kernel.homedir, "bin/miniconda/Lib/site-packages")
+    } else {
+      site_packages_path = path.resolve(this.kernel.homedir, "bin/miniconda/lib/python3.10/site-packages")
+    }
+    // check if any of 'uvicorn', 'importlib_metadata', 'fastapi' exists
+    let module_paths = ["fastapi", "uvicorn", "importlib_metadata"].map((name) => {
+      return path.resolve(site_packages_path, name)
     })
+    let to_reset_exists = false
+    for(let module_path of module_paths) {
+      let e = await this.kernel.exists(module_path)
+      if (!e) {
+        to_reset_exists = true
+        break;
+      }
+    }
+    console.log({ to_reset_exists })
+    if (to_reset_exists) {
+      this.correct_conda = false
+    } else {
+      res = await this.exec({ message: `conda list` }, (stream) => {
+  //      process.stdout.write(stream.raw)
+  //        console.log("conda list check", { stream })
+      })
 
-    let lines = res.response.split(/[\r\n]+/)
-    for(let line of lines) {
-      if (start) {
-        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") {
-            if (String(version) === "24.11.3") {
-              conda_check.conda = true
+      let lines = res.response.split(/[\r\n]+/)
+      for(let line of lines) {
+        if (start) {
+          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") {
+              if (String(version) === "24.11.3") {
+                conda_check.conda = true
+              }
             }
-          }
-          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
+            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")
+            // 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")
+              }
             }
           }
-        }
-      } else {
-        if (/.*name.*version.*build.*channel/i.test(line)) {
-          start = true 
+        } else {
+          if (/.*name.*version.*build.*channel/i.test(line)) {
+            start = true 
+          }
         }
       }
-    }
 
-    console.log({ conda_check })
-    if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
-      this.correct_conda = true
+      console.log({ conda_check })
+      if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+        this.correct_conda = true
+      }
     }
-
     this.installed.conda = conda
   }
   async refreshInstalled() {

package/package.json

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