@goodandready/dsh-image-gen 0.11.34 → 0.11.35

package/lib/config-schema.js

@@ -1,7 +1,7 @@
 // lib/config-schema.js — Zod configuration schema and normalization helpers (#317)
 
 import z from '@deepseek-ai/schemastery'
-import { IMAGE_SIZES, OUTPUT_FORMATS, PROVIDER_KEYS } from './providers.js'
+import { IMAGE_SIZES, OUTPUT_FORMATS, PROVIDER_KEYS } from './provider-utils.js'
 
 // Polyfill for .volatile() schema annotation if runtime schemastery lacks it (#295)
 if (typeof z.prototype?.volatile !== 'function') {
@@ -343,15 +343,25 @@ export function isVolatileRef(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value) && typeof value.get === 'function'
 }
 
-export function plainConfig(cfg) {
-  if (isVolatileRef(cfg)) return plainConfig(cfg.get())
-  if (!cfg || typeof cfg !== 'object') return cfg
-  const out = {}
-  for (const key of Object.keys(cfg)) {
-    const value = cfg[key]
-    out[key] = isVolatileRef(value) ? value.get() : value
+/**
+ * Deeply unwrap Cosmokit/Schemastery Volatile boxes into plain primitives/objects/arrays (#282, #417).
+ */
+export function plainConfig(value) {
+  if (value === null || value === undefined) return value
+  if (typeof value === 'function') return plainConfig(value())
+  if (isVolatileRef(value)) return plainConfig(value.get())
+  if (Array.isArray(value)) return value.map(plainConfig)
+  if (typeof value === 'object') {
+    if (Buffer.isBuffer(value) || value instanceof Date || value instanceof RegExp || value instanceof URL) {
+      return value
+    }
+    const out = {}
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = plainConfig(v)
+    }
+    return out
   }
-  return out
+  return value
 }
 
 export function volatileConfig(cfg) {

package/lib/index.js

@@ -367,13 +367,14 @@ export function apply(ctx, rawConfig) {
       try {
         const u = new URL(req.url, 'http://localhost')
         const qProvider = u.searchParams.get('provider')
+        const effectiveCfg = live()
         const provider = (typeof qProvider === 'string' && qProvider.trim())
-          || (typeof config?.provider === 'string' && config.provider.trim())
+          || (typeof effectiveCfg?.provider === 'string' && effectiveCfg.provider.trim())
           || 'fal'
         const deps = {
           fetchImpl: fetch,
           resolveKey: (ref) => resolveApiKey(ctx, ref),
-          cfg: (typeof getConfig === 'function') ? getConfig() : config,
+          cfg: effectiveCfg,
           ctx,
         }
         const result = await testProviderConnection(deps, provider)

package/lib/providers.js

@@ -1,4 +1,5 @@
 import sharp from 'sharp'
+import { plainConfig } from './config-schema.js'
 import { CURATED_STYLES, normalizeStyleKey } from './prompt-polisher.js'
 /**
  * Returns candidate API key names considering known aliases (e.g. FAL_API_KEY <-> FAL_KEY).
@@ -221,16 +222,17 @@ export async function saveAttachmentSafe(ctx, { bytes, mediaType, name }) {
 
 
 export function makeProviders(deps, job) {
-  const subscription = createSubscriptionGenerator(deps, job)
+  const safeDeps = deps?.cfg ? { ...deps, cfg: plainConfig(deps.cfg) } : deps
+  const subscription = createSubscriptionGenerator(safeDeps, job)
   return {
-    fal: createFalGenerator(deps, job),
-    custom: createCustomGenerator(deps, job),
+    fal: createFalGenerator(safeDeps, job),
+    custom: createCustomGenerator(safeDeps, job),
     codex: subscription('codex'),
     grok: subscription('grok'),
-    local: createLocalGenerator(deps, job),
-    seedream: createSeedreamGenerator(deps, job),
-    gemini: createGeminiGenerator(deps, job),
-    replicate: createReplicateGenerator(deps, job),
+    local: createLocalGenerator(safeDeps, job),
+    seedream: createSeedreamGenerator(safeDeps, job),
+    gemini: createGeminiGenerator(safeDeps, job),
+    replicate: createReplicateGenerator(safeDeps, job),
   }
 }
 
@@ -279,7 +281,8 @@ export function embedPngMetadata(pngBytes, metadata = {}) {
   return Buffer.concat([buf.subarray(0, insertPos), chunk, buf.subarray(insertPos)])
 }
 
-export async function removeBackgroundFal({ fetchImpl, resolveKey, cfg }, { imageBytes, mediaType = 'image/png', model = 'fal-ai/birefnet', signal }) {
+export async function removeBackgroundFal({ fetchImpl, resolveKey, cfg: rawCfg }, { imageBytes, mediaType = 'image/png', model = 'fal-ai/birefnet', signal }) {
+  const cfg = plainConfig(rawCfg)
   const key = await resolveKey(cfg.apiKeyEnv)
   const base64 = Buffer.isBuffer(imageBytes) ? imageBytes.toString('base64') : Buffer.from(imageBytes).toString('base64')
   const dataUrl = `data:${mediaType};base64,${base64}`
@@ -297,7 +300,8 @@ export async function removeBackgroundFal({ fetchImpl, resolveKey, cfg }, { imag
   return { bytes, mediaType: 'image/png', width: img.width || 0, height: img.height || 0, sourceUrl: img.url }
 }
 
-export async function upscaleImageFal({ fetchImpl, resolveKey, cfg }, { imageBytes, mediaType = 'image/png', scale = 2, creativity, prompt, model = 'fal-ai/clarity-upscaler', signal }) {
+export async function upscaleImageFal({ fetchImpl, resolveKey, cfg: rawCfg }, { imageBytes, mediaType = 'image/png', scale = 2, creativity, prompt, model = 'fal-ai/clarity-upscaler', signal }) {
+  const cfg = plainConfig(rawCfg)
   const key = await resolveKey(cfg.apiKeyEnv)
   const base64 = Buffer.isBuffer(imageBytes) ? imageBytes.toString('base64') : Buffer.from(imageBytes).toString('base64')
   const dataUrl = `data:${mediaType};base64,${base64}`
@@ -579,8 +583,9 @@ export async function blendImagesFal({ fetchImpl, resolveKey, cfg }, { images, w
 /** Direct image editing (inpainting / img2img) via selected provider. */
 /** @internal — direct provider call path for integration tests */
 export async function editImageDirect(deps, job) {
-  const providers = makeProviders(deps, job)
-  const providerKey = (typeof job?.provider === 'string' && job.provider.trim()) || (typeof deps?.cfg?.provider === 'string' && deps.cfg.provider.trim()) || (typeof deps?.cfg?.defaultProvider === 'string' && deps.cfg.defaultProvider.trim()) || 'fal'
+  const safeDeps = deps?.cfg ? { ...deps, cfg: plainConfig(deps.cfg) } : deps
+  const providers = makeProviders(safeDeps, job)
+  const providerKey = (typeof job?.provider === 'string' && job.provider.trim()) || (typeof safeDeps?.cfg?.provider === 'string' && safeDeps.cfg.provider.trim()) || (typeof safeDeps?.cfg?.defaultProvider === 'string' && safeDeps.cfg.defaultProvider.trim()) || 'fal'
   const fn = providers[providerKey] || providers.fal || providers.custom
   if (!fn) throw new Error(`Provider "${providerKey}" does not support image editing`)
   return fn(job.seed, job.prompt)
@@ -589,11 +594,12 @@ export async function editImageDirect(deps, job) {
 /** Direct image variation via selected provider. */
 /** @internal — direct provider call path for integration tests */
 export async function varyImageDirect(deps, job) {
-  const providers = makeProviders(deps, {
+  const safeDeps = deps?.cfg ? { ...deps, cfg: plainConfig(deps.cfg) } : deps
+  const providers = makeProviders(safeDeps, {
     ...job,
     strength: job.variationStrength ?? job.strength ?? 0.35,
   })
-  const providerKey = (typeof job?.provider === 'string' && job.provider.trim()) || (typeof deps?.cfg?.provider === 'string' && deps.cfg.provider.trim()) || (typeof deps?.cfg?.defaultProvider === 'string' && deps.cfg.defaultProvider.trim()) || 'fal'
+  const providerKey = (typeof job?.provider === 'string' && job.provider.trim()) || (typeof safeDeps?.cfg?.provider === 'string' && safeDeps.cfg.provider.trim()) || (typeof safeDeps?.cfg?.defaultProvider === 'string' && safeDeps.cfg.defaultProvider.trim()) || 'fal'
   const fn = providers[providerKey] || providers.fal || providers.custom
   if (!fn) throw new Error(`Provider "${providerKey}" does not support image variations`)
   return fn(job.seed, job.prompt)
@@ -628,7 +634,8 @@ export function toLosslessJson(val) {
  * Returns { ok: boolean, latencyMs: number, message: string }.
  */
 export async function testProviderConnection(deps, providerId) {
-  const { fetchImpl = fetch, resolveKey, cfg } = deps || {}
+  const { fetchImpl = fetch, resolveKey } = deps || {}
+  const cfg = plainConfig(deps?.cfg)
   const start = Date.now()
   const rawProvider = (typeof providerId === 'string' && providerId.trim())
     || (typeof cfg?.provider === 'string' && cfg.provider.trim())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.11.34",
+  "version": "0.11.35",
   "description": "Image generation for DeepSeek Harness: a generate_image tool with pluggable providers — the FAL queue, any OpenAI-compatible images API, or a ChatGPT/Grok subscription with no API key at all. The picture is shown inline in the conversation; the model receives either a link (works with any chat model) or the image itself (needs dsh-vision-bridge or a vision-capable model).",
   "keywords": [
     "deepseek-harness",