@lingjingai/scriptctl 0.63.1 → 0.63.2

package/changes/0.63.2.md

@@ -0,0 +1,4 @@
+# 0.63.2
+
+- Gemini 视频请求固定使用配置的模型与服务，在当前路由内有限重试，失败时直接返回原因。
+- 修复内置 Mastra 审核的 Google API 地址拼接，服务根地址和 /v1beta 地址均可正确请求。

package/dist/bin.js

@@ -265,23 +265,6 @@ function contextOf(failure) {
     ...failure.details !== void 0 ? { details: failure.details } : {}
   };
 }
-function aggregateFailures(failures, message2) {
-  if (failures.length === 0) {
-    return createOperationalFailure(
-      { failure_type: "unknown", failure_code: "unknown" },
-      { retryable: false, message: message2 }
-    );
-  }
-  const first = failures[0];
-  const sameClassification = failures.every(
-    (failure) => failure.failure_type === first.failure_type && failure.failure_code === first.failure_code
-  );
-  const classification = sameClassification ? classificationOf(first) : { failure_type: "provider", failure_code: "attempts_exhausted" };
-  return createOperationalFailure(classification, {
-    retryable: failures.some((failure) => failure.retryable),
-    message: message2
-  });
-}
 function formatFailure(failure) {
   const route = failure.provider || failure.model ? `${failure.provider ?? "provider"}/${failure.model ?? "model"} ` : "";
   const reason = failure.provider_reason ? ` provider_reason=${failure.provider_reason}` : "";
@@ -7794,10 +7777,6 @@ var OpenAiCompatibleModel = class {
 };
 
 // src/llm/router.ts
-var VIDEO_FALLBACK_MODELS = ["gemini-3.7-flash"];
-var PROXY_GEMINI_MODELS = [];
-var PROXY_GEMINI_API_KEY_ENVS = ["GEMINI_PROXY_API_KEY", "REDRAW_GEMINI_PROXY_API_KEY"];
-var PROXY_GEMINI_BASE_URL_ENVS = ["GEMINI_PROXY_BASE_URL", "REDRAW_GEMINI_PROXY_BASE_URL"];
 var DOUBAO_FALLBACK = {
   model: "ep-20260721150136-98dj9",
   modelEnv: "ARK_MODEL",
@@ -7837,26 +7816,6 @@ function credentialError(provider) {
     data: { expected: ["credential environment variable referenced by the selected provider"], actual: [`provider: ${provider}`, "credential: missing"] }
   });
 }
