@mengruo/dsh-vision-toolkit 0.0.1 → 0.1.0

package/src/tools.ts

@@ -97,6 +97,7 @@ const imageInfoSchema = {
     width: { type: 'integer', required: true },
     height: { type: 'integer', required: true },
     format: { type: 'string', required: true },
+    hasAlpha: { type: 'boolean', required: true, description: 'Whether the analyzed image carries an alpha (transparency) channel.' },
     originalPath: { type: 'string', required: true, description: 'Original image path before automatic compression.' },
   },
 } as const satisfies ValueSchemaSpec

package/src/upstream.ts

@@ -176,6 +176,8 @@ export interface CompressedImageInfo {
   height: number
   format: 'png' | 'jpeg' | 'gif' | 'webp'
   mode: string
+  /** True when the saved image carries an alpha (transparency) channel. */
+  hasAlpha: boolean
   lossy: boolean
   resized: boolean
   candidate: string
@@ -614,7 +616,7 @@ const COMPRESS_IMAGE_SCRIPT = [
   '        if icc is not None: kwargs["icc_profile"]=icc',
   '    im.save(path,format=fmt,**kwargs)',
   '    with Image.open(path) as saved:',
-  '        return os.path.getsize(path),(saved.format or "unknown").lower(),saved.mode',
+  '        return os.path.getsize(path),(saved.format or "unknown").lower(),saved.mode,saved.mode in ("RGBA","LA") or (saved.mode=="P" and "transparency" in saved.info)',
   'def has_alpha(im):',
   '    return im.mode in ("RGBA","LA") or (im.mode=="P" and "transparency" in im.info)',
   'def flatten(im):',
@@ -672,11 +674,11 @@ const COMPRESS_IMAGE_SCRIPT = [
   '        candidates=[]',
   '    for label,fmt,lossy,saver in candidates:',
   '        try:',
-  '            size,saved_fmt,mode=saver()',
+  '            size,saved_fmt,mode,has_alpha=saver()',
   '        except Exception:',
   '            continue',
   '        if ok(w,h,size):',
-  '            print(json.dumps({"ok":True,"bytes":size,"width":w,"height":h,"format":fmt,"mode":mode,"lossy":lossy,"resized":step>0,"candidate":label,"source_animated":meta["animated"]}))',
+  '            print(json.dumps({"ok":True,"bytes":size,"width":w,"height":h,"format":fmt,"mode":mode,"has_alpha":has_alpha,"lossy":lossy,"resized":step>0,"candidate":label,"source_animated":meta["animated"]}))',
   '            sys.exit(0)',
   '        if best is None or size<best[0]:',
   '            best=(size,label,fmt,lossy,step>0)',
@@ -799,13 +801,15 @@ export class UpstreamAdapter {
   async probeImageSize(
     imagePath: string,
     options: { signal: AbortSignal },
-  ): Promise<{ width: number; height: number; format: string; mode: string }> {
+  ): Promise<{ width: number; height: number; format: string; mode: string; hasAlpha: boolean }> {
     if (this.prepared === undefined) await this.prepare()
     const prepared = this.requirePrepared()
     const script = [
       'import json,sys',
       'from PIL import Image',
-      'with Image.open(sys.argv[1]) as im: print(json.dumps({"width":im.width,"height":im.height,"format":str(im.format or "unknown").lower(),"mode":str(im.mode)}))',
+      'with Image.open(sys.argv[1]) as im:',
+      '    has_alpha = im.mode in ("RGBA","LA") or (im.mode=="P" and "transparency" in im.info)',
+      '    print(json.dumps({"width":im.width,"height":im.height,"format":str(im.format or "unknown").lower(),"mode":str(im.mode),"has_alpha":has_alpha}))',
     ].join('\n')
     let handle: SubprocessHandle
     try {
@@ -829,18 +833,19 @@ export class UpstreamAdapter {
       throw new VisionToolkitError('input', `cannot decode image: ${outcome.stderr.trim() || 'unsupported or corrupt file'}`)
     }
     try {
-      const parsed = JSON.parse(outcome.stdout) as { width?: unknown; height?: unknown; format?: unknown; mode?: unknown }
+      const parsed = JSON.parse(outcome.stdout) as { width?: unknown; height?: unknown; format?: unknown; mode?: unknown; has_alpha?: unknown }
       if (
         typeof parsed.width !== 'number'
         || typeof parsed.height !== 'number'
         || typeof parsed.format !== 'string'
         || typeof parsed.mode !== 'string'
+        || typeof parsed.has_alpha !== 'boolean'
         || !Number.isInteger(parsed.width)
         || !Number.isInteger(parsed.height)
         || parsed.width <= 0
         || parsed.height <= 0
       ) throw new Error('invalid dimensions')
-      return { width: parsed.width, height: parsed.height, format: parsed.format, mode: parsed.mode }
+      return { width: parsed.width, height: parsed.height, format: parsed.format, mode: parsed.mode, hasAlpha: parsed.has_alpha }
     } catch (error) {
       throw new VisionToolkitError('output', 'cannot read image dimensions: unexpected Python output', { cause: error })
     }
@@ -884,7 +889,7 @@ export class UpstreamAdapter {
       const detail = typeof record.error === 'string' ? record.error : 'compression failed'
       throw new VisionToolkitError('capacity', `cannot compress image under ${maxBytes} bytes: ${detail}`)
     }
-    const { bytes, width, height, format, mode, lossy, resized, candidate, source_animated } = record
+    const { bytes, width, height, format, mode, has_alpha, lossy, resized, candidate, source_animated } = record
     if (
       typeof bytes !== 'number' || !Number.isInteger(bytes) || bytes < 1 || bytes > maxBytes
       || typeof width !== 'number' || !Number.isInteger(width) || width < 1
@@ -892,6 +897,7 @@ export class UpstreamAdapter {
       || width * height > maxPixels
       || typeof format !== 'string' || !COMPRESSED_FORMATS.has(format)
       || typeof mode !== 'string' || mode.length === 0
+      || typeof has_alpha !== 'boolean'
       || typeof lossy !== 'boolean'
       || typeof resized !== 'boolean'
       || typeof candidate !== 'string' || candidate.length === 0
@@ -905,6 +911,7 @@ export class UpstreamAdapter {
       height,
       format: format as CompressedImageInfo['format'],
       mode,
+      hasAlpha: has_alpha,
       lossy,
       resized,
       candidate,

package/src/web.ts

@@ -24,6 +24,7 @@ import {
   resolveConfig,
   isBuiltInFreeVisionProvider,
   VISION_TOOLKIT_SETTINGS_NAMESPACE,
+  type ResolvedProvider,
   type ResolvedVisionToolkitConfig,
   type VisionToolkitConfig,
 } from './config.ts'
@@ -66,6 +67,13 @@ export interface VisionToolkitSettingsSnapshot {
     source?: string
     writable: boolean
   }
+  /** Per-provider credential states, aligned with `settings.value.providers` order. */
+  credentials: Array<{
+    ref: string
+    configured: boolean
+    source?: string
+    writable: boolean
+  }>
   runtime: RuntimeManagerStatus
   release: {
     pluginVersion: string
@@ -87,6 +95,8 @@ interface HealthRequest {
   action: 'health'
   testConnection: boolean
   testModel: boolean
+  /** 0-based provider index; when absent, the primary provider is tested. */
+  providerIndex?: number
 }
 
 interface CredentialRequest {
@@ -96,6 +106,11 @@ interface CredentialRequest {
   value: string
 }
 
+interface DeleteCredentialRequest {
+  action: 'delete-credential'
+  ref: CredentialRef
+}
+
 interface CheckUpdateRequest {
   action: 'check-update'
 }
@@ -105,7 +120,7 @@ interface ApplyUpdateRequest {
   expectedVersion: string
 }
 
-type SettingsRequest = SaveRequest | HealthRequest | CredentialRequest | CheckUpdateRequest | ApplyUpdateRequest
+type SettingsRequest = SaveRequest | HealthRequest | CredentialRequest | DeleteCredentialRequest | CheckUpdateRequest | ApplyUpdateRequest
 
 interface JsonError {
   ok: false
@@ -189,7 +204,16 @@ function parseRequest(value: unknown): SettingsRequest {
     const testModel = value.testModel === undefined ? false : value.testModel
     if (typeof testModel !== 'boolean') throw new TypeError('health.testModel must be boolean')
     if (testModel && !value.testConnection) throw new TypeError('health.testModel requires health.testConnection')
-    return { action: 'health', testConnection: value.testConnection, testModel }
+    const providerIndex = value.providerIndex
+    if (providerIndex !== undefined && (!Number.isSafeInteger(providerIndex) || (providerIndex as number) < 0)) {
+      throw new TypeError('health.providerIndex must be a non-negative integer')
+    }
+    return {
+      action: 'health',
+      testConnection: value.testConnection,
+      testModel,
+      ...(providerIndex === undefined ? {} : { providerIndex: providerIndex as number }),
+    }
   }
   if (value.action === 'save') {
     if (!Number.isSafeInteger(value.expectedRevision) || (value.expectedRevision as number) < 0) {
@@ -223,6 +247,12 @@ function parseRequest(value: unknown): SettingsRequest {
       value: secret,
     }
   }
+  if (value.action === 'delete-credential') {
+    if (typeof value.ref !== 'string' || value.ref.trim().length === 0) {
+      throw new TypeError('delete-credential.ref must be a non-empty string')
+    }
+    return { action: 'delete-credential', ref: credentialRef(value.ref.trim()) }
+  }
   if (value.action === 'check-update') return { action: 'check-update' }
   if (value.action === 'apply-update') {
     if (typeof value.expectedVersion !== 'string' || value.expectedVersion.trim().length === 0) {
@@ -272,6 +302,18 @@ export class VisionToolkitWebBackend {
     const value = descriptor.value as VisionToolkitConfig
     const resolved = resolveConfig(value)
     const credential = await this.credential(resolved)
+    const credentials = await Promise.all(resolved.providers.map(async provider => {
+      if (isBuiltInFreeVisionProvider(provider)) {
+        return { ref: String(provider.credential), configured: true, source: 'built-in-free', writable: false }
+      }
+      const info = await this.ctx.credentials.describe(credentialRef(String(provider.credential)))
+      return {
+        ref: String(provider.credential),
+        configured: info.configured,
+        ...(info.source === undefined ? {} : { source: info.source }),
+        writable: info.writable,
+      }
+    }))
     const update = await this.updater.capability()
     return {
       schemaVersion: 1,
@@ -289,6 +331,7 @@ export class VisionToolkitWebBackend {
         ...(credential.source === undefined ? {} : { source: credential.source }),
         writable: credential.writable,
       },
+      credentials,
       runtime: this.manager.status(),
       release: {
         pluginVersion: PLUGIN_VERSION,
@@ -330,16 +373,21 @@ export class VisionToolkitWebBackend {
       )
     }
     const resolved = resolveConfig(descriptor.value as VisionToolkitConfig)
-    const currentRef = credentialRef(String(resolved.provider.credential))
-    if (currentRef !== request.ref) {
+    const provider = resolved.providers.find(entry => String(entry.credential) === String(request.ref))
+    if (provider === undefined) {
       throw new CredentialReferenceConflictError(
-        `credential reference changed from "${request.ref}" to "${currentRef}"; reload Settings and try again`,
+        `credential reference "${String(request.ref)}" does not match any configured vision provider; reload Settings and try again`,
       )
     }
-    if (isBuiltInFreeVisionProvider(resolved.provider)) {
+    if (isBuiltInFreeVisionProvider(provider)) {
       throw new Error('The built-in free vision provider does not accept a user API key')
     }
-    await this.ctx.credentials.set(currentRef, request.value)
+    await this.ctx.credentials.set(request.ref, request.value)
+    return this.snapshot()
+  }
+
+  private async deleteCredential(request: DeleteCredentialRequest): Promise<VisionToolkitSettingsSnapshot> {
+    await this.ctx.credentials.unset(request.ref)
     return this.snapshot()
   }
 
@@ -351,12 +399,20 @@ export class VisionToolkitWebBackend {
     req.socket.once('close', abort)
     try {
       const runtime = this.manager.current()
+      let provider: ResolvedProvider | undefined
+      if (request.providerIndex !== undefined) {
+        const resolved = resolveConfig(descriptorOf(this.ctx).value as VisionToolkitConfig)
+        provider = resolved.providers[request.providerIndex]
+        if (provider === undefined) {
+          throw new Error(`provider index ${request.providerIndex} is out of range`)
+        }
+      }
       // Use the prepared runtime home instead of the host process cwd.
       return await runtime.health(request.testConnection, {
         signal: controller.signal,
         workspace: runtime.upstreamVersion.runtimeHome,
         sessionId: 'vision-toolkit-settings',
-      }, request.testModel)
+      }, request.testModel, provider)
     } finally {
       req.off('aborted', abort)
       req.socket.off('close', abort)
@@ -401,6 +457,9 @@ export class VisionToolkitWebBackend {
         case 'credential':
           responseJson(res, 200, { ok: true, value: await this.saveCredential(parsed) })
           break
+        case 'delete-credential':
+          responseJson(res, 200, { ok: true, value: await this.deleteCredential(parsed) })
+          break
         case 'check-update':
           responseJson(res, 200, { ok: true, value: await this.updater.check() })
           break