@dickpy/dsh-imagegen 1.0.20 → 1.2.0

package/src/routes.ts

@@ -9,12 +9,15 @@ import type { IncomingMessage, ServerResponse } from 'node:http'
 import { randomUUID } from 'node:crypto'
 import type { WebRoute } from '@deepseek-ai/dsh-host-webserver'
 import { SettingsConflictError, settingsNamespace, type SettingsDescriptor } from '@deepseek-ai/dsh-settings'
-import { generateImage, type UpstreamConfig } from './engine.ts'
+import type { UpstreamConfig } from './engine.ts'
+import { enhancePrompt, listOpenAIModels, listPromptModels, type PromptModelConfig } from './prompt-enhancer.ts'
+import { normalizeImageModels } from './image-models.ts'
+import { ImageGenerationRuntime } from './generation-runtime.ts'
 import { appendHistory, clearHistory, listHistory, readHistoryImage, removeHistory } from './history-store.ts'
-import { appendGallery, clearGallery, listGallery, readGalleryImage, removeGallery } from './gallery-store.ts'
+import { appendGallery, clearGallery, listGallery, readGalleryImage, removeGallery, updateGalleryTags } from './gallery-store.ts'
 import { listTemplates, readTemplateImage, refreshTemplates } from './templates-store.ts'
 import { checkForUpdate, CURRENT_VERSION, installUpdate } from './updater.ts'
-import { GALLERY_API, GENERATE_API, HISTORY_API, IMAGEGEN_SETTINGS_NAMESPACE, SETTINGS_API, TEMPLATES_API, UPDATE_API, type GeneratedImage, type GenerateRequest, type HistoryEntry, type HistoryEntryInput, type TemplateListResult, type TemplateRefreshResult } from './protocol.ts'
+import { GALLERY_API, GENERATE_API, HISTORY_API, IMAGEGEN_SETTINGS_NAMESPACE, IMAGE_MODEL_API, PROMPT_ENHANCE_API, SETTINGS_API, TASK_API, TEMPLATES_API, UPDATE_API, type GeneratedImage, type GenerateRequest, type HistoryEntry, type HistoryEntryInput, type TemplateListResult, type TemplateRefreshResult } from './protocol.ts'
 
 /** Cap on JSON request bodies (settings ops and generate payloads are small). */
 const MAX_JSON_BODY_BYTES = 24 * 1024 * 1024
