pinokiod 7.3.0 → 7.3.1

package/kernel/bin/{conda-python.js → conda-pins.js}

@@ -1,8 +1,27 @@
 const semver = require('semver')
 
+const CONDA_PIN_VERSION = "25.5.1"
+const DEFAULT_SQLITE_PIN_VERSION = "3.47.2"
+const WINDOWS_SQLITE_PIN_VERSION = "3.53.2"
 const WINDOWS_PYTHON_SSL_FIX_SPEC = "python=3.10.20=*_1_cpython"
 const WINDOWS_PYTHON_SSL_FIX_VERSION = "3.10.20"
 
+const sqlitePinVersion = (platform) => {
+  return platform === "win32" ? WINDOWS_SQLITE_PIN_VERSION : DEFAULT_SQLITE_PIN_VERSION
+}
+
+const sqliteInstallSpec = (platform) => {
+  return `sqlite=${sqlitePinVersion(platform)}`
+}
+
+const sqlitePinnedSpec = (platform) => {
+  return `sqlite ==${sqlitePinVersion(platform)}`
+}
+
+const isExpectedSqlitePinned = (platform, version) => {
+  return String(version) === sqlitePinVersion(platform)
+}
+
 const condaBuildNumber = (build) => {
   const chunks = String(build || "").split("_").reverse()
   const buildNumber = chunks.find((chunk) => /^\d+$/.test(chunk))
@@ -25,6 +44,10 @@ const isWindowsPythonSslFixed = (version, build) => {
 }
 
 module.exports = {
+  CONDA_PIN_VERSION,
   WINDOWS_PYTHON_SSL_FIX_SPEC,
+  isExpectedSqlitePinned,
   isWindowsPythonSslFixed,
+  sqliteInstallSpec,
+  sqlitePinnedSpec,
 }

package/kernel/bin/conda.js

@@ -5,9 +5,13 @@ const { glob } = require('glob')
 const semver = require('semver')
 const { buildCondaListFromMeta } = require('./conda-meta')
 const {
+  CONDA_PIN_VERSION,
   WINDOWS_PYTHON_SSL_FIX_SPEC,
+  isExpectedSqlitePinned,
   isWindowsPythonSslFixed,
-} = require('./conda-python')
+  sqliteInstallSpec,
+  sqlitePinnedSpec,
+} = require('./conda-pins')
 
 class Conda {
   description = "Pinokio uses Conda to install various useful programs in an isolated manner."
@@ -53,6 +57,12 @@ class Conda {
     win32: ["miniconda/etc/profile.d", "miniconda/bin", "miniconda/Scripts", "miniconda/condabin", "miniconda/lib", "miniconda/Library/bin", "miniconda/pkgs", "miniconda"],
     linux: ["miniconda/etc/profile.d", "miniconda/bin", "miniconda/condabin", "miniconda/lib", "miniconda/Library/bin", "miniconda/pkgs", "miniconda"]
   }
+  pinnedPackages() {
+    return [
+      `conda ==${CONDA_PIN_VERSION}`,
+      sqlitePinnedSpec(this.kernel.platform),
+    ].join("\n")
+  }
   env() {
     let base = {
 //      CONDA_ROOT: this.kernel.bin.path("miniconda"),
@@ -134,7 +144,7 @@ report_errors: false`)
       let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
       if (pinned_exists) {
         //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
-        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "conda ==25.5.1\nsqlite ==3.47.2")
+        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), this.pinnedPackages())
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
 //sqlite ==3.47.2`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
@@ -201,7 +211,7 @@ report_errors: false`)
           // Use sqlite to check if `conda update -y --all` went through successfully
           // sometimes it just fails silently so need to check
           if (name === "sqlite") {
-            if (String(version) === "3.47.2") {
+            if (isExpectedSqlitePinned(this.kernel.platform, version)) {
               conda_check.sqlite = true
             }
             //let coerced = semver.coerce(version)
@@ -278,7 +288,7 @@ report_errors: false`)
     if (pinned_exists) {
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
-      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "conda ==25.5.1\nsqlite ==3.47.2")
+      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), this.pinnedPackages())
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "sqlite ==3.47.2")
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), "")
 //sqlite ==3.47.2`)
@@ -313,7 +323,7 @@ report_errors: false`)
     console.log("Conda dependencies to install", { mods })
 
     let condaPackages = [
-      `"sqlite=3.47.2"`,
+      `"${sqliteInstallSpec(this.kernel.platform)}"`,
       `"conda-libmamba-solver>=25.4.0"`,
     ]
     if (this.kernel.platform === "win32") {

package/kernel/bin/index.js

@@ -22,7 +22,10 @@ const VS = require("./vs")
 const Cuda = require("./cuda")
 const Torch = require("./torch")
 const { buildCondaListFromMeta } = require('./conda-meta')
-const { isWindowsPythonSslFixed } = require('./conda-python')
+const {
+  isExpectedSqlitePinned,
+  isWindowsPythonSslFixed,
+} = require('./conda-pins')
 const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
 const fse = require('fs-extra')
@@ -409,7 +412,7 @@ class Bin {
             // Use sqlite to check if `conda update -y --all` went through successfully
             // sometimes it just fails silently so need to check
             if (name === "sqlite") {
-              if (String(version) === "3.47.2") {
+              if (isExpectedSqlitePinned(this.platform, version)) {
                 conda_check.sqlite = true
               }
             }

package/package.json

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