@lingjingai/scriptctl 0.62.2 → 0.62.3

package/changes/0.62.3.md

@@ -0,0 +1,4 @@
+# 0.62.3
+
+- 梗概、文本整理与结构化文本任务遇到明确的内容审核拒绝时，使用已配置的豆包 Pro Ark Responses 端点兜底。
+- 保持原始文本、结构化 Schema、取消信号及每条实际模型线路的 token 与调用成本记录。

package/dist/bin.js

@@ -1043,7 +1043,7 @@ var AnthropicModel = class {
   }
 };
 
-// src/infra/llm/doubao-video-model.ts
+// src/infra/llm/doubao-model.ts
 import * as fs7 from "node:fs";
 import * as path7 from "node:path";
 import { File } from "node:buffer";
@@ -1173,7 +1173,7 @@ function httpError(status, message2, detail, context = {}) {
   });
 }
 
-// src/infra/llm/doubao-video-model.ts
+// src/infra/llm/doubao-model.ts
 var POLL_INTERVAL_MS = 2e3;
 function delay2(ms) {
   return new Promise((resolve19) => setTimeout(resolve19, ms));
@@ -1203,7 +1203,7 @@ function extractText(res) {
   }
   return parts.join("").trim();
 }
-var DoubaoVideoModel = class {
+var DoubaoModel = class {
   constructor(model, timeoutMs, maxAttempts, apiKey, baseUrl, client) {
     this.model = model;
     this.timeoutMs = timeoutMs;
@@ -1278,12 +1278,45 @@ var DoubaoVideoModel = class {
     if (request2.responseJsonSchema) {
       params["text"] = { format: { type: "json_schema", name: "video_serial", schema: request2.responseJsonSchema } };
     }
+    return this.generateResponse(params, request2.signal, Boolean(request2.responseJsonSchema));
+  }
+  async generateText(request2) {
+    const params = this.textParams(request2);
+    if (request2.responseFormat) params["text"] = { format: { type: request2.responseFormat } };
+    return this.generateResponse(params, request2.signal, Boolean(request2.responseFormat));
+  }
+  async generateTool(request2) {
+    const params = this.textParams(request2);
+    params["text"] = { format: {
+      type: "json_schema",
+      name: request2.tool.name,
+      description: request2.tool.description,
+      schema: request2.tool.inputSchema
+    } };
+    const response = await this.generateResponse(params, request2.signal, true);
+    return {
+      input: JSON.parse(response.text),
+      finishReason: response.finishReason,
+      attempts: response.attempts,
+      usage: response.usage,
+      raw: response.raw
+    };
+  }
+  textParams(request2) {
+    return {
+      model: this.model,
+      max_output_tokens: request2.maxOutputTokens,
+      instructions: request2.system,
+      input: [{ role: "user", content: [{ type: "input_text", text: request2.user }] }]
+    };
+  }
+  async generateResponse(params, signal, structured) {
     const { value, attempts, failedUsage } = await withTransientRetry(this.maxAttempts, async () => {
       let res;
       try {
-        res = await this.client.createResponse(params, request2.signal);
+        res = await this.client.createResponse(params, signal);
       } catch (error) {
-        throw toArkError(error, request2.signal, "generate", this.model);
+        throw toArkError(error, signal, "generate", this.model);
       }
       const status = (res.status ?? "").toLowerCase();
       const usage = arkUsage(res.usage);
@@ -1294,11 +1327,11 @@ var DoubaoVideoModel = class {
       }
       const text2 = extractText(res);
       if (!text2) throw new LlmTransportError("empty_response", "Doubao returned an empty response.", { retryable: true, usage });
-      if (request2.responseJsonSchema) {
+      if (structured) {
         try {
           JSON.parse(text2);
         } catch {
-          throw new LlmTransportError("invalid_response", "Doubao returned malformed JSON for a structured video response.", {
+          throw new LlmTransportError("invalid_response", "Doubao returned malformed JSON for a structured response.", {
             retryable: true,
             usage,
             context: { provider: "doubao", model: this.model, operation: "generate" }
@@ -2457,6 +2490,12 @@ var ModelRouter = class {
   // Resolve an explicit Doubao route or the default fallback; absent fallback credentials skip it.
   // Overridable in tests to inject a fake Ark client.
   doubaoAdapter(route) {
+    return this.arkAdapter(route);
+  }
+  doubaoTextAdapter() {
+    return this.arkAdapter();
+  }
+  arkAdapter(route) {
     const apiKey = route ? this.videoCredential(route) : (process.env[DOUBAO_FALLBACK.apiKeyEnv] ?? "").trim();
     if (!apiKey) return null;
     const model = route?.info.model ?? this.doubaoModel();
@@ -2464,7 +2503,7 @@ var ModelRouter = class {
     const key = `doubao ${baseUrl} ${model}`;
     const cached2 = this.doubaoAdapters.get(key);
     if (cached2) return cached2;
-    const adapter = new DoubaoVideoModel(model, DOUBAO_FALLBACK.timeoutMs, DOUBAO_FALLBACK.maxAttempts, apiKey, baseUrl);
+    const adapter = new DoubaoModel(model, DOUBAO_FALLBACK.timeoutMs, DOUBAO_FALLBACK.maxAttempts, apiKey, baseUrl);
     this.doubaoAdapters.set(key, adapter);
     return adapter;
   }
@@ -2472,19 +2511,29 @@ var ModelRouter = class {
   doubaoModel() {
     return (process.env[DOUBAO_FALLBACK.modelEnv] ?? "").trim() || DOUBAO_FALLBACK.model;
   }
+  async withModerationFallback(task, signal, generate) {
+    const route = this.resolve(task);
+    const adapter = this.adapter(route);
+    try {
+      return await this.tracked(route.info, () => generate(adapter));
+    } catch (error) {
+      if (signal?.aborted || !(error instanceof LlmTransportError) || error.code !== "content_filtered") throw error;
+      const doubao = this.doubaoTextAdapter();
+      if (!doubao) throw error;
+      process.stderr.write(`\u21AA\uFE0F  \u6587\u672C\u5185\u5BB9\u5BA1\u6838\u62D2\u7EDD\uFF0C\u56DE\u9000\u5230\u8C46\u5305 ${this.doubaoModel()}
+`);
+      return this.tracked(this.doubaoRoute(task), () => generate(doubao));
+    }
+  }
   async generateText(task, request2) {
     const spec2 = LLM_TASK_REGISTRY[task];
     if (spec2.mode !== "text") throw configRuntimeError("The task does not support text generation.", ["text task"], [`task: ${task}`]);
-    const route = this.resolve(task);
-    const adapter = this.adapter(route);
-    return this.tracked(route.info, () => adapter.generateText({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
+    return this.withModerationFallback(task, request2.signal, (adapter) => adapter.generateText({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
   }
   async generateTool(task, request2) {
     const spec2 = LLM_TASK_REGISTRY[task];
     if (spec2.mode !== "tool") throw configRuntimeError("The task does not support tool generation.", ["tool task"], [`task: ${task}`]);
-    const route = this.resolve(task);
-    const adapter = this.adapter(route);
-    return this.tracked(route.info, () => adapter.generateTool({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
+    return this.withModerationFallback(task, request2.signal, (adapter) => adapter.generateTool({ ...request2, maxOutputTokens: spec2.maxOutputTokens }));
   }
 };
 function createLlmExecutor(explicitConfigPath, options) {