@@ -35,6 +38,10 @@ export interface ImageGenRoutesDeps {
   settings: SettingsSeam
   /** Resolve the current upstream config (composition entry + settings). */
   resolve: () => UpstreamConfig
+  /** Resolve the optional chat-model configuration for prompt enhancement. */
+  resolvePrompt?: () => PromptModelConfig
+  /** Models explicitly selected for this image API endpoint. */
+  resolveImageModels?: () => string[]
   /** Overrideable history backend, primarily for host integration tests. */
   history?: {
     list: () => Promise<HistoryEntry[]>
@@ -49,6 +56,7 @@ export interface ImageGenRoutesDeps {
     append: (entry: HistoryEntryInput) => Promise<{ entries: HistoryEntry[]; added: boolean }>
     remove: (id: string) => Promise<HistoryEntry[]>
     clear: () => Promise<HistoryEntry[]>
+    updateTags?: (id: string, tags: string[]) => Promise<HistoryEntry[]>
     readImage: (file: string) => Promise<{ data: Buffer; mime: string } | undefined>
   }
   /** Overrideable template-library backend, primarily for host integration tests. */
@@ -57,6 +65,8 @@ export interface ImageGenRoutesDeps {
     refresh: () => Promise<TemplateRefreshResult>
     readImage: (file: string) => Promise<{ data: Buffer; mime: string } | undefined>
   }
+  /** Shared host queue, used by Agent tools and browser task endpoints. */
+  runtime?: ImageGenerationRuntime
 }
 
 /** Loopback literal check plus browser same-origin markers (mirrors dsh-ssh). */
@@ -112,6 +122,22 @@ function messageOf(error: unknown): string {
   return error instanceof Error ? error.message : String(error)
 }
 
+function parseGenerateRequest(body: Record<string, unknown>): GenerateRequest | undefined {
+  const prompt = typeof body.prompt === 'string' ? body.prompt.trim() : ''
+  if (prompt === '') return undefined
+  return {
+    mode: body.mode === 'edit' ? 'edit' : 'text',
+    model: typeof body.model === 'string' ? body.model : '',
+    prompt,
+    size: typeof body.size === 'string' ? body.size : 'auto',
+    quality: typeof body.quality === 'string' ? body.quality : 'auto',
+    n: typeof body.n === 'number' ? body.n : 1,
+    detail: typeof body.detail === 'string' ? body.detail : '',
+    ...typeof body.image === 'string' && body.image !== '' ? { image: body.image } : {},
+    ...typeof body.refName === 'string' && body.refName !== '' ? { refName: body.refName } : {},
+  }
+}
+
 /** Validate a submitted history entry (images carry base64). */
 function parseHistoryEntryInput(body: Record<string, unknown>): HistoryEntryInput | undefined {
   const raw = body.entry
@@ -199,11 +225,12 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
     clear: clearHistory,
     readImage: readHistoryImage,
   }
-  const gallery = deps.gallery ?? {
+  const gallery: NonNullable<ImageGenRoutesDeps['gallery']> = deps.gallery ?? {
     list: listGallery,
     append: appendGallery,
     remove: removeGallery,
     clear: clearGallery,
+    updateTags: updateGalleryTags,
     readImage: readGalleryImage,
   }
   const templates = deps.templates ?? {
@@ -211,6 +238,17 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
     refresh: refreshTemplates,
     readImage: readTemplateImage,
   }
+  const resolvePrompt = deps.resolvePrompt ?? (() => ({ apiUrl: '', apiKey: '', model: '' }))
+  const resolveImageModels = deps.resolveImageModels ?? (() => normalizeImageModels(undefined))
+  const parseConfiguredRequest = (body: Record<string, unknown>): GenerateRequest | undefined => {
+    const request = parseGenerateRequest(body)
+    if (request === undefined) return undefined
+    const models = normalizeImageModels(resolveImageModels())
+    const model = request.model.trim() === '' ? models[0] : request.model.trim()
+    if (!models.includes(model)) throw new Error(`image model "${model}" is not configured; choose one of: ${models.join(', ')}`)
+    return { ...request, model }
+  }
+  const runtime = deps.runtime ?? new ImageGenerationRuntime(deps.resolve, history)
   const guard = (req: IncomingMessage, res: ServerResponse, method: string): boolean => {
     if (!isLoopbackRequest(req)) {
       writeJson(res, 403, { error: 'forbidden: loopback-only' })
@@ -224,6 +262,50 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
   }
 
   return [
+    // -------------------------------------------- image model discovery
+    {
+      kind: 'exact',
+      path: IMAGE_MODEL_API.models,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        try {
+          writeJson(res, 200, { ok: true, models: await listOpenAIModels(deps.resolve()) })
+        } catch (error) {
+          writeJson(res, 200, { ok: false, code: 'image-models-failed', message: messageOf(error) })
+        }
+      },
+    },
+    // ----------------------------------------------- prompt enhancement
+    {
+      kind: 'exact',
+      path: PROMPT_ENHANCE_API.models,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        try {
+          writeJson(res, 200, { ok: true, models: await listPromptModels(resolvePrompt()) })
+        } catch (error) {
+          writeJson(res, 200, { ok: false, code: 'prompt-models-failed', message: messageOf(error) })
+        }
+      },
+    },
+    {
+      kind: 'exact',
+      path: PROMPT_ENHANCE_API.enhance,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const prompt = typeof body?.prompt === 'string' ? body.prompt.trim() : ''
+        if (prompt === '') {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'prompt is required' })
+          return
+        }
+        try {
+          writeJson(res, 200, { ok: true, prompt: await enhancePrompt(resolvePrompt(), prompt) })
+        } catch (error) {
+          writeJson(res, 200, { ok: false, code: 'prompt-enhance-failed', message: messageOf(error) })
+        }
+      },
+    },
     // -------------------------------------------------- settings describe
     {
       kind: 'exact',
@@ -284,46 +366,14 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
           writeJson(res, 200, { ok: false, code: 'bad-request', message: 'unreadable JSON body' })
           return
         }
