pinokiod 7.5.1 → 7.5.4

package/kernel/bin/ffmpeg.js

@@ -1,6 +1,6 @@
 const RELEASE_VERSION = "8.1.2"
 const CONDA_SPEC = `ffmpeg=${RELEASE_VERSION}`
-const CONDA_CHANNEL_FLAGS = "--override-channels -c conda-forge"
+const CONDA_CHANNEL_FLAGS = "-c conda-forge"
 
 class Ffmpeg {
   description = "Installs FFmpeg for audio and video processing."

package/kernel/bin/index.js

@@ -452,6 +452,8 @@ class Bin {
     let res
     let lines
     this.installed.conda = new Set()
+    this.installed.conda_versions = {}
+    this.installed.conda_builds = {}
     if (conda_exists) {
       // Try 3 times, because sometimes conda just silently quits with no error message
       for(let i=0; i<5; i++) {

package/kernel/bin/setup.js

@@ -14,6 +14,7 @@ module.exports = {
       "node",
       "huggingface",
       "git",
+      "ffmpeg",
 //      "caddy"
     ]
     if (platform !== "win32") {
@@ -183,6 +184,7 @@ module.exports = {
       "node",
       "huggingface",
       "git",
+      "ffmpeg",
     ]
     if (platform !== "win32") {
       conda_requirements.push("tmux")
@@ -222,6 +224,7 @@ module.exports = {
       "huggingface",
       "git",
       "caddy",
+      "ffmpeg",
     ]
     if (platform === "win32") {
       requirements.push({ name: "registry" })

package/package.json

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

package/server/index.js

@@ -5990,6 +5990,8 @@ class Server {
     if (home) {
       if (version === this.version.pinokiod) {
         console.log("version up to date")
+      } else if (!(await this.kernel.exists("bin/miniforge/conda-meta"))) {
+        console.warn("[WARN] Managed home refresh deferred until Miniforge is installed")
       } else {
         // For every update, this gets triggered exactly once.
         // 1. first mkdir if it doesn't exist (this step is irrelevant since at this point the home dir will exist)

package/test/ffmpeg-bin.test.js

@@ -2,6 +2,7 @@ const assert = require('node:assert/strict')
 const test = require('node:test')
 
 const Ffmpeg = require('../kernel/bin/ffmpeg')
+const Setup = require('../kernel/bin/setup')
 
 function createKernel(platform = 'win32') {
   return {
@@ -34,7 +35,7 @@ test('FFmpeg bin installs pinned ffmpeg into base Conda on Windows', async () =>
   assert.equal(calls.length, 1)
   assert.deepEqual(calls[0].message, [
     'conda clean -y --all',
-    'conda install -y --override-channels -c conda-forge ffmpeg=8.1.2',
+    'conda install -y -c conda-forge ffmpeg=8.1.2',
   ])
   assert.equal(calls[0].env, undefined)
   assert.equal(calls[0].message.some((command) => /ffmpeg-env|conda create|-p /.test(command)), false)
@@ -51,7 +52,7 @@ test('FFmpeg bin installs pinned ffmpeg into base Conda consistently across plat
 
   assert.deepEqual(calls[0].message, [
     'conda clean -y --all',
-    'conda install -y --override-channels -c conda-forge ffmpeg=8.1.2',
+    'conda install -y -c conda-forge ffmpeg=8.1.2',
   ])
 })
 
@@ -70,3 +71,12 @@ test('FFmpeg installed check requires the base Conda package at the pinned versi
   kernel.bin.installed.conda_versions = {}
   assert.equal(await ffmpeg.installed(), false)
 })
+
+test('setup presets bundle FFmpeg into Conda bootstrap and keep the module check', () => {
+  const kernel = { gpu: null }
+  for (const preset of ['ai', 'dev', 'advanced_dev']) {
+    const config = Setup[preset](kernel)
+    assert.equal(config.conda_requirements.includes('ffmpeg'), true)
+    assert.equal(config.requirements.some((requirement) => requirement.name === 'ffmpeg'), true)
+  }
+})