@cloudbase/ai 2.28.6 → 2.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/ai",
-  "version": "2.28.6",
+  "version": "2.30.0",
   "description": "cloudbase js sdk ai module",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -30,8 +30,8 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@cloudbase/types": "2.28.6",
-    "@cloudbase/utilities": "2.28.6",
+    "@cloudbase/types": "2.30.0",
+    "@cloudbase/utilities": "2.30.0",
     "@mattiasbuelens/web-streams-adapter": "^0.1.0",
     "text-encoding-shim": "^1.0.5",
     "web-streams-polyfill": "^4.0.0"
@@ -39,5 +39,5 @@
   "devDependencies": {
     "@cloudbase/adapter-interface": "^0.7.1"
   },
-  "gitHead": "fb1d36651d8e9b0e54dda40a3f269be0540076c1"
+  "gitHead": "859557576897d4778857c12fb8d7fe8ca1f3a052"
 }

package/src/errors.ts

@@ -0,0 +1,23 @@
+/**
+ * 参数校验错误类
+ * 用于统一参数校验错误的格式
+ */
+export class InvalidParamsError extends Error {
+  public code: string
+  public field?: string
+
+  constructor(message: string, field?: string) {
+    super(message)
+    this.name = 'InvalidParamsError'
+    this.code = 'INVALID_PARAMS'
+    this.field = field
+  }
+
+  toJSON() {
+    return {
+      code: this.code,
+      message: this.message,
+      field: this.field,
+    }
+  }
+}

package/src/index.ts

@@ -150,6 +150,7 @@ function registerAi(app: ICloudbase) {
 
 export { AI, Bot, createAi, createAI, restModels as models, registerAi, utils }
 export * from './type'
+export * from './errors'
 
 try {
   (window as any).registerAi = registerAi

package/src/models/image-model.ts

@@ -8,6 +8,7 @@ import type {
   // HunyuanEditImageInput,
   // HunyuanEditImageOutput,
 } from '../type'
+import { InvalidParamsError } from '../errors'
 
 interface HunyuanImageGenerateFn {
   (input: HunyuanARGenerateImageInput): Promise<HunyuanARGenerateImageOutput>
@@ -19,28 +20,52 @@ type GenerateImageFn<TProvider> = TProvider extends 'hunyuan-image'
   : (input: unknown) => Promise<unknown>
 
 export class DefaultImageModel<TProvider extends string> {
-  public defaultGenerateImageSubUrl = 'images/generations'
+  public defaultGenerateImageSubUrl = 'images/ar/generations'
 
-  public generateImageSubUrlConfig: Record<string, Record<string, string>> = {
-    'hunyuan-image': {
-      'hunyuan-image-v3.0-v1.0.4': 'images/ar/generations',
-      'hunyuan-image-v3.0-v1.0.1': 'images/ar/generations',
-    },
+  public generateImageSubUrlConfig: Record<string, Array<[RegExp, string]>> = {
+    'hunyuan-image': [[/^hunyuan-image(-v[12](\..*)?)?$/, 'images/generations']],
   }
 
   /** 生成图片 */
   public generateImage: GenerateImageFn<TProvider>
 
-  constructor(private req: ModelReq, public baseUrl: string, public provider: TProvider) {
+  constructor(
+    private req: ModelReq,
+    public baseUrl: string,
+    public provider: TProvider,
+  ) {
     this.generateImage = this.generateImageImpl.bind(this) as GenerateImageFn<TProvider>
   }
 
   /** generateImage 的实际实现 */
   private async generateImageImpl(input: HunyuanARGenerateImageInput | HunyuanGenerateImageInput,): Promise<HunyuanARGenerateImageOutput | HunyuanGenerateImageOutput> {
+    // 当模型为 HY-Image-v3.0-I2I-ToB-v1.0.1 且 provider 为空或为 hunyuan-image 时校验参数
+    if (
+      typeof input === 'object' && input && 'model' in input && input.model === 'HY-Image-v3.0-I2I-ToB-v1.0.1'
+      && (this.provider === '' || this.provider === 'hunyuan-image')
+    ) {
+      const typedInput = input as HunyuanARGenerateImageInput
+      const imageUrls = typedInput.image_urls as string[] | undefined
+      const images = typedInput.images as string[] | undefined
+
+      if (imageUrls && imageUrls.length > 1) {
+        throw new InvalidParamsError(
+          '当模型为 HY-Image-v3.0-I2I-ToB-v1.0.1 时，image_urls 最多只能有 1 个元素',
+          'image_urls',
+        )
+      }
+      if (images && images.length > 1) {
+        throw new InvalidParamsError(
+          '当模型为 HY-Image-v3.0-I2I-ToB-v1.0.1 时，images 最多只能有 1 个元素',
+          'images',
+        )
+      }
+    }
+
     let subUrl = this.defaultGenerateImageSubUrl
 
     if (typeof input === 'object' && input && 'model' in input && typeof input.model === 'string') {
-      const newSubUrl = this.generateImageSubUrlConfig[this.provider]?.[input.model]
+      const newSubUrl = this.getGenerateImageSubUrl(this.provider, input.model)
       if (newSubUrl) subUrl = newSubUrl
     }
 
@@ -56,4 +81,19 @@ export class DefaultImageModel<TProvider extends string> {
   private getGenerateUrl(subUrl: string) {
     return `${this.baseUrl}/${this.provider}/${subUrl}`
   }
+
+  /**
+   * 根据 provider 与 model 解析生成图片的子路径。
+   * 按配置顺序用 RegExp 匹配，命中即返回对应 subUrl。
+   */
+  private getGenerateImageSubUrl(provider: string, model: string): string | undefined {
+    const rules = this.generateImageSubUrlConfig[provider]
+    if (!rules) return undefined
+
+    for (const [pattern, subUrl] of rules) {
+      if (pattern.test(model)) return subUrl
+    }
+
+    return undefined
+  }
 }

package/src/type.ts

@@ -230,8 +230,8 @@ export interface HunyuanGenerateImageInput {
 }
 
 export interface HunyuanARGenerateImageInput {
-  /** 模型名称：hunyuan-image-v3.0-v1.0.4（推荐）或 hunyuan-image-v3.0-v1.0.1 */
-  model: 'hunyuan-image-v3.0-v1.0.4' | 'hunyuan-image-v3.0-v1.0.1'
+  /** 模型名称：hunyuan-image-v3.0-v1.0.4（推荐）、hunyuan-image-v3.0-v1.0.1 或 HY-Image-v3.0-I2I-ToB-v1.0.1 */
+  model: 'hunyuan-image-v3.0-v1.0.4' | 'hunyuan-image-v3.0-v1.0.1' | 'HY-Image-v3.0-I2I-ToB-v1.0.1' | 'HY-Image-3.0-Plus-4090-Tob-v1.0'
   /** 生成图片使用的文本，不超过 8192 字符 */
   prompt: string
   /**
@@ -248,6 +248,11 @@ export interface HunyuanARGenerateImageInput {
   revise?: { value: boolean }
   /** 改写是否开启 thinking 模式，默认开启。开启后效果提升但耗时增加（最大 60s） */
   enable_thinking?: { value: boolean }
+  /**
+   * 改写图片地址
+   */
+  image_urls?: string[]
+  images?: string[]
 }
 
 export interface HunyuanARGenerateImageOutput {