-        const prompt = typeof body.prompt === 'string' ? body.prompt.trim() : ''
-        if (prompt === '') {
+        let request: GenerateRequest | undefined
+        try { request = parseConfiguredRequest(body) } catch (error) { writeJson(res, 200, { ok: false, code: 'image-model-not-configured', message: messageOf(error) }); return }
+        if (request === undefined) {
           writeJson(res, 200, { ok: false, code: 'bad-request', message: 'prompt is required' })
           return
         }
-        if (prompt.length > 2000) {
-          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'prompt exceeds 2000 characters' })
-          return
-        }
-        const request: GenerateRequest = {
-          mode: body.mode === 'edit' ? 'edit' : 'text',
-          model: typeof body.model === 'string' ? body.model : 'gpt-image-2',
-          prompt,
-          size: typeof body.size === 'string' ? body.size : 'auto',
-          quality: typeof body.quality === 'string' ? body.quality : 'auto',
-          n: typeof body.n === 'number' ? body.n : 1,
-          detail: typeof body.detail === 'string' ? body.detail : '',
-          ...typeof body.image === 'string' && body.image !== '' ? { image: body.image } : {},
-          ...typeof body.refName === 'string' && body.refName !== '' ? { refName: body.refName } : {},
-        }
         try {
-          const result = await generateImage(deps.resolve(), request)
-          try {
-            const entries = await history.append({
-              id: randomUUID(),
-              createdAt: Date.now(),
-              mode: request.mode,
-              model: request.model,
-              prompt: request.prompt,
-              size: request.size,
-              quality: request.quality,
-              detail: request.detail,
-              n: request.n,
-              images: result.images,
-              ...request.refName === undefined ? {} : { refName: request.refName },
-            })
-            writeJson(res, 200, { ok: true, ...result, history: entries })
-          } catch (error) {
-            writeJson(res, 200, { ok: true, ...result, historyError: messageOf(error) })
-          }
+          writeJson(res, 200, { ok: true, ...await runtime.run(request) })
         } catch (error) {
           const message = error instanceof Error ? error.message : String(error)
           const code = error instanceof Error && 'code' in error && typeof (error as { code?: unknown }).code === 'string'
@@ -333,6 +383,42 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
         }
       },
     },
+    // ------------------------------------------------ generation task queue
+    {
+      kind: 'exact', path: TASK_API.submit,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        let request: GenerateRequest | undefined
+        try { request = body === undefined ? undefined : parseConfiguredRequest(body) } catch (error) { writeJson(res, 200, { ok: false, code: 'image-model-not-configured', message: messageOf(error) }); return }
+        if (request === undefined) { writeJson(res, 200, { ok: false, code: 'bad-request', message: 'prompt is required' }); return }
+        writeJson(res, 200, { ok: true, task: runtime.queue.submit(request) })
+      },
+    },
+    {
+      kind: 'exact', path: TASK_API.list,
+      handler: async (req, res) => { if (!guard(req, res, 'POST')) return; writeJson(res, 200, { ok: true, tasks: runtime.queue.list() }) },
+    },
+    {
+      kind: 'exact', path: TASK_API.cancel,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const task = typeof body?.id === 'string' ? runtime.queue.cancel(body.id) : undefined
+        if (task === undefined) { writeJson(res, 200, { ok: false, code: 'not-found', message: 'task not found' }); return }
+        writeJson(res, 200, { ok: true, task })
+      },
+    },
+    {
+      kind: 'exact', path: TASK_API.retry,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const task = typeof body?.id === 'string' ? runtime.queue.retry(body.id) : undefined
+        if (task === undefined) { writeJson(res, 200, { ok: false, code: 'not-found', message: 'task not found' }); return }
+        writeJson(res, 200, { ok: true, task })
+      },
+    },
     // ----------------------------------------------- update check
     {
       kind: 'exact',
@@ -528,6 +614,22 @@ export function makeRoutes(deps: ImageGenRoutesDeps): WebRoute[] {
         }
       },
     },
