@goodandready/dsh-image-gen 0.10.5 → 0.10.7

package/README.md

@@ -70,6 +70,13 @@
 - **React Cleanup (#139)**: removed dead state hooks from `FalImageCard`.
 - **Complete Localization (#140)**: eliminated hardcoded strings, wiring comprehensive dictionaries for en, ru, and zh.
 
+
+### 🚀 What's New in v0.10.7 (#197)
+* **Robust Error Formatting**: completely prevents `[object Object]` from appearing in provider refusal chains, extracting deep `.message`, `.detail`, and `.error` objects cleanly.
+* **Deduplicated Provider Prefixes**: eliminates redundant `codex: codex: ...` prefixes.
+* **FAL Credential Aliasing**: seamless fallback between `FAL_API_KEY` and `FAL_KEY` in credentials and environment.
+* **Subscription Aspect Ratio Mapping**: maps aspect ratios (`16:9`, `3:2`, `9:16`, `2:3`) to appropriate subscription dimensions (`1536x1024` / `1024x1536`) instead of falling back to default square `1024x1024`.
+
 ## 🎨 Supported Generation Backends
 
 * **`fal`** (Default): FAL.ai queue for FLUX.1, SDXL, Clarity Upscaler, and BiRefNet.

package/lib/index.js

@@ -33,6 +33,7 @@ import {
   pixelDiff,
   normalizeCount,
   tryGenerate,
+  resolveApiKeyCandidates,
   fallbackOrder,
   normalizeMediaType,
   embedPngMetadata,
@@ -45,6 +46,7 @@ import {
   applyStylePreset,
   resolveStylePreset,
   blendImagesFal,
+  toLosslessJson,
 } from './providers.js'
 
 import { resolveConversationImage, analyzeImageWithVision, buildDualOutputMarkdown } from './resolve-image.js'
@@ -131,7 +133,7 @@ export async function saveAndAttachResult(ctx, exec, cfg, {
     attachmentId: attachment.attachmentId,
   })
 
-  return {
+  return toLosslessJson({
     summary,
     path: filePath,
     url: deliverAs === 'image' && sourceUrl ? sourceUrl : localUrl,
@@ -149,7 +151,7 @@ export async function saveAndAttachResult(ctx, exec, cfg, {
       height: attachment.height,
       name: attachment.name,
     },
-  }
+  })
 }
 
 export const name = 'dsh-image-gen'
@@ -353,14 +355,18 @@ export function slugify(input) {
 /** Resolve an API key for one call (credentials service first, then env). */
 export async function resolveApiKey(ctx, ref) {
   if (!ref) return ''
-  try {
-    const resolved = await ctx.credentials.resolve(credentialRef(ref))
-    if (resolved && resolved.value) return resolved.value
-  } catch {
-    // fall through to the environment
+  const candidates = resolveApiKeyCandidates(ref)
+
+  for (const candidate of candidates) {
+    try {
+      const resolved = await ctx.credentials.resolve(credentialRef(candidate))
+      if (resolved && resolved.value) return resolved.value
+    } catch {
+      // fall through to the environment
+    }
+    const fromEnv = process.env[candidate]
+    if (fromEnv) return fromEnv
   }
-  const fromEnv = process.env[ref]
-  if (fromEnv) return fromEnv
   throw new Error(
     `API key not configured: set credential/env "${ref}" (Web: Settings → Credentials, or add "${ref}: <key>" to $DSH_HOME/.credentials.yaml)`,
   )
@@ -812,7 +818,7 @@ export function apply(ctx, config) {
         const effectiveGuidance = styleInfo.guidanceScale
         const providers = makeProviders(
           { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg, subscriptionImages },
-          { prompt: effectivePrompt, size, format, seed: args.seed, signal: exec.signal, negativePrompt: effectiveNegative, guidanceScale: effectiveGuidance, source, mask, strength: args.strength, quality: args.quality, style: args.style, aspectPixels },
+          { prompt: effectivePrompt, size, format, seed: args.seed, signal: exec.signal, negativePrompt: effectiveNegative, guidanceScale: effectiveGuidance, source, mask, strength: args.strength, quality: args.quality, style: args.style, aspectPixels, aspectRatio: args.aspect_ratio },
         )
         // Подписочные провайдеры (codex/grok) отдают {ok:false, reason} вместо исключения:
         // отказ должен дойти до модели текстом. Без проверки execute шёл дальше с пустыми
@@ -916,7 +922,7 @@ export function apply(ctx, config) {
             height: gen.height || attachment.height,
             seed: gen.seed,
             prompt: promptArg,
-            originalPrompt: enhanced.enhanced ? args.prompt : undefined,
+            ...(enhanced.enhanced ? { originalPrompt: args.prompt } : {}),
             cost: gen.cost,
             format: mediaType.replace('image/', ''),
             attachment: {
@@ -988,7 +994,7 @@ export function apply(ctx, config) {
           cost: first.cost,
           attachmentId: first.attachment?.attachmentId || 'N/A',
         })
-        return { summary: dualOutputSummary, channel: provider, provider, model: cfg.model || cfg.customModel, ...first, images }
+        return toLosslessJson({ summary: dualOutputSummary, channel: provider, provider, model: cfg.model || cfg.customModel, ...first, images })
       },
     }),
   )
@@ -1288,11 +1294,11 @@ export function apply(ctx, config) {
           throw new Error(`All aspect ratio generations failed in pack: ${warnings.join('; ')}`)
         }
 
-        return {
+        return toLosslessJson({
           images: results,
           count: results.length,
-          warnings: warnings.length ? warnings : undefined,
-        }
+          ...(warnings.length ? { warnings } : {}),
+        })
       },
     }),
   )
