@goodandready/dsh-image-gen 0.10.13 → 0.10.14

package/lib/index.js

@@ -274,6 +274,10 @@ export const Config = z.object({
     .number()
     .description('provider=local: CFG scale.')
     .default(7),
+  seedreamBaseURL: z
+    .string()
+    .description('provider=seedream: base URL, e.g. https://api.bytedanceapi.com/v1 or Volcengine Ark.')
+    .default('https://api.bytedanceapi.com/v1'),
   seedreamKeyEnv: z
     .string()
     .role('credential-ref')
@@ -1197,8 +1201,9 @@ export function apply(ctx, config) {
         },
       },
       async execute(args, exec) {
-        const source = await resolveSource(ctx, exec, args.image)
-        if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
+        try {
+          const source = await resolveSource(ctx, exec, args.image)
+          if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
         const cfg = live()
         const res = await removeBackgroundFal(
           { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
@@ -1236,6 +1241,9 @@ export function apply(ctx, config) {
           format: 'png',
           attachment,
         })
+        } catch (err) {
+          throw new Error(sanitizeErrorAndLogs(err.message || err))
+        }
       },
     }),
   )
@@ -1266,8 +1274,9 @@ export function apply(ctx, config) {
         },
       },
       async execute(args, exec) {
-        const source = await resolveSource(ctx, exec, args.image)
-        if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
+        try {
+          const source = await resolveSource(ctx, exec, args.image)
+          if (!source || !source.bytes) throw new Error('Source image not found: ' + args.image)
         const cfg = live()
         const res = await upscaleImageFal(
           { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
@@ -1305,6 +1314,9 @@ export function apply(ctx, config) {
           height: res.height || attachment.height,
           attachment,
         })
+        } catch (err) {
+          throw new Error(sanitizeErrorAndLogs(err.message || err))
+        }
       },
     }),
   )
@@ -1378,14 +1390,17 @@ export function apply(ctx, config) {
         },
       },
       async execute(args, exec) {
-        const refs = Array.isArray(args.images) ? args.images : [args.images].filter(Boolean)
+        try {
+          const cfg = live()
+          trackAndAssertLoopGuard(exec?.agent?.session?.id || 'default', { limit: cfg.loopGuardLimit })
+          assertBudgetAvailable(0.05, cfg.dailyBudgetUsd)
+          const refs = Array.isArray(args.images) ? args.images : [args.images].filter(Boolean)
         const sources = []
         for (const r of refs) {
           const s = await resolveSource(ctx, exec, r)
           if (s && s.bytes) sources.push(s)
         }
         if (sources.length === 0) throw new Error('No valid images found to blend')
-        const cfg = live()
         const res = await blendImagesFal(
           { fetchImpl: fetch, resolveKey: (ref) => resolveApiKey(ctx, ref), cfg },
           { images: sources, weights: args.weights, prompt: args.prompt, signal: exec.signal }
@@ -1421,6 +1436,9 @@ export function apply(ctx, config) {
           height: res.height || attachment.height,
           attachment,
         })
+        } catch (err) {
+          throw new Error(sanitizeErrorAndLogs(err.message || err))
+        }
       },
     }),
   )
@@ -1542,7 +1560,16 @@ export function apply(ctx, config) {
         },
       },
       async execute(args, exec) {
-        const source = await resolveConversationImage(ctx, exec, args.image)
+        try {
+          trackAndAssertLoopGuard(exec?.agent?.session?.id || 'default', { limit: cfg.loopGuardLimit })
+          const estimatedCostEdit = calculateGenerationCost({
+            provider: cfg.provider || 'fal',
+            model: cfg.model,
+            size: cfg.defaultSize || 'square_hd',
+            count: 1,
+          })
+          assertBudgetAvailable(estimatedCostEdit, cfg.dailyBudgetUsd)
+          const source = await resolveConversationImage(ctx, exec, args.image)
         const mask = args.mask ? await resolveSource(ctx, exec, args.mask) : undefined
         const vision = await analyzeImageWithVision(ctx, exec, source)
 
@@ -1603,6 +1630,9 @@ export function apply(ctx, config) {
           result.visionAnalysis = vision.summary
         }
         return toLosslessJson(result)
+        } catch (err) {
+          throw new Error(sanitizeErrorAndLogs(err.message || err))
+        }
       },
     }),
   )
@@ -1662,7 +1692,17 @@ export function apply(ctx, config) {
         },
       },
       async execute(args, exec) {
-        const source = await resolveConversationImage(ctx, exec, args.image)
+        try {
+          trackAndAssertLoopGuard(exec?.agent?.session?.id || 'default', { limit: cfg.loopGuardLimit })
+          const count = normalizeCount(args.count || 1)
+          const estimatedCostVary = calculateGenerationCost({
+            provider: cfg.provider || 'fal',
+            model: cfg.model,
+            size: cfg.defaultSize || 'square_hd',
+            count,
+          })
+          assertBudgetAvailable(estimatedCostVary, cfg.dailyBudgetUsd)
+          const source = await resolveConversationImage(ctx, exec, args.image)
         const vision = await analyzeImageWithVision(ctx, exec, source)
 
         const provider = cfg.provider || 'fal'
@@ -1671,8 +1711,6 @@ export function apply(ctx, config) {
           resolveKey: (ref) => resolveApiKey(ctx, ref),
           cfg,
         }
-
-        const count = normalizeCount(args.count || 1)
         const variationStrength = Math.max(0.05, Math.min(0.95, args.variation_strength ?? 0.35))
         const baseSeed = Math.floor(Math.random() * 100000)
         const format = cfg.defaultFormat || 'png'
@@ -1727,6 +1765,9 @@ export function apply(ctx, config) {
           ...first,
           variations: results.map((r) => ({ path: r.path, attachmentId: r.attachment?.attachmentId, seed: r.seed })),
         })
+        } catch (err) {
+          throw new Error(sanitizeErrorAndLogs(err.message || err))
+        }
       },
     }),
   )

package/lib/providers.js

@@ -749,7 +749,7 @@ export function makeProviders(deps, job) {
   // Seedream (ByteDance): OpenAI-совместимый API картинок.
   async function seedream(seedArg = seed, promptArg = prompt) {
     const key = await resolveKey(cfg.seedreamKeyEnv)
-    const base = 'https://api.bytedanceapi.com/v1'
+    const base = (cfg.seedreamBaseURL || 'https://api.bytedanceapi.com/v1').replace(/\/+$/, '')
     const res = await fetchImpl(`${base}/images/generations`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },

package/package.json

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