+    // ----------------------------------------------------- gallery tags
+    {
+      kind: 'exact',
+      path: GALLERY_API.tags,
+      handler: async (req, res) => {
+        if (!guard(req, res, 'POST')) return
+        const body = await readJsonBody(req)
+        const id = typeof body?.id === 'string' ? body.id : ''
+        const tags = Array.isArray(body?.tags) ? body.tags.filter((tag): tag is string => typeof tag === 'string') : undefined
+        if (id === '' || tags === undefined || gallery.updateTags === undefined) {
+          writeJson(res, 200, { ok: false, code: 'bad-request', message: 'gallery id and tags are required' })
+          return
+        }
+        try { writeJson(res, 200, { ok: true, entries: await gallery.updateTags(id, tags) }) } catch (error) { writeJson(res, 200, { ok: false, code: 'gallery-failed', message: messageOf(error) }) }
+      },
+    },
     // ---------------------------------------------------- gallery clear
     {
       kind: 'exact',

package/src/task-queue.ts

@@ -0,0 +1,103 @@
+/** In-memory, host-resident image generation queue. */
+
+import { randomUUID } from 'node:crypto'
+import type { GenerateRequest, GenerateResult, GenerationTask } from './protocol.ts'
+
+export type GenerationTaskListener = (task: GenerationTask) => void
+
+export class GenerationTaskQueue {
+  private readonly tasks: GenerationTask[] = []
+  private readonly controllers = new Map<string, AbortController>()
+  private readonly listeners = new Set<GenerationTaskListener>()
+  private running = false
+
+  constructor(private readonly run: (request: GenerateRequest, signal: AbortSignal) => Promise<GenerateResult>) {}
+
+  list(): GenerationTask[] {
+    return this.tasks.map(task => this.snapshot(task))
+  }
+
+  /** Observe queue state changes. Listener failures never disrupt generation. */
+  subscribe(listener: GenerationTaskListener): () => void {
+    this.listeners.add(listener)
+    return () => { this.listeners.delete(listener) }
+  }
+
+  submit(request: GenerateRequest): GenerationTask {
+    const task: GenerationTask = { id: randomUUID(), request: { ...request }, status: 'queued', createdAt: Date.now() }
+    this.tasks.unshift(task)
+    this.publish(task)
+    void this.drain()
+    return this.snapshot(task)
+  }
+
+  cancel(id: string): GenerationTask | undefined {
+    const task = this.tasks.find(item => item.id === id)
+    if (task === undefined || task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled') return task
+    task.status = 'cancelled'
+    task.finishedAt = Date.now()
+    this.controllers.get(id)?.abort()
+    this.publish(task)
+    return this.snapshot(task)
+  }
+
+  retry(id: string): GenerationTask | undefined {
+    const previous = this.tasks.find(item => item.id === id)
+    return previous === undefined ? undefined : this.submit(previous.request)
+  }
+
+  private async drain(): Promise<void> {
+    if (this.running) return
+    this.running = true
+    try {
+      for (;;) {
+        const task = this.tasks.find(item => item.status === 'queued')
+        if (task === undefined) return
+        task.status = 'running'
+        task.startedAt = Date.now()
+        this.publish(task)
+        const controller = new AbortController()
+        this.controllers.set(task.id, controller)
+        try {
+          const result = await this.run(task.request, controller.signal)
+          if (this.tasks.find(item => item.id === task.id)?.status !== 'cancelled') {
+            task.status = 'completed'
+            task.result = result
+            task.finishedAt = Date.now()
+            this.publish(task)
+          }
+        } catch (error) {
+          if (this.tasks.find(item => item.id === task.id)?.status !== 'cancelled') {
+            task.status = 'failed'
+            task.error = error instanceof Error ? error.message : String(error)
+            task.finishedAt = Date.now()
+            this.publish(task)
+          }
+        } finally {
+          this.controllers.delete(task.id)
+        }
+      }
+    } finally {
+      this.running = false
+    }
+  }
+
+  private publish(task: GenerationTask): void {
+    const snapshot = this.snapshot(task)
+    for (const listener of this.listeners) {
+      try {
+        listener(snapshot)
+      } catch {
+        // Observers must not be able to interrupt the queue pump.
+      }
+    }
+  }
+
+  private snapshot(task: GenerationTask): GenerationTask {
+    return {
+      ...task,
+      request: { ...task.request },
+      ...task.result === undefined ? {} : { result: task.result },
+    }
+  }
+}