mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-24 11:25:50 -06:00
bdcc5d54a5
* fix(agents): honor run abort signal in image and pdf tools
The image and pdf agent tools declared `execute: async (_toolCallId, args)`
and dropped the run abort signal that `wrapToolWithAbortSignal` supplies as
the third execute argument. The wrapper only races the execute promise, so an
aborted run kept sequentially downloading images/PDFs (up to the per-tool cap,
each up to the byte cap) and still issued a paid vision/PDF-model call for a
dead run.
Thread the signal into the existing `requestInit: { signal }` seam (which the
media fetch layer already merges into the download fetch) and add
`signal.throwIfAborted()` between sequential loop items and before the paid
model call. No new media-options signal field; non-abort behavior is unchanged.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(agents): keep the pdf test suite under the lint ceiling; guard model dispatch
Follow-up on the abort-signal change, resolving the check-lint failure and a
review finding on the same seam.
max-lines
---------
Adding the two pdf abort tests pushed src/agents/tools/pdf-tool.test.ts to 1018
effective lines against a ceiling of 1000, failing check-lint. Resolved without
touching config/max-lines-baseline.txt — a suppression there would also have
tripped the max-lines ratchet.
- The new tests declared their own `describe` with `beforeEach`/`afterEach`
hooks identical to the existing `describe("createPdfTool")`. They exercise
that same tool, so they now live in it and the duplicated scaffolding is gone.
- `stubPdfToolInfra`, `createPdfModelRegistry` and `FAKE_PDF_MEDIA` moved to
pdf-tool.test-support.ts, which already exists for exactly this. They go
through `createPdfToolInfraStub(completeMock)` rather than being exported
directly, because the stub wires the suite's own `complete` mock into the
model registry and vi.mock handles are file-scoped. All 21 existing call
sites are unchanged.
Abort propagation into model dispatch
-------------------------------------
The previous revision stopped cancellation at download boundaries and before
the first model call, but `runImagePrompt`/`runPdfPrompt` never saw the signal.
A run cancelled while the first provider request was in flight could still
issue the remaining ones — the image path dispatches `describeImage` once per
image in a sequential loop, so a dead run kept paying for every later image.
Both now take an optional `signal` and check it immediately before each
provider dispatch (3 sites in image-tool, 4 in pdf-tool).
Forwarding the signal further, into the provider transports themselves, is a
different seam and is deliberately left out of this PR.
Also declares `requestInit` on `ImageToolLoadWebMediaOptions`. The local facade
omitted it while the underlying loader accepts it (web-media.ts declares it and
forwards it to readRemoteMediaBuffer), so the option worked at runtime and only
compiled because spread properties skip excess-property checking. A non-spread
call site would not have.
tsgo core + core-test, oxlint, oxfmt clean; pdf-tool and image-tool suites 266
tests pass.
* test(agents): prove in-flight media aborts
* test(agents): narrow PDF loader options
* test(agents): reject abort mocks with errors
* fix(agents): propagate media cancellation
* test(agents): type PDF abort fixture
* test(agents): type prepared runtime snapshot
* fix(agents): normalize abort rejection errors
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Peter Steinberger <steipete@gmail.com>
167 lines
4.9 KiB
TypeScript
167 lines
4.9 KiB
TypeScript
// Google provider module implements model/runtime integration.
|
|
import {
|
|
describeImageWithModel,
|
|
describeImagesWithModel,
|
|
type AudioTranscriptionRequest,
|
|
type AudioTranscriptionResult,
|
|
type MediaUnderstandingProvider,
|
|
type VideoDescriptionRequest,
|
|
type VideoDescriptionResult,
|
|
} from "openclaw/plugin-sdk/media-understanding";
|
|
import {
|
|
assertOkOrThrowProviderError,
|
|
postJsonRequest,
|
|
readProviderJsonResponse,
|
|
type ProviderRequestTransportOverrides,
|
|
} from "openclaw/plugin-sdk/provider-http";
|
|
import {
|
|
DEFAULT_GOOGLE_API_BASE_URL,
|
|
normalizeGoogleModelId,
|
|
resolveGoogleGenerativeAiHttpRequestConfig,
|
|
} from "./runtime-api.js";
|
|
|
|
const DEFAULT_GOOGLE_AUDIO_MODEL = "gemini-3-flash-preview";
|
|
const DEFAULT_GOOGLE_VIDEO_MODEL = "gemini-3-flash-preview";
|
|
const DEFAULT_GOOGLE_AUDIO_PROMPT = "Transcribe the audio.";
|
|
const DEFAULT_GOOGLE_VIDEO_PROMPT = "Describe the video.";
|
|
|
|
async function generateGeminiInlineDataText(params: {
|
|
buffer: Buffer;
|
|
mime?: string;
|
|
apiKey: string;
|
|
baseUrl?: string;
|
|
headers?: Record<string, string>;
|
|
request?: ProviderRequestTransportOverrides;
|
|
model?: string;
|
|
prompt?: string;
|
|
timeoutMs: number;
|
|
signal?: AbortSignal;
|
|
fetchFn?: typeof fetch;
|
|
defaultBaseUrl: string;
|
|
defaultModel: string;
|
|
defaultPrompt: string;
|
|
defaultMime: string;
|
|
httpErrorLabel: string;
|
|
missingTextError: string;
|
|
}): Promise<{ text: string; model: string }> {
|
|
const fetchFn = params.fetchFn ?? fetch;
|
|
const model = (() => {
|
|
const trimmed = params.model?.trim();
|
|
if (!trimmed) {
|
|
return params.defaultModel;
|
|
}
|
|
return normalizeGoogleModelId(trimmed);
|
|
})();
|
|
const { baseUrl, allowPrivateNetwork, headers, dispatcherPolicy } =
|
|
resolveGoogleGenerativeAiHttpRequestConfig({
|
|
apiKey: params.apiKey,
|
|
baseUrl: params.baseUrl,
|
|
headers: params.headers,
|
|
request: params.request,
|
|
capability: params.defaultMime.startsWith("audio/") ? "audio" : "video",
|
|
transport: "media-understanding",
|
|
});
|
|
const resolvedBaseUrl = baseUrl ?? params.defaultBaseUrl;
|
|
const url = `${resolvedBaseUrl}/models/${model}:generateContent`;
|
|
|
|
const prompt = (() => {
|
|
const trimmed = params.prompt?.trim();
|
|
return trimmed || params.defaultPrompt;
|
|
})();
|
|
|
|
const body = {
|
|
contents: [
|
|
{
|
|
role: "user",
|
|
parts: [
|
|
{ text: prompt },
|
|
{
|
|
inline_data: {
|
|
mime_type: params.mime ?? params.defaultMime,
|
|
data: params.buffer.toString("base64"),
|
|
},
|
|
},
|
|
],
|
|
},
|
|
],
|
|
};
|
|
|
|
const { response: res, release } = await postJsonRequest({
|
|
url,
|
|
headers,
|
|
body,
|
|
timeoutMs: params.timeoutMs,
|
|
...(params.signal ? { signal: params.signal } : {}),
|
|
fetchFn,
|
|
allowPrivateNetwork,
|
|
dispatcherPolicy,
|
|
});
|
|
|
|
try {
|
|
await assertOkOrThrowProviderError(res, params.httpErrorLabel);
|
|
|
|
const payload = await readProviderJsonResponse<{
|
|
candidates?: Array<{
|
|
content?: { parts?: Array<{ text?: string }> };
|
|
}>;
|
|
}>(res, params.httpErrorLabel);
|
|
const parts = payload.candidates?.[0]?.content?.parts ?? [];
|
|
const text = parts
|
|
.map((part) => part?.text?.trim())
|
|
.filter(Boolean)
|
|
.join("\n");
|
|
if (!text) {
|
|
throw new Error(params.missingTextError);
|
|
}
|
|
return { text, model };
|
|
} finally {
|
|
await release();
|
|
}
|
|
}
|
|
|
|
export async function transcribeGeminiAudio(
|
|
params: AudioTranscriptionRequest,
|
|
): Promise<AudioTranscriptionResult> {
|
|
const { text, model } = await generateGeminiInlineDataText({
|
|
...params,
|
|
defaultBaseUrl: DEFAULT_GOOGLE_API_BASE_URL,
|
|
defaultModel: DEFAULT_GOOGLE_AUDIO_MODEL,
|
|
defaultPrompt: DEFAULT_GOOGLE_AUDIO_PROMPT,
|
|
defaultMime: "audio/wav",
|
|
httpErrorLabel: "Audio transcription failed",
|
|
missingTextError: "Audio transcription response missing text",
|
|
});
|
|
return { text, model };
|
|
}
|
|
|
|
export async function describeGeminiVideo(
|
|
params: VideoDescriptionRequest,
|
|
): Promise<VideoDescriptionResult> {
|
|
const { text, model } = await generateGeminiInlineDataText({
|
|
...params,
|
|
defaultBaseUrl: DEFAULT_GOOGLE_API_BASE_URL,
|
|
defaultModel: DEFAULT_GOOGLE_VIDEO_MODEL,
|
|
defaultPrompt: DEFAULT_GOOGLE_VIDEO_PROMPT,
|
|
defaultMime: "video/mp4",
|
|
httpErrorLabel: "Video description failed",
|
|
missingTextError: "Video description response missing text",
|
|
});
|
|
return { text, model };
|
|
}
|
|
|
|
export const googleMediaUnderstandingProvider: MediaUnderstandingProvider = {
|
|
id: "google",
|
|
capabilities: ["image", "audio", "video"],
|
|
defaultModels: {
|
|
image: DEFAULT_GOOGLE_VIDEO_MODEL,
|
|
audio: DEFAULT_GOOGLE_AUDIO_MODEL,
|
|
video: DEFAULT_GOOGLE_VIDEO_MODEL,
|
|
},
|
|
autoPriority: { image: 30, audio: 40, video: 10 },
|
|
nativeDocumentInputs: ["pdf"],
|
|
describeImage: describeImageWithModel,
|
|
describeImages: describeImagesWithModel,
|
|
transcribeAudio: transcribeGeminiAudio,
|
|
describeVideo: describeGeminiVideo,
|
|
};
|