惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

J
Java Code Geeks
博客园 - 聂微东
人人都是产品经理
人人都是产品经理
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
博客园_首页
量子位
阮一峰的网络日志
阮一峰的网络日志
酷 壳 – CoolShell
酷 壳 – CoolShell
H
Hackread – Cybersecurity News, Data Breaches, AI and More
云风的 BLOG
云风的 BLOG
D
DataBreaches.Net
B
Blog
L
LangChain Blog
Apple Machine Learning Research
Apple Machine Learning Research
Vercel News
Vercel News
博客园 - 三生石上(FineUI控件)
爱范儿
爱范儿
Microsoft Azure Blog
Microsoft Azure Blog
IT之家
IT之家
aimingoo的专栏
aimingoo的专栏
B
Blog RSS Feed
H
Help Net Security
The Cloudflare Blog
U
Unit 42

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(google): fall back to rest for veo sdk 404 · openclaw...
steipete · 2026-04-25 · via Recent Commits to openclaw:main

@@ -13,7 +13,7 @@ import type {

1313

VideoGenerationProvider,

1414

VideoGenerationRequest,

1515

} from "openclaw/plugin-sdk/video-generation";

16-

import { resolveGoogleGenerativeAiApiOrigin } from "./api.js";

16+

import { parseGeminiAuth, resolveGoogleGenerativeAiApiOrigin } from "./api.js";

1717

