@cloudbase/ai 2.24.7 → 2.24.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/ai",
-  "version": "2.24.7",
+  "version": "2.24.8",
   "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.24.7",
-    "@cloudbase/utilities": "2.24.7",
+    "@cloudbase/types": "2.24.8",
+    "@cloudbase/utilities": "2.24.8",
     "@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": "d3df65b07405f0e29866486dc0e804fa30070414"
+  "gitHead": "f8deb2e86298c7729687df544d833cacdfe4bdad"
 }

package/src/models/image-model.ts

@@ -1,74 +1,59 @@
 import type {
   ModelReq,
-  ImageGenerateInput,
   // ImageEditInput,
   HunyuanGenerateImageInput,
   HunyuanGenerateImageOutput,
+  HunyuanARGenerateImageInput,
+  HunyuanARGenerateImageOutput,
   // HunyuanEditImageInput,
   // HunyuanEditImageOutput,
 } from '../type'
 
-// mock NoInfer
-type NoInfer<T> = [T][T extends any ? 0 : never]
+interface HunyuanImageGenerateFn {
+  (input: HunyuanARGenerateImageInput): Promise<HunyuanARGenerateImageOutput>
+  (input: HunyuanGenerateImageInput): Promise<HunyuanGenerateImageOutput>
+}
 
-type GenerateImageInput<TProvider extends string, TInput = unknown> = unknown extends TInput
-  ? TProvider extends 'hunyuan-image'
-    ? HunyuanGenerateImageInput
-    : ImageGenerateInput
-  : TInput
+type GenerateImageFn<TProvider> = TProvider extends 'hunyuan-image'
+  ? HunyuanImageGenerateFn
+  : (input: unknown) => Promise<unknown>
 
-type GenerateImageOutput<TProvider extends string, TOutput = unknown> = unknown extends TOutput
-  ? TProvider extends 'hunyuan-image'
-    ? HunyuanGenerateImageOutput
-    : unknown
-  : TOutput
+export class DefaultImageModel<TProvider extends string> {
+  public defaultGenerateImageSubUrl = 'images/generations'
 
-// type EditImageInput<T extends string, TInput = unknown> = unknown extends TInput
-//   ? T extends 'hunyuan-image'
-//     ? HunyuanEditImageInput
-//     : ImageEditInput
-//   : TInput
+  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',
+    },
+  }
 
-// type EditImageOutput<T extends string, TOutput = unknown> = unknown extends TOutput
-//   ? T extends 'hunyuan-image'
-//     ? HunyuanEditImageOutput
-//     : unknown
-//   : TOutput
+  /** 生成图片 */
+  public generateImage: GenerateImageFn<TProvider>
 
-export class DefaultImageModel<TProvider extends string> {
-  public generateImageSubUrl = 'images/generations'
-  // public editImageSubUrl = 'images/edits'
+  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> {
+    let subUrl = this.defaultGenerateImageSubUrl
 
-  constructor(
-    private req: ModelReq,
-    public baseUrl: string,
-    public provider: TProvider,
-  ) {}
+    if (typeof input === 'object' && input && 'model' in input && typeof input.model === 'string') {
+      const newSubUrl = this.generateImageSubUrlConfig[this.provider]?.[input.model]
+      if (newSubUrl) subUrl = newSubUrl
+    }
 
-  public async generateImage<TInput = unknown, TOutput = unknown>(input: NoInfer<GenerateImageInput<TProvider, TInput>>,): Promise<GenerateImageOutput<TProvider, TOutput>> {
-    const res = await this.req({
-      url: this.getGenerateUrl(),
+    const res = (await this.req({
+      url: this.getGenerateUrl(subUrl),
       data: input,
       stream: false,
-    })
+    })) as HunyuanARGenerateImageOutput | HunyuanGenerateImageOutput
 
-    return res as GenerateImageOutput<TProvider, TOutput>
+    return res
   }
 
-  // public async editImage<TInput = unknown, TOutput = unknown>(input: NoInfer<EditImageInput<TProvider, TInput>>,): Promise<EditImageOutput<TProvider, TOutput>> {
-  //   const res = await this.req({
-  //     url: this.getEditUrl(),
-  //     data: input,
-  //     stream: false,
-  //   })
-  //   return res as EditImageOutput<TProvider, TOutput>
-  // }
-
-  private getGenerateUrl() {
-    return `${this.baseUrl}/${this.provider}/${this.generateImageSubUrl}`
+  private getGenerateUrl(subUrl: string) {
+    return `${this.baseUrl}/${this.provider}/${subUrl}`
   }
-
-  // private getEditUrl() {
-  //   return `${this.baseUrl}/${this.provider}/${this.editImageSubUrl}`
-  // }
 }

package/src/type.ts

@@ -169,13 +169,8 @@ export interface ImageEditInput {
   [key: string]: unknown // 允许额外的厂商特定参数
 }
 
-/**
- * 混元图片生成输入参数
- * 接口文档：POST /openapi/v1/images/generations
- */
 export interface HunyuanGenerateImageInput {
-  /** 模型名称，默认为 hunyuan-image */
-  model: 'hunyuan-image' | (string & {})
+  model: 'hunyuan-image'
   /** 用来生成图像的文本描述 */
   prompt: string
   /**
@@ -234,10 +229,41 @@ export interface HunyuanGenerateImageInput {
   seed?: number
 }
 
-/**
- * 混元图片编辑输入参数
- * 接口文档：POST /openapi/v1/images/edits
- */
+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'
+  /** 生成图片使用的文本，不超过 8192 字符 */
+  prompt: string
+  /**
+   * 图片尺寸，格式 "${宽}x${高}"，默认 "1024x1024"
+   * hunyuan-image-v3.0-v1.0.4：宽高 [512, 2048]，面积不超过 1024x1024
+   * hunyuan-image-v3.0-v1.0.1：支持固定尺寸列表
+   */
+  size?: string
+  /** 生成种子，仅当生成图片数为 1 时生效，范围 [1, 4294967295] */
+  seed?: number
+  /** 业务自定义水印内容，限制 16 字符，生成在图片右下角 */
+  footnote?: string
+  /** 是否对 prompt 改写，默认开启。改写会增加约 30s 耗时 */
+  revise?: { value: boolean }
+  /** 改写是否开启 thinking 模式，默认开启。开启后效果提升但耗时增加（最大 60s） */
+  enable_thinking?: { value: boolean }
+}
+
+export interface HunyuanARGenerateImageOutput {
+  /** 此次请求的 id */
+  id: string
+  /** unix 时间戳 */
+  created: number
+  /** 返回的图片生成内容 */
+  data: Array<{
+    /** 生成的图片 url，有效期 24 小时 */
+    url: string
+    /** 改写后的 prompt */
+    revised_prompt?: string
+  }>
+}
+
 export type HunyuanEditImageInput = {
   /** 模型名称，本期为 hunyuan-image，即为商品图编辑场景 */
   model: 'hunyuan-image' | (string & {})