@henjicc/ai-sdk 0.9.0 → 0.10.0

package/dist/upload/provider-preprocessors/apimart.js

@@ -1,11 +1,13 @@
 import { AiRuntimeError } from '../../runtime/AiRuntimeError.js';
 import { uploadToApiMart } from '../apimart-upload.js';
+import { uploadToPublicHost } from '../public-host-upload.js';
 import { createGenerationPreprocessor } from './factory.js';
 export const strategy = {
-    async rewrite({ mediaKind, prepared, runtime, route, requestId }) {
-        if (mediaKind !== 'image') {
-            throw new AiRuntimeError('public_media_url_required', `APIMart 没有通用的${mediaKind === 'video' ? '视频' : (mediaKind === 'audio' ? '音频' : '文件')}上传端点。`);
-        }
+    async rewrite(input) {
+        const { mediaKind, prepared, runtime, route, requestId, signal } = input;
+        // APIMart 只有图片上传端点；参考视频、音频经通用文件上传服务（KIE / Fal）托管成公网地址。
+        if (mediaKind !== 'image')
+            return await uploadToPublicHost(input, 'APIMart');
         const apiKey = await runtime.credentials.get('generation', 'apimart');
         if (!apiKey) {
             throw new AiRuntimeError('missing_api_key', 'APIMart 本地图片必须先上传，请先在设置中配置 APIMart API Key。');
@@ -18,7 +20,7 @@ export const strategy = {
             context,
         });
         try {
-            const url = await uploadToApiMart(apiKey, prepared, runtime.transport);
+            const url = await uploadToApiMart(apiKey, prepared, runtime.transport, signal);
             runtime.logger.info('APIMart 本地图片上传完成', {
                 event: 'ai_runtime.upload.apimart_completed',
                 requestId,
@@ -28,6 +30,12 @@ export const strategy = {
             return url;
         }
         catch (error) {
+            if (signal?.aborted || (error instanceof AiRuntimeError && error.code === 'cancelled') || (error instanceof Error && error.name === 'AbortError')) {
+                runtime.logger.info('APIMart 本地图片上传已取消', {
+                    event: 'ai_runtime.upload.apimart_cancelled', requestId, providerId: 'apimart', context,
+                });
+                throw new AiRuntimeError('cancelled', 'APIMart upload cancelled');
+            }
             runtime.logger.error('APIMart 本地图片上传失败', {
                 event: 'ai_runtime.upload.apimart_failed',
                 requestId,

package/dist/upload/provider-preprocessors/bailian.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 百炼图片收 Data URI；视频、音频只收公网 URL 或 oss://，本地文件传到百炼免费临时存储。
+ * 上传凭证按模型签发，所以从请求体的 model 申请；带 oss:// 的请求由供应商层加上解析头。
+ */
+export declare const strategy: {
+    rewrite(input: import("../preprocess-core.js").ProviderMediaRewriteInput): Promise<string>;
+};
+export declare const preprocess: import("../../index.js").GenerationRequestPreprocessor;

package/dist/upload/provider-preprocessors/bailian.js

@@ -0,0 +1,45 @@
+import { AiRuntimeError } from '../../runtime/AiRuntimeError.js';
+import { getPointer } from '../../providers/helpers.js';
+import { toDataUri } from '../base64.js';
+import { uploadBytesToBailianOss } from '../bailian-oss-upload.js';
+import { createGenerationPreprocessor } from './factory.js';
+/**
+ * 百炼图片收 Data URI；视频、音频只收公网 URL 或 oss://，本地文件传到百炼免费临时存储。
+ * 上传凭证按模型签发，所以从请求体的 model 申请；带 oss:// 的请求由供应商层加上解析头。
+ */
+export const strategy = {
+    async rewrite(input) {
+        if (input.mediaKind === 'image')
+            return toDataUri(input.prepared.bytes, input.prepared.mimeType);
+        const apiKey = await input.runtime.credentials.get('generation', 'bailian');
+        if (!apiKey)
+            throw new AiRuntimeError('missing_api_key', '百炼本地视频、音频需要先上传，请先在设置中配置百炼 API Key。');
+        const modelId = getPointer(input.requestBody, '/model');
+        if (typeof modelId !== 'string' || !modelId)
+            throw new AiRuntimeError('invalid_request', '百炼请求缺少 model，无法申请上传凭证');
+        const context = { route: input.route, modelId, mediaKind: input.mediaKind, bytes: input.prepared.bytes.byteLength };
+        input.runtime.logger.info('百炼临时存储上传开始', {
+            event: 'ai_runtime.upload.bailian_oss_started', requestId: input.requestId, providerId: 'bailian', context,
+        });
+        try {
+            const url = await uploadBytesToBailianOss({
+                transport: input.runtime.transport, apiKey, modelId,
+                objectName: `${input.requestId ?? 'henji'}-${Date.now()}-${input.prepared.filename}`,
+                bytes: input.prepared.bytes, mimeType: input.prepared.mimeType, filename: input.prepared.filename, signal: input.signal,
+            });
+            input.runtime.logger.info('百炼临时存储上传完成', {
+                event: 'ai_runtime.upload.bailian_oss_completed', requestId: input.requestId, providerId: 'bailian', context,
+            });
+            return url;
+        }
+        catch (error) {
+            if (input.signal?.aborted || (error instanceof Error && error.name === 'AbortError'))
+                throw new AiRuntimeError('cancelled', '百炼上传已取消');
+            input.runtime.logger.error('百炼临时存储上传失败', {
+                event: 'ai_runtime.upload.bailian_oss_failed', requestId: input.requestId, providerId: 'bailian', context, error,
+            });
+            throw error;
+        }
+    },
+};
+export const preprocess = createGenerationPreprocessor(strategy);

package/dist/upload/provider-preprocessors/kie.d.ts

@@ -1,4 +1,4 @@
 export declare const strategy: {
-    rewrite({ prepared, runtime }: import("../preprocess-core.js").ProviderMediaRewriteInput): Promise<string>;
+    rewrite({ prepared, runtime, route, requestId, providerId, signal }: import("../preprocess-core.js").ProviderMediaRewriteInput): Promise<string>;
 };
 export declare const preprocess: import("../../index.js").GenerationRequestPreprocessor;

package/dist/upload/provider-preprocessors/kie.js

@@ -1,18 +1,35 @@
-import { toDataUri } from '../base64.js';
+import { AiRuntimeError } from '../../runtime/AiRuntimeError.js';
 import { uploadToKie } from '../kie-upload.js';
 import { createGenerationPreprocessor } from './factory.js';
 export const strategy = {
-    async rewrite({ prepared, runtime }) {
+    async rewrite({ prepared, runtime, route, requestId, providerId, signal }) {
         const apiKey = await runtime.credentials.get('generation', 'kie');
-        if (apiKey) {
-            try {
-                return await uploadToKie(apiKey, prepared, runtime.transport);
-            }
-            catch {
-                // 保持旧行为：KIE 托管上传失败时退回 data URI，由生成端点给出最终协议结论。
+        if (!apiKey) {
+            throw new AiRuntimeError('missing_api_key', 'KIE 本地文件必须先上传，请先在设置中配置 KIE API Key。');
+        }
+        const context = { route, mimeType: prepared.mimeType, bytes: prepared.bytes.byteLength };
+        runtime.logger.info('开始上传 KIE 本地文件', {
+            event: 'ai_runtime.upload.kie_started', requestId, providerId, context,
+        });
+        try {
+            const url = await uploadToKie(apiKey, prepared, runtime.transport, signal);
+            runtime.logger.info('KIE 本地文件上传完成', {
+                event: 'ai_runtime.upload.kie_completed', requestId, providerId, context,
+            });
+            return url;
+        }
+        catch (error) {
+            if (signal?.aborted || (error instanceof AiRuntimeError && error.code === 'cancelled') || (error instanceof Error && error.name === 'AbortError')) {
+                runtime.logger.info('KIE 本地文件上传已取消', {
+                    event: 'ai_runtime.upload.kie_cancelled', requestId, providerId, context,
+                });
+                throw new AiRuntimeError('cancelled', 'KIE upload cancelled');
             }
+            runtime.logger.error('KIE 本地文件上传失败', {
+                event: 'ai_runtime.upload.kie_failed', requestId, providerId, context, error,
+            });
+            throw error;
         }
-        return toDataUri(prepared.bytes, prepared.mimeType);
     },
 };
 export const preprocess = createGenerationPreprocessor(strategy);

package/dist/upload/provider-preprocessors/ppio.d.ts

@@ -1,6 +1,5 @@
-import type { ProviderMediaRewriteInput } from '../preprocess-core.js';
 export declare const strategy: {
-    rewrite(input: ProviderMediaRewriteInput): Promise<string>;
+    rewrite(input: import("../preprocess-core.js").ProviderMediaRewriteInput): Promise<string>;
     preprocessObject({ route, object, rewrite }: import("../preprocess-core.js").ProviderObjectPreprocessInput): Promise<void>;
 };
 export declare const preprocess: import("../../index.js").GenerationRequestPreprocessor;

package/dist/upload/provider-preprocessors/ppio.js

@@ -1,7 +1,6 @@
 import { resolvePpioMediaRewriteMode } from '../../providers/ppio-media.js';
-import { AiRuntimeError } from '../../runtime/AiRuntimeError.js';
 import { toBase64, toDataUri } from '../base64.js';
-import { uploadToKie } from '../kie-upload.js';
+import { uploadToPublicHost } from '../public-host-upload.js';
 import { createGenerationPreprocessor } from './factory.js';
 export const strategy = {
     async rewrite(input) {
@@ -10,7 +9,7 @@ export const strategy = {
             return toBase64(input.prepared.bytes);
         if (mode === 'data-uri')
             return toDataUri(input.prepared.bytes, input.prepared.mimeType);
-        return await uploadPublicUrl(input);
+        return await uploadToPublicHost(input, '派欧云');
     },
     async preprocessObject({ route, object, rewrite }) {
         if (route !== '/async/wan2.7-r2v')
@@ -28,29 +27,3 @@ export const strategy = {
     },
 };
 export const preprocess = createGenerationPreprocessor(strategy);
-async function uploadPublicUrl(input) {
-    const primary = typeof input.params.__upload_provider === 'string'
-        ? input.params.__upload_provider.trim()
-        : '';
-    const fallback = typeof input.params.__upload_fallback === 'boolean'
-        ? input.params.__upload_fallback
-        : true;
-    const allowKie = primary === 'kie' || (!primary && fallback) || (primary !== 'kie' && fallback);
-    const failures = [];
-    if (allowKie) {
-        const apiKey = await input.runtime.credentials.get('generation', 'kie');
-        if (apiKey) {
-            try {
-                return await uploadToKie(apiKey, input.prepared, input.runtime.transport);
-            }
-            catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                failures.push(`KIE 上传失败: ${message}`);
-            }
-        }
-        else {
-            failures.push('KIE 未配置');
-        }
-    }
-    throw new AiRuntimeError('public_media_url_required', `当前 PPIO 模型字段要求公网 HTTP/HTTPS 媒体 URL。请直接传入公网 URL，或配置 KIE API Key。${failures.join('；')}`);
-}

package/dist/upload/provider-preprocessors/public-host.d.ts

@@ -0,0 +1,5 @@
+/** 供应商完全不收本地文件（魔搭等）：一律经通用文件上传服务转成公网地址。 */
+export declare const strategy: {
+    rewrite: (input: import("../preprocess-core.js").ProviderMediaRewriteInput) => Promise<string>;
+};
+export declare const preprocess: import("../../index.js").GenerationRequestPreprocessor;

package/dist/upload/provider-preprocessors/public-host.js

@@ -0,0 +1,7 @@
+import { uploadToPublicHost } from '../public-host-upload.js';
+import { createGenerationPreprocessor } from './factory.js';
+/** 供应商完全不收本地文件（魔搭等）：一律经通用文件上传服务转成公网地址。 */
+export const strategy = {
+    rewrite: async (input) => await uploadToPublicHost(input, input.providerId === 'modelscope' ? '魔搭' : input.providerId),
+};
+export const preprocess = createGenerationPreprocessor(strategy);

package/dist/upload/provider-preprocessors/volcengine.d.ts

@@ -0,0 +1,5 @@
+/** 方舟图片、音频收 Base64；参考视频只收公网 URL，经通用文件上传服务托管。 */
+export declare const strategy: {
+    rewrite: (input: import("../preprocess-core.js").ProviderMediaRewriteInput) => Promise<string>;
+};
+export declare const preprocess: import("../../index.js").GenerationRequestPreprocessor;

package/dist/upload/provider-preprocessors/volcengine.js

@@ -0,0 +1,10 @@
+import { toDataUri } from '../base64.js';
+import { uploadToPublicHost } from '../public-host-upload.js';
+import { createGenerationPreprocessor } from './factory.js';
+/** 方舟图片、音频收 Base64；参考视频只收公网 URL，经通用文件上传服务托管。 */
+export const strategy = {
+    rewrite: async (input) => input.mediaKind === 'video'
+        ? await uploadToPublicHost(input, '火山方舟')
+        : toDataUri(input.prepared.bytes, input.prepared.mimeType),
+};
+export const preprocess = createGenerationPreprocessor(strategy);

package/dist/upload/public-host-upload.d.ts

@@ -0,0 +1,7 @@
+import type { ProviderMediaRewriteInput } from './preprocess-core.js';
+/**
+ * 供应商自己不收本地文件时，借“通用文件上传服务”把文件托管成公网地址。
+ * 首选服务来自宿主设置（`__upload_provider`），失败或未配置时按 `__upload_fallback` 换用另一家；
+ * 一家都没配置就提示用户去设置里配，不发出生成请求。
+ */
+export declare function uploadToPublicHost(input: ProviderMediaRewriteInput, providerLabel: string): Promise<string>;

package/dist/upload/public-host-upload.js

@@ -0,0 +1,55 @@
+import { AiRuntimeError } from '../runtime/AiRuntimeError.js';
+import { uploadToFalWithTransport } from './fal-transport.js';
+import { uploadToKie } from './kie-upload.js';
+const HOSTS = {
+    kie: { label: 'KIE', upload: uploadToKie },
+    fal: { label: 'Fal', upload: uploadToFalWithTransport },
+};
+const MEDIA_LABEL = { image: '图片', video: '视频', audio: '音频', file: '文件' };
+function isCancelled(error, signal) {
+    return Boolean(signal?.aborted)
+        || (error instanceof AiRuntimeError && error.code === 'cancelled')
+        || (error instanceof Error && error.name === 'AbortError');
+}
+/**
+ * 供应商自己不收本地文件时，借“通用文件上传服务”把文件托管成公网地址。
+ * 首选服务来自宿主设置（`__upload_provider`），失败或未配置时按 `__upload_fallback` 换用另一家；
+ * 一家都没配置就提示用户去设置里配，不发出生成请求。
+ */
+export async function uploadToPublicHost(input, providerLabel) {
+    const preferred = input.params.__upload_provider === 'fal' ? 'fal' : 'kie';
+    const fallback = typeof input.params.__upload_fallback === 'boolean' ? input.params.__upload_fallback : true;
+    const order = fallback ? [preferred, preferred === 'kie' ? 'fal' : 'kie'] : [preferred];
+    const failures = [];
+    const context = { route: input.route, mediaKind: input.mediaKind, mimeType: input.prepared.mimeType, bytes: input.prepared.bytes.byteLength };
+    for (const hostId of order) {
+        const host = HOSTS[hostId];
+        const apiKey = await input.runtime.credentials.get('generation', hostId);
+        if (!apiKey) {
+            failures.push(`${host.label} 未配置`);
+            continue;
+        }
+        input.runtime.logger.info('通用上传服务开始上传本地文件', {
+            event: 'ai_runtime.upload.public_host_started', requestId: input.requestId, providerId: input.providerId, context: { ...context, host: hostId },
+        });
+        try {
+            const url = await host.upload(apiKey, input.prepared, input.runtime.transport, input.signal);
+            input.runtime.logger.info('通用上传服务上传完成', {
+                event: 'ai_runtime.upload.public_host_completed', requestId: input.requestId, providerId: input.providerId, context: { ...context, host: hostId },
+            });
+            return url;
+        }
+        catch (error) {
+            if (isCancelled(error, input.signal))
+                throw new AiRuntimeError('cancelled', `${providerLabel} 媒体上传已取消`);
+            input.runtime.logger.warn('通用上传服务上传失败', {
+                event: 'ai_runtime.upload.public_host_failed', requestId: input.requestId, providerId: input.providerId, context: { ...context, host: hostId }, error,
+            });
+            failures.push(`${host.label} 上传失败：${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    const configured = failures.some((item) => !item.endsWith('未配置'));
+    throw new AiRuntimeError('public_media_url_required', configured
+        ? `${providerLabel} 需要把本地${MEDIA_LABEL[input.mediaKind]}先上传成公网链接，但通用文件上传服务没能完成：${failures.join('；')}`
+        : `${providerLabel} 需要把本地${MEDIA_LABEL[input.mediaKind]}先上传成公网链接。请在 设置 → 通用文件上传服务 配置 KIE 或 Fal 的密钥后再试。`, { retryable: false, billing: 'not_charged', execution: { notExecuted: true } });
+}

package/dist/upload/upload-response.js

@@ -1,13 +1,18 @@
 import { AiRuntimeError } from '../runtime/AiRuntimeError.js';
+import { readJsonResponse } from '../providers/helpers.js';
 export async function readUploadJson(response, label) {
-    const payload = await response.json().catch((error) => {
-        const message = error instanceof Error ? error.message : String(error);
-        throw new AiRuntimeError('upload_failed', message);
-    });
-    if (!response.ok) {
-        throw new AiRuntimeError('upload_failed', `${label} HTTP ${response.status}: ${JSON.stringify(payload)}`);
+    try {
+        return await readJsonResponse(response, label);
+    }
+    catch (error) {
+        // 解析与 HTTP 诊断只走公共入口；上传层仅保留原有 upload_failed 契约。
+        if (error instanceof AiRuntimeError && ['provider_http_error', 'invalid_json'].includes(error.code)) {
+            const message = error.message.replace(`[${error.code}] `, '');
+            throw new AiRuntimeError('upload_failed', message, error.details);
+        }
+        // 正文读取取消/网络失败及明确的供应商准入错误保留原语义。
+        throw error;
     }
-    return payload;
 }
 export function readUploadString(value, pointer) {
     let current = value;

package/docs/README.md

@@ -1,26 +1,26 @@
-# SDK 调研资料索引
-
-本目录收纳「模型SDK抽离」任务 1.3 从仓库根 `docs/` 迁入的两份调研资产。迁入 SDK 包的目的是让
-「代码 + 文档 + 目录数据」同仓同版本，避免文档与实现分处两地产生漂移；两份资料此前分别是
-`docs/model-adaptation/` 与 `docs/llm-adaptation/`，现分别对应本目录下同名子目录。
-
-## [model-adaptation/](model-adaptation/README.md) —— 生成模型 API 与价格资料
-
-覆盖**生成模型**（图片/视频/音频）：每个 (模型, 供应商) 组合对应一份写死的
-`packages/ai-sdk/src/catalog/{provider}/*.model.ts`，供应商是固定枚举。是本项目**唯一的模型 API 与价格资料源**，
-核对字段名、枚举值、输入限制、端点或价格时只读这里，不要凭记忆下结论。
-
-动手前先读入口手册：[model-adaptation/文档采集手册.md](model-adaptation/文档采集手册.md)。
-
-## [llm-adaptation/](llm-adaptation/README.md) —— LLM 供应商适配资料
-
-覆盖**大语言模型**：供应商和模型是用户运行时自建的，不是代码里为每个模型写一份文件，按供应商
-（而非模型）组织资料。用于核对思考参数、联网搜索、工具调用、协议矩阵等信息。
-
-动手前先读入口手册：[llm-adaptation/文档采集手册.md](llm-adaptation/文档采集手册.md)。
-
-## 两者的区别
-
-详见 [llm-adaptation/README.md](llm-adaptation/README.md) 第一节「这是什么，和
-`docs/model-adaptation/` 有什么不一样」——生成模型的供应商固定、代码与文档 1:1 影子关系；LLM 的
-供应商与模型运行时自建，代码只在协议层（而非模型层）与文档对应。
+# SDK 调研资料索引
+
+本目录收纳「模型SDK抽离」任务 1.3 从仓库根 `docs/` 迁入的两份调研资产。迁入 SDK 包的目的是让
+「代码 + 文档 + 目录数据」同仓同版本，避免文档与实现分处两地产生漂移；两份资料此前分别是
+`docs/model-adaptation/` 与 `docs/llm-adaptation/`，现分别对应本目录下同名子目录。
+
+## [model-adaptation/](model-adaptation/README.md) —— 生成模型 API 与价格资料
+
+覆盖**生成模型**（图片/视频/音频）：每个 (模型, 供应商) 组合对应一份写死的
+`packages/ai-sdk/src/catalog/{provider}/*.model.ts`，供应商是固定枚举。是本项目**唯一的模型 API 与价格资料源**，
+核对字段名、枚举值、输入限制、端点或价格时只读这里，不要凭记忆下结论。
+
+动手前先读入口手册：[model-adaptation/文档采集手册.md](model-adaptation/文档采集手册.md)。
+
+## [llm-adaptation/](llm-adaptation/README.md) —— LLM 供应商适配资料
+
+覆盖**大语言模型**：供应商和模型是用户运行时自建的，不是代码里为每个模型写一份文件，按供应商
+（而非模型）组织资料。用于核对思考参数、联网搜索、工具调用、协议矩阵等信息。
+
+动手前先读入口手册：[llm-adaptation/文档采集手册.md](llm-adaptation/文档采集手册.md)。
+
+## 两者的区别
+
+详见 [llm-adaptation/README.md](llm-adaptation/README.md) 第一节「这是什么，和
+`docs/model-adaptation/` 有什么不一样」——生成模型的供应商固定、代码与文档 1:1 影子关系；LLM 的
+供应商与模型运行时自建，代码只在协议层（而非模型层）与文档对应。