import {

1818

createGoogleVideoGenerationProviderMetadata,

1919

DEFAULT_GOOGLE_VIDEO_MODEL,

@@ -26,12 +26,32 @@ import { createGoogleGenAI, type GoogleGenAIClient } from "./google-genai-runtim

2626

const DEFAULT_TIMEOUT_MS = 180_000;

2727

const POLL_INTERVAL_MS = 10_000;

2828

const MAX_POLL_ATTEMPTS = 90;

29+

const GOOGLE_VIDEO_EMPTY_RESULT_MESSAGE =

30+

"Google video generation response missing generated videos";

29313032

function resolveConfiguredGoogleVideoBaseUrl(req: VideoGenerationRequest): string | undefined {

3133

const configured = normalizeOptionalString(req.cfg?.models?.providers?.google?.baseUrl);

3234

return configured ? resolveGoogleGenerativeAiApiOrigin(configured) : undefined;

3335

}

343637+

function resolveGoogleVideoRestBaseUrl(configuredBaseUrl?: string): string {

38+

return `${configuredBaseUrl ?? "https://generativelanguage.googleapis.com"}/v1beta`;

39+

}

40+41+

function resolveGoogleVideoRestModelPath(model: string): string {

42+

const trimmed = normalizeOptionalString(model) || DEFAULT_GOOGLE_VIDEO_MODEL;

43+

if (trimmed.startsWith("google/models/")) {

44+

return trimmed.slice("google/".length);

45+

}

46+

if (trimmed.startsWith("models/")) {

47+

return trimmed;

48+

}

49+

if (trimmed.startsWith("google/")) {

50+

return `models/${trimmed.slice("google/".length)}`;

51+

}

52+

return `models/${trimmed}`;

53+

}

54+3555

function parseVideoSize(size: string | undefined): { width: number; height: number } | undefined {

3656

const trimmed = normalizeOptionalString(size);

3757

if (!trimmed) {

@@ -220,6 +240,120 @@ async function downloadGeneratedVideoFromUri(params: {

220240

};

221241

}

222242243+

function extractGoogleApiErrorCode(error: unknown): number | undefined {

244+

const status = (error as { status?: unknown } | undefined)?.status;

245+

if (typeof status === "number") {

246+

return status;

247+

}

248+

const message = error instanceof Error ? error.message : String(error);

249+

try {

250+

const parsed = JSON.parse(message) as { code?: unknown; error?: { code?: unknown } };

251+

const code = typeof parsed.code === "number" ? parsed.code : parsed.error?.code;

252+

return typeof code === "number" ? code : undefined;

253+

} catch {

254+

return /\b404\b/u.test(message) ? 404 : undefined;

255+

}

256+

}

257+258+

function extractGeneratedVideos(operation: unknown): Array<{ video?: unknown }> {

259+

const response = (operation as { response?: Record<string, unknown> }).response;

260+

const generatedVideos = response?.generatedVideos;

261+

if (Array.isArray(generatedVideos) && generatedVideos.length > 0) {

262+

return generatedVideos as Array<{ video?: unknown }>;

263+

}

264+

const generatedSamples = (response?.generateVideoResponse as { generatedSamples?: unknown })

265+

?.generatedSamples;

266+

return Array.isArray(generatedSamples) ? (generatedSamples as Array<{ video?: unknown }>) : [];

267+

}

268+269+

async function requestGoogleVideoJson(params: {

270+

url: string;

271+

method: "GET" | "POST";

272+

headers: Record<string, string>;

273+

deadline: ReturnType<typeof createProviderOperationDeadline>;

274+

body?: unknown;

275+

}): Promise<unknown> {

276+

const controller = new AbortController();

277+

const timeout = setTimeout(

278+

() => controller.abort(),

279+

resolveProviderOperationTimeoutMs({

280+

deadline: params.deadline,

281+

defaultTimeoutMs: DEFAULT_TIMEOUT_MS,

282+

}),

283+

);

284+

try {

285+

const response = await fetch(params.url, {

286+

method: params.method,

287+

headers: params.headers,

288+

...(params.body === undefined ? {} : { body: JSON.stringify(params.body) }),

289+

signal: controller.signal,

290+

});

291+

const text = await response.text();

292+

const payload = text ? (JSON.parse(text) as unknown) : {};

293+

if (!response.ok) {

294+

throw new Error(typeof payload === "string" ? payload : JSON.stringify(payload ?? null));

295+

}

296+

return payload;

297+

} finally {

298+

clearTimeout(timeout);

299+

}

300+

}

301+302+

async function generateGoogleVideoViaRest(params: {

303+

baseUrl: string;

304+

headers: Record<string, string>;

305+

deadline: ReturnType<typeof createProviderOperationDeadline>;

306+

model: string;

307+

prompt: string;

308+

durationSeconds?: number;

309+

aspectRatio?: "16:9" | "9:16";

310+

resolution?: "720p" | "1080p";

311+

audio?: boolean;

312+

}): Promise<unknown> {

313+

let operation = await requestGoogleVideoJson({

314+

url: `${params.baseUrl}/${resolveGoogleVideoRestModelPath(params.model)}:predictLongRunning`,

315+

method: "POST",

316+

headers: params.headers,

317+

deadline: params.deadline,

318+

body: {

319+

instances: [{ prompt: params.prompt }],

320+

parameters: {

321+

...(typeof params.durationSeconds === "number"

322+

? { durationSeconds: params.durationSeconds }

323+

: {}),

324+

...(params.aspectRatio ? { aspectRatio: params.aspectRatio } : {}),

325+

...(params.resolution ? { resolution: params.resolution } : {}),

326+

...(params.audio === true ? { generateAudio: true } : {}),

327+

},

328+

},

329+

});

330+331+

for (let attempt = 0; !((operation as { done?: boolean }).done ?? false); attempt += 1) {

332+

if (attempt >= MAX_POLL_ATTEMPTS) {

333+

throw new Error("Google video generation did not finish in time");

334+

}

335+

await waitProviderOperationPollInterval({

336+

deadline: params.deadline,

337+

pollIntervalMs: POLL_INTERVAL_MS,

338+

});

339+

const operationName = (operation as { name?: unknown }).name;

340+

if (typeof operationName !== "string" || !operationName) {

341+

throw new Error("Google video operation response missing name for polling");

342+

}

343+

operation = await requestGoogleVideoJson({

344+

url: `${params.baseUrl}/${operationName}`,

345+

method: "GET",

346+

headers: params.headers,

347+

deadline: params.deadline,

348+

});

349+

}

350+

const error = (operation as { error?: unknown }).error;

351+

if (error) {

352+

throw new Error(JSON.stringify(error));

353+

}

354+

return operation;

355+

}

356+223357

export function buildGoogleVideoGenerationProvider(): VideoGenerationProvider {

224358

return {

225359

...createGoogleVideoGenerationProviderMetadata(),

@@ -247,7 +381,14 @@ export function buildGoogleVideoGenerationProvider(): VideoGenerationProvider {

247381

const apiKey = auth.apiKey;

248382249383

const configuredBaseUrl = resolveConfiguredGoogleVideoBaseUrl(req);

384+

const restBaseUrl = resolveGoogleVideoRestBaseUrl(configuredBaseUrl);

385+

const authHeaders = parseGeminiAuth(apiKey).headers;

250386

const durationSeconds = resolveDurationSeconds(req.durationSeconds);

387+

const model = normalizeOptionalString(req.model) || DEFAULT_GOOGLE_VIDEO_MODEL;

388+

const aspectRatio = resolveAspectRatio({ aspectRatio: req.aspectRatio, size: req.size });

389+

const resolution = resolveResolution({ resolution: req.resolution, size: req.size });

390+

const hasReferenceInputs =

391+

(req.inputImages?.length ?? 0) > 0 || (req.inputVideos?.length ?? 0) > 0;

251392

const deadline = createProviderOperationDeadline({

252393

timeoutMs: req.timeoutMs,

253394

label: "Google video generation",

@@ -262,37 +403,70 @@ export function buildGoogleVideoGenerationProvider(): VideoGenerationProvider {

262403

}),

263404

},

264405

});

265-

let operation = await client.models.generateVideos({

266-

model: normalizeOptionalString(req.model) || DEFAULT_GOOGLE_VIDEO_MODEL,

267-

prompt: req.prompt,

268-

image: resolveInputImage(req),

269-

video: resolveInputVideo(req),

270-

config: {

271-

...(typeof durationSeconds === "number" ? { durationSeconds } : {}),

272-

...(resolveAspectRatio({ aspectRatio: req.aspectRatio, size: req.size })

273-

? { aspectRatio: resolveAspectRatio({ aspectRatio: req.aspectRatio, size: req.size }) }

274-

: {}),

275-

...(resolveResolution({ resolution: req.resolution, size: req.size })

276-

? { resolution: resolveResolution({ resolution: req.resolution, size: req.size }) }

277-

: {}),

278-

...(req.audio === true ? { generateAudio: true } : {}),

279-

},

280-

});

406+

let usedRestFallback = false;

407+

let operation;

408+

try {

409+

operation = await client.models.generateVideos({

410+

model,

411+

prompt: req.prompt,

412+

image: resolveInputImage(req),

413+

video: resolveInputVideo(req),

414+

config: {

415+

...(typeof durationSeconds === "number" ? { durationSeconds } : {}),

416+

...(aspectRatio ? { aspectRatio } : {}),

417+

...(resolution ? { resolution } : {}),

418+

...(req.audio === true ? { generateAudio: true } : {}),

419+

},

420+

});

421+

} catch (error) {

422+

if (hasReferenceInputs || extractGoogleApiErrorCode(error) !== 404) {

423+

throw error;

424+

}

425+

usedRestFallback = true;

426+

operation = await generateGoogleVideoViaRest({

427+

baseUrl: restBaseUrl,

428+

headers: authHeaders,

429+

deadline,

430+

model,

431+

prompt: req.prompt,

432+

durationSeconds,

433+

aspectRatio,

434+

resolution,

435+

audio: req.audio,

436+

});

437+

}

281438282-

for (let attempt = 0; !(operation.done ?? false); attempt += 1) {

283-

if (attempt >= MAX_POLL_ATTEMPTS) {

284-

throw new Error("Google video generation did not finish in time");

439+

if (!usedRestFallback) {

440+

for (let attempt = 0; !(operation.done ?? false); attempt += 1) {

441+

if (attempt >= MAX_POLL_ATTEMPTS) {

442+

throw new Error("Google video generation did not finish in time");

443+

}

444+

await waitProviderOperationPollInterval({ deadline, pollIntervalMs: POLL_INTERVAL_MS });

445+

resolveProviderOperationTimeoutMs({ deadline, defaultTimeoutMs: DEFAULT_TIMEOUT_MS });

446+

operation = await client.operations.getVideosOperation({ operation });

285447

}

286-

await waitProviderOperationPollInterval({ deadline, pollIntervalMs: POLL_INTERVAL_MS });

287-

resolveProviderOperationTimeoutMs({ deadline, defaultTimeoutMs: DEFAULT_TIMEOUT_MS });

288-

operation = await client.operations.getVideosOperation({ operation });

289448

}

290449

if (operation.error) {

291450

throw new Error(JSON.stringify(operation.error));

292451

}

293-

const generatedVideos = operation.response?.generatedVideos ?? [];

452+

let generatedVideos = extractGeneratedVideos(operation);

453+

if (generatedVideos.length === 0 && !hasReferenceInputs && !usedRestFallback) {

454+

usedRestFallback = true;

455+

operation = await generateGoogleVideoViaRest({

456+

baseUrl: restBaseUrl,

457+

headers: authHeaders,

458+

deadline,

459+

model,

460+

prompt: req.prompt,

461+

durationSeconds,

462+

aspectRatio,

463+

resolution,

464+

audio: req.audio,

465+

});

466+

generatedVideos = extractGeneratedVideos(operation);

467+

}

294468

if (generatedVideos.length === 0) {

295-

throw new Error("Google video generation response missing generated videos");

469+

throw new Error(GOOGLE_VIDEO_EMPTY_RESULT_MESSAGE);

296470

}

297471

const videos = await Promise.all(

298472

generatedVideos.map(async (entry, index) => {

@@ -326,7 +500,7 @@ export function buildGoogleVideoGenerationProvider(): VideoGenerationProvider {

326500

);

327501

return {

328502

videos,

329-

model: normalizeOptionalString(req.model) || DEFAULT_GOOGLE_VIDEO_MODEL,

503+

model,

330504

metadata: operation.name

331505

? {

332506

operationName: operation.name,