pinokiod 3.2.94 → 3.2.96

package/kernel/bin/aria2.js

@@ -17,7 +17,12 @@ class Aria2 {
       await this.kernel.bin.download(url, dest, ondata)
       await this.kernel.bin.unzip(dest, "aria2", ondata)
     } else {
-      await this.kernel.bin.exec({ message: "conda install -y -c conda-forge aria2" }, ondata)
+      await this.kernel.bin.exec({
+        message: [
+          "conda clean -y --all",
+          "conda install -y -c conda-forge aria2"
+        ]
+      }, ondata)
     }
   }
   async installed() {

package/kernel/bin/conda.js

@@ -122,9 +122,12 @@ conda-libmamba-solver=24.7.0`)
       `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 config --file ${this.kernel.path('condarc')} --set repodata_threads 4`,
+      `conda config --file ${this.kernel.path('condarc')} --set fetch_threads 5`,
 //      "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 clean -y --all",
       "conda update -y --all",
       "conda clean -y --all",
 //      "conda update -y conda",
@@ -205,7 +208,7 @@ conda-libmamba-solver=24.7.0`)
     let e
     for(let p of this.paths[this.kernel.platform]) {
       let e = await this.kernel.bin.exists(p)
-      if (e) return true
+      if (e && this.kernel.bin.correct_conda) return true
     }
     return false
   }

package/kernel/bin/cuda.js

@@ -2,14 +2,20 @@ class Cuda {
   async install(req, ondata) {
     if (this.kernel.platform === "win32") {
       await this.kernel.bin.exec({
-        message: "conda install -y cudnn libzlib-wapi -c conda-forge",
+        message: [
+          "conda clean -y --all",
+          "conda clean -y -all && conda install -y cudnn libzlib-wapi -c conda-forge",
+        ]
 //        conda: {
 //          name: "base",
 //          activate: "minimal"
 //        }
       }, ondata)
       await this.kernel.bin.exec({
-        message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
+        message: [
+          "conda clean -y --all",
+          "conda clean -y -all && conda install -y cuda -c nvidia/label/cuda-12.1.0",
+        ]
 //        conda: {
 //          name: "base",
 //          activate: "minimal"
@@ -17,14 +23,20 @@ class Cuda {
       }, ondata)
     } else {
       await this.kernel.bin.exec({
-        message: "conda install -y cudnn -c conda-forge",
+        message: [
+          "conda clean -y --all",
+          "conda install -y cudnn -c conda-forge",
+        ]
 //        conda: {
 //          name: "base",
 //          activate: "minimal"
 //        }
       }, ondata)
       await this.kernel.bin.exec({
-        message: "conda install -y cuda -c nvidia/label/cuda-12.1.0",
+        message: [
+          "conda clean -y --all",
+          "conda install -y cuda -c nvidia/label/cuda-12.1.0",
+        ]
 //        conda: {
 //          name: "base",
 //          activate: "minimal"

package/kernel/bin/ffmpeg.js

@@ -5,7 +5,10 @@ const decompress = require('decompress');
 class Ffmpeg {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge ffmpeg",
+        message: [
+          "conda clean -y --all",
+          "conda install -y -c conda-forge ffmpeg",
+        ]
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/kernel/bin/git.js

@@ -6,7 +6,10 @@ const path = require("path")
 class Git {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install --no-shortcuts -y -c conda-forge git git-lfs",
+        message: [
+          "conda clean -y --all",
+          "conda install --no-shortcuts -y -c conda-forge git git-lfs",
+        ]
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/kernel/bin/huggingface.js

@@ -1,7 +1,10 @@
 class Huggingface {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge huggingface_hub",
+        message: [
+          "conda clean -y --all",
+          "conda install -y -c conda-forge huggingface_hub",
+        ]
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/kernel/bin/index.js

@@ -252,6 +252,7 @@ class Bin {
     let start
     let res
     let lines
+    let conda_check = {}
     if (conda_exists) {
       res = await this.exec({ message: `conda list` }, (stream) => {
 //        console.log("conda list check", { stream })
@@ -263,7 +264,19 @@ class Bin {
         if (start) {
           let chunks = line.split(/\s+/).filter(x => x)
           if (chunks.length > 1) {
-            conda.add(chunks[0])
+            let name = chunks[0]
+            let version = chunks[1]
+            conda.add(name)
+            if (name === "conda") {
+              if (String(version) === "24.7.1") {
+                conda_check.conda = true
+              }
+            }
+            if (name === "conda-libmamba-solver") {
+              if (String(version) === "24.7.0") {
+                conda_check.mamba = true
+              }
+            }
           }
         } else {
           if (/name.*version.*build.*channel/i.test(line)) {
@@ -273,6 +286,11 @@ class Bin {
       }
     }
 
+    console.log({ conda_check })
+    if (conda_check.conda && conda_check.mamba) {
+      this.correct_conda = true
+    }
+
     this.installed.conda = conda
 
     // 2. pip

package/kernel/bin/llvm.js

@@ -4,7 +4,10 @@ class LLVM {
       await bin.exec({ conda: { skip: true }, message: "brew install llvm" }, ondata)
     } else {
       await bin.exec({
-        message: "conda install -y -c conda-forge llvm",
+        message: [
+          "conda clean -y --all",
+          "conda install -y -c conda-forge llvm",
+        ]
 //        conda: {
 //          name: "base",
 //          activate: "minimal"

package/kernel/bin/node.js

@@ -6,7 +6,10 @@ class Node {
   async install(req, ondata) {
     await this.kernel.bin.exec({
       //message: "conda install -y nodejs=22.12.0 -c conda-forge"
-      message: "conda install -y nodejs=20.17.0 -c conda-forge",
+      message: [
+        "conda clean -y --all",
+        "conda install -y nodejs=20.17.0 -c conda-forge",
+      ]
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/kernel/bin/uv.js

@@ -5,7 +5,10 @@ const decompress = require('decompress');
 class UV {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge uv",
+      message: [
+        "conda clean -y --all",
+        "conda install -y -c conda-forge uv",
+      ]
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/kernel/bin/zip.js

@@ -7,7 +7,10 @@ class Zip {
       cmd = "conda install -y -c conda-forge p7zip"
     }
     await this.kernel.bin.exec({
-      message: cmd,
+      message: [
+        "conda clean -y --all",
+        cmd
+      ]
 //      conda: {
 //        name: "base",
 //        activate: "minimal"

package/package.json

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