@@ -1414,7 +1420,7 @@ export function apply(ctx, config) {
         if (vision.summary) {
           result.visionAnalysis = vision.summary
         }
-        return result
+        return toLosslessJson(result)
       },
     }),
   )
@@ -1535,10 +1541,10 @@ export function apply(ctx, config) {
         }
 
         const first = results[0]
-        return {
+        return toLosslessJson({
           ...first,
           variations: results.map((r) => ({ path: r.path, attachmentId: r.attachment?.attachmentId, seed: r.seed })),
-        }
+        })
       },
     }),
   )

package/lib/providers.js

@@ -1,3 +1,14 @@
+/**
+ * Возвращает список кандидатов для имени ключа API с учётом известных алиасов (напр. FAL_API_KEY <-> FAL_KEY).
+ */
+export function resolveApiKeyCandidates(ref) {
+  if (!ref) return []
+  const candidates = [ref]
+  if (ref === 'FAL_API_KEY') candidates.push('FAL_KEY')
+  else if (ref === 'FAL_KEY') candidates.push('FAL_API_KEY')
+  return candidates
+}
+
 
 export const PROVIDER_MAX_COUNTS = {
   fal: 4,
@@ -145,6 +156,81 @@ export function isFatalClientError(error) {
   )
 }
 
+/**
+ * Safely extract a human-readable message from any error, object, or response.
+ * Completely eliminates "[object Object]" and prevents duplicate provider prefixes (e.g. "codex: codex: ...").
+ */
+export function formatErrorMessage(e, providerKey = '') {
+  if (e === null || e === undefined) {
+    return providerKey ? `${providerKey}: unknown error` : 'unknown error'
+  }
+
+  let msg = ''
+  if (typeof e === 'string') {
+    msg = e
+  } else if (typeof e === 'object') {
+    if (typeof e.message === 'string' && e.message && e.message !== '[object Object]') {
+      msg = e.message
+    } else if (typeof e.detail === 'string' && e.detail) {
+      msg = e.detail
+    } else if (e.error) {
+      if (typeof e.error === 'string') msg = e.error
+      else if (typeof e.error.message === 'string') msg = e.error.message
+      else if (typeof e.error.detail === 'string') msg = e.error.detail
+      else {
+        try { msg = JSON.stringify(e.error) } catch {}
+      }
+    } else if (typeof e.statusText === 'string' && e.statusText) {
+      msg = `HTTP ${e.status || ''} ${e.statusText}`.trim()
+    } else if (typeof e.cause === 'string') {
+      msg = e.cause
+    } else if (e.cause && typeof e.cause.message === 'string') {
+      msg = e.cause.message
+    }
+
+    if (!msg || msg === '[object Object]') {
+      try {
+        const json = JSON.stringify(e)
+        if (json && json !== '{}') {
+          msg = json.slice(0, 500)
+        }
+      } catch {}
+    }
+
+    if (!msg || msg === '[object Object]') {
+      const keys = Object.getOwnPropertyNames(e)
+      if (keys.length) {
+        msg = `error [${keys.join(', ')}]`
+      } else {
+        msg = String(e)
+      }
+    }
+  } else {
+    msg = String(e)
+  }
+
+  msg = String(msg || 'unknown error').trim()
+
+  if (providerKey) {
+    const prefixRegex = new RegExp(`^${providerKey}\\s*:\\s*`, 'i')
+    while (prefixRegex.test(msg)) {
+      msg = msg.replace(prefixRegex, '').trim()
+    }
+  }
+
+  if (!msg || msg === '[object Object]') {
+    msg = 'unknown error object'
+  } else if (msg.includes('[object Object]')) {
+    msg = msg.replace(/\[object Object\]/g, 'unknown error object').trim()
+  }
+
+  if (providerKey) {
+    return `${providerKey}: ${msg}`
+  }
+
+  return msg
+}
+
 export async function tryGenerate(generators, order, seed, promptArg) {
   const refusals = []
   for (const key of order) {
@@ -153,9 +239,9 @@ export async function tryGenerate(generators, order, seed, promptArg) {
       return produced
     } catch (e) {
       if (isFatalClientError(e)) {
-        throw new Error(`Client error on provider ${key} (not retrying fallback): ${e.message || String(e)}`)
+        throw new Error(`Client error on provider ${key} (not retrying fallback): ${formatErrorMessage(e, key)}`)
       }
-      refusals.push(`${key}: ${e.message || String(e)}`)
+      refusals.push(formatErrorMessage(e, key))
     }
   }
   throw new Error(`Image generation failed on all providers. ${refusals.join('; ')}`)
@@ -169,6 +255,34 @@ export function normalizeCount(count, max = 4) {
 
 // Размеры, которыми оперируют подписки, — свой набор, не похожий на именованные
 // размеры FAL. Перевод один к одному по смыслу: квадрат, вертикаль, горизонталь.
+/**
+ * Разрешает размер для подписочных сервисов (codex / grok).
+ * Понимает именованные размеры (landscape_16_9 и др.), пропорции (16:9, 3:2, 9:16 и др.)
+ * и размеры в пикселях [width, height], исключая дефолтный квадрат при запросе соотношений сторон.
+ */
+export function resolveSubscriptionSize(size, aspectPixels, aspectRatio) {
+  if (size && SUBSCRIPTION_SIZES[size]) {
+    return SUBSCRIPTION_SIZES[size]
+  }
+  const ratio = String(aspectRatio || '').trim()
+  if (ratio === '16:9' || ratio === '3:2' || ratio === '4:3') {
+    return '1536x1024'
+  }
+  if (ratio === '9:16' || ratio === '2:3' || ratio === '3:4') {
+    return '1024x1536'
+  }
+  if (ratio === '1:1') {
+    return '1024x1024'
+  }
+  if (Array.isArray(aspectPixels) && aspectPixels.length === 2) {
+    const [w, h] = aspectPixels
+    if (w > h) return '1536x1024'
+    if (h > w) return '1024x1536'
+    return '1024x1024'
+  }
+  return '1024x1024'
+}
+
 export const SUBSCRIPTION_SIZES = {
   square_hd: '1024x1024',
   square: '1024x1024',
@@ -349,7 +463,7 @@ export async function pixelDiff(a, b) {
 
 export function makeProviders(deps, job) {
   const { fetchImpl, resolveKey, cfg } = deps
-  const { prompt, size, format, seed, signal, negativePrompt, guidanceScale, source, mask, strength, quality, style, aspectPixels } = job
+  const { prompt, size, format, seed, signal, negativePrompt, guidanceScale, source, mask, strength, quality, style, aspectPixels, aspectRatio } = job
 
   async function fal(seedArg = seed, promptArg = prompt) {
     const key = await resolveKey(cfg.apiKeyEnv)
@@ -498,12 +612,12 @@ export function makeProviders(deps, job) {
         produced = await images.generate({
           provider,
           prompt: promptArg,
-          size: SUBSCRIPTION_SIZES[size] || '1024x1024',
+          size: resolveSubscriptionSize(size, aspectPixels, aspectRatio),
           quality: cfg.subscriptionQuality || undefined,
           signal,
         })
       } catch (e) {
-        return { ok: false, provider, reason: `${provider}: ${String(e && e.message || e)}` }
+        return { ok: false, provider, reason: formatErrorMessage(e, provider) }
       }
       const first = Array.isArray(produced) ? produced[0] : null
       if (!first || !first.b64_json) {
@@ -983,3 +1097,26 @@ export async function varyImageDirect(deps, job) {
   if (!fn) throw new Error(`Provider "${providerKey}" does not support image variations`)
   return fn(job.seed, job.prompt)
 }
+
+/**
+ * Recursively removes any property with an undefined value so the result satisfies
+ * DSH lossless JSON requirements (dsh-util-values isJsonValue).
+ *
+ * @param {any} val
+ * @returns {any}
+ */
+export function toLosslessJson(val) {
+  if (val === null || typeof val === 'boolean' || typeof val === 'string') return val
+  if (typeof val === 'number') return Number.isFinite(val) && !Object.is(val, -0) ? val : null
+  if (Array.isArray(val)) return val.map(toLosslessJson)
+  if (typeof val === 'object' && val !== null) {
+    const res = {}
+    for (const [k, v] of Object.entries(val)) {
+      if (v !== undefined) {
+        res[k] = toLosslessJson(v)
+      }
+    }
+    return res
+  }
+  return null
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "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",