-function routedFailure(error, route) {
-  if (error instanceof LlmTransportError) {
-    return createOperationalFailure(classificationOf(error.failure), {
-      ...contextOf(error.failure),
-      provider: route.provider,
-      model: route.model,
-      retryable: error.failure.retryable,
-      message: error.failure.message
-    });
-  }
-  return createOperationalFailure(
-    { failure_type: "unknown", failure_code: "unknown" },
-    {
-      provider: route.provider,
-      model: route.model,
-      retryable: false,
-      message: error instanceof Error ? error.message : String(error)
-    }
-  );
-}
 var ModelRouter = class {
   constructor(config, options = {}) {
     this.config = config;
@@ -8027,52 +7986,6 @@ var ModelRouter = class {
       throw error;
     }
   }
-  videoRoute(route, model) {
-    const modelConfig = model === route.info.model ? route.modelConfig : { ...route.modelConfig, model };
-    return {
-      ...route.info,
-      model,
-      fingerprint: routeFingerprint(route.info.task, route.providerConfig, modelConfig)
-    };
-  }
-  resolvedVideoRoute(route, model) {
-    const modelConfig = model === route.info.model ? route.modelConfig : { ...route.modelConfig, model };
-    return {
-      info: this.videoRoute(route, model),
-      providerConfig: route.providerConfig,
-      modelConfig
-    };
-  }
-  proxyVideoRoutes(task) {
-    if (this.options.videoProvider) return [];
-    const apiKeyEnv = PROXY_GEMINI_API_KEY_ENVS.find((name) => (process.env[name] ?? "").trim());
-    const baseUrlEnv = PROXY_GEMINI_BASE_URL_ENVS.find((name) => (process.env[name] ?? "").trim());
-    if (!apiKeyEnv || !baseUrlEnv) return [];
-    const baseUrl = normalizeProviderBaseUrl(process.env[baseUrlEnv], baseUrlEnv);
-    return PROXY_GEMINI_MODELS.map((model, index) => {
-      const providerConfig = {
-        protocol: "google-gemini",
-        baseUrl,
-        apiKeyEnv,
-        timeoutMs: 9e4,
-        maxAttempts: index < 2 ? 2 : 1
-      };
-      const modelConfig = { provider: "gemini-proxy", model };
-      return {
-        info: {
-          task,
-          profile: "gemini-proxy",
-          provider: "gemini-proxy",
-          protocol: "google-gemini",
-          baseUrl,
-          model,
-          fingerprint: routeFingerprint(task, providerConfig, modelConfig)
-        },
-        providerConfig,
-        modelConfig
-      };
-    });
-  }
   resolveDoubao(task, explicit) {
     const overrides = explicit ? this.options.videoProvider : void 0;
     const modelName = explicit ? (overrides?.model ?? process.env["ARK_MODEL"] ?? "").trim() : this.doubaoModel();
@@ -8114,9 +8027,7 @@ var ModelRouter = class {
     this.adapters.set(key, adapter);
     return adapter;
   }
-  // model defaults to the route's model; pass an override to build a peer adapter
-  // that shares the provider/credential but targets a fallback model.
-  videoAdapter(route, model) {
+  videoAdapter(route) {
     if (route.providerConfig.protocol !== "google-gemini") {
       throw configRuntimeError(
         "Video tasks require a google-gemini provider.",
@@ -8124,14 +8035,13 @@ var ModelRouter = class {
         [`provider: ${route.info.provider}`, `protocol: ${route.providerConfig.protocol}`]
       );
     }
-    const modelName = model ?? route.info.model;
+    const modelName = route.info.model;
     const key = `${route.info.provider} ${route.providerConfig.baseUrl ?? "official"} ${modelName}`;
     const cached2 = this.videoAdapters.get(key);
     if (cached2) return cached2;
     const apiKey = this.videoCredential(route);
     if (!apiKey) throw credentialError(route.info.provider);
-    const modelConfig = model ? { ...route.modelConfig, model } : route.modelConfig;
-    const adapter = new GeminiVideoModel(route.providerConfig, modelConfig, apiKey);
+    const adapter = new GeminiVideoModel(route.providerConfig, route.modelConfig, apiKey);
     this.videoAdapters.set(key, adapter);
     return adapter;
   }
@@ -8146,8 +8056,8 @@ var ModelRouter = class {
     if (spec2.mode !== "video") throw configRuntimeError("The task does not support video generation.", ["video task"], [`task: ${task}`]);
     const route = this.resolve(task);
     if (this.options.videoProvider?.provider === "doubao") {
-      const adapter = this.doubaoAdapter(route);
-      if (!adapter) throw credentialError("doubao");
+      const adapter2 = this.doubaoAdapter(route);
+      if (!adapter2) throw credentialError("doubao");
       return {
         prepare: async (localPath, mimeType, mode, signal) => {
           if (mode !== "file-api") {
@@ -8162,7 +8072,7 @@ var ModelRouter = class {
           }
           request2.signal?.throwIfAborted();
           const { path: localPath, mimeType: localMime } = request2.media;
-          return this.tracked(route.info, () => adapter.run({
+          return this.tracked(route.info, () => adapter2.run({
             localPath,
             localMime,
             user: request2.user,
@@ -8184,88 +8094,17 @@ var ModelRouter = class {
         [`provider: ${route.info.provider}`, `protocol: ${route.providerConfig.protocol}`]
       );
     }
-    const officialRoutes = (this.options.videoProvider ? [route.info.model] : [route.info.model, ...VIDEO_FALLBACK_MODELS.filter((m) => m !== route.info.model)]).map((model) => this.resolvedVideoRoute(route, model));
-    const proxyRoutes = this.proxyVideoRoutes(task);
-    if (this.options.videoProvider || proxyRoutes.length === 0) void this.videoAdapter(route);
+    const adapter = this.videoAdapter(route);
     return {
-      prepare: async (localPath, mimeType, mode, signal) => {
-        const prepareRoute = mode === "base64" && proxyRoutes.length > 0 ? proxyRoutes[0] : route;
-        try {
-          return await this.videoAdapter(prepareRoute).prepare(localPath, mimeType, mode, signal);
-        } catch (error) {
-          if (signal?.aborted || mode !== "file-api" || this.options.videoProvider || !this.doubaoAdapter()) throw error;
-          const failure = routedFailure(error, route.info);
-          process.stderr.write(`\u21AA\uFE0F  Gemini \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25,\u6539\u7531\u8C46\u5305\u8BFB\u53D6\u672C\u5730\u89C6\u9891 (${formatFailure(failure)})
-`);
-          return { kind: "local-fallback", path: localPath, mimeType, primaryFailure: failure };
-        }
-      },
-      release: (media, signal) => media.kind === "base64" || media.kind === "local-fallback" ? Promise.resolve() : this.videoAdapter(route).release(media, signal),
-      generate: async (request2) => {
-        const failures = request2.media.kind === "local-fallback" ? [request2.media.primaryFailure] : [];
-        const skipped = [];
-        const geminiChain = request2.media.kind === "local-fallback" ? [] : request2.media.kind === "base64" ? [...proxyRoutes, ...officialRoutes] : officialRoutes;
-        for (const [index, attemptRoute] of geminiChain.entries()) {
-          try {
-            const response = await this.tracked(
-              attemptRoute.info,
-              () => this.videoAdapter(attemptRoute).generate({ ...request2, maxOutputTokens: spec2.maxOutputTokens })
-            );
-            if (index > 0) process.stderr.write(`\u21AA\uFE0F  \u5DF2\u5207\u6362\u5230\u5907\u7528\u6A21\u578B ${attemptRoute.info.model}
-`);
-            return response;
-          } catch (error) {
-            if (request2.signal?.aborted) throw error;
-            const failure = routedFailure(error, attemptRoute.info);
-            failures.push(failure);
-            const detail = formatFailure(failure);
-            if (index < geminiChain.length - 1) {
-              process.stderr.write(`\u21AA\uFE0F  ${attemptRoute.info.model} \u5F53\u524D\u4E0D\u53EF\u7528\uFF0C\u5207\u6362\u4E0B\u4E00\u7EBF\u8DEF (${detail})
-`);
-            }
-          }
-        }
-        const doubao = this.options.videoProvider ? null : this.doubaoAdapter();
-        const localPath = request2.media.kind === "local-fallback" ? request2.media.path : request2.localPath;
-        if (doubao && localPath) {
-          const attemptRoute = this.doubaoRoute(task);
-          try {
-            process.stderr.write(`\u21AA\uFE0F  Gemini \u5168\u90E8\u5931\u8D25,\u56DE\u9000\u5230\u8C46\u5305 ${this.doubaoModel()}
-`);
-            const response = await this.tracked(attemptRoute, () => doubao.run({
-              localPath,
-              localMime: request2.media.kind === "local-fallback" ? request2.media.mimeType : request2.localMime ?? "video/mp4",
-              user: request2.user,
-              fps: request2.fps,
-              maxOutputTokens: spec2.maxOutputTokens,
-              ...request2.system ? { system: request2.system } : {},
-              ...request2.responseJsonSchema ? { responseJsonSchema: request2.responseJsonSchema } : {},
-              ...request2.signal ? { signal: request2.signal } : {}
-            }));
-            return response;
-          } catch (error) {
-            if (request2.signal?.aborted) throw error;
-            failures.push(routedFailure(error, attemptRoute));
-          }
-        } else if (!doubao) {
-          if (!this.options.videoProvider) {
-            skipped.push("doubao: skipped (ARK_API_KEY not set)");
-          }
-        } else {
-          skipped.push("doubao: skipped (no local file to re-upload)");
-        }
-        const aggregate = aggregateFailures(failures, "All configured video model attempts failed.");
-        throw new LlmTransportError("request_failed", aggregate.message, {
-          retryable: aggregate.retryable,
-          classification: classificationOf(aggregate),
-          context: contextOf(aggregate),
-          modelFailures: failures,
-          details: [...failures.map(formatFailure), ...skipped]
-        });
-      }
+      prepare: (localPath, mimeType, mode, signal) => adapter.prepare(localPath, mimeType, mode, signal),
+      release: (media, signal) => adapter.release(media, signal),
+      generate: (request2) => this.tracked(route.info, () => adapter.generate({
+        ...request2,
+        maxOutputTokens: spec2.maxOutputTokens
+      }))
     };
   }
-  // Resolve an explicit Doubao route or the default fallback; absent fallback credentials skip it.
+  // Resolve explicitly selected Doubao video.
   // Overridable in tests to inject a fake Ark client.
   doubaoAdapter(route) {
     return this.arkAdapter(route);