pinokiod 7.5.1 → 7.5.2

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/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/kernel/shell.js

@@ -1245,8 +1245,6 @@ class Shell {
       this.env.PIP_REQUIRE_VIRTUALENV = "true"
     }
 
-    this.env.UV_PYTHON_PREFERENCE="only-managed"
-
     // 2. venv
 
     /*
@@ -1322,7 +1320,7 @@ class Shell {
           if (use_uv) {
             // when python version is specified as venv.python => use uv
             venv_activation = [
-              `uv venv ${shellEnvPath}${python_version}`,
+              `uv venv --managed-python ${shellEnvPath}${python_version}`,
               activate_command,
 //              `uv pip install --upgrade pip setuptools wheel`,
               deactivate_path,

package/package.json

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

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)
+  }
+})