github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-19 11:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(media-understanding): share gemini output extract

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-14 14:30:09 +00:00
parent 747b11c83e
commit 3e2f0ca077
3 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/media-understanding/output-extract.ts Normal file
View File

@@ -0,0 +1,26 @@
export function extractLastJsonObject(raw: string): unknown {
const trimmed = raw.trim();
const start = trimmed.lastIndexOf("{");
if (start === -1) {
return null;
}
const slice = trimmed.slice(start);
try {
return JSON.parse(slice);
} catch {
return null;
}
}
export function extractGeminiResponse(raw: string): string | null {
const payload = extractLastJsonObject(raw);
if (!payload || typeof payload !== "object") {
return null;
}
const response = (payload as { response?: unknown }).response;
if (typeof response !== "string") {
return null;
}
const trimmed = response.trim();
return trimmed || null;
}

28
src/media-understanding/runner.entries.ts
View File

@@ -25,6 +25,7 @@ import {
DEFAULT_TIMEOUT_SECONDS, DEFAULT_TIMEOUT_SECONDS,
} from "./defaults.js"; } from "./defaults.js";
import { MediaUnderstandingSkipError } from "./errors.js"; import { MediaUnderstandingSkipError } from "./errors.js";
import { extractGeminiResponse } from "./output-extract.js";
import { describeImageWithModel } from "./providers/image.js"; import { describeImageWithModel } from "./providers/image.js";
import { getMediaUnderstandingProvider, normalizeMediaProviderId } from "./providers/index.js"; import { getMediaUnderstandingProvider, normalizeMediaProviderId } from "./providers/index.js";
import { resolveMaxBytes, resolveMaxChars, resolvePrompt, resolveTimeoutMs } from "./resolve.js"; import { resolveMaxBytes, resolveMaxChars, resolvePrompt, resolveTimeoutMs } from "./resolve.js";
@@ -40,33 +41,6 @@ function trimOutput(text: string, maxChars?: number): string {
return trimmed.slice(0, maxChars).trim(); return trimmed.slice(0, maxChars).trim();
} }
function extractLastJsonObject(raw: string): unknown {
const trimmed = raw.trim();
const start = trimmed.lastIndexOf("{");
if (start === -1) {
return null;
}
const slice = trimmed.slice(start);
try {
return JSON.parse(slice);
} catch {
return null;
}
}
function extractGeminiResponse(raw: string): string | null {
const payload = extractLastJsonObject(raw);
if (!payload || typeof payload !== "object") {
return null;
}
const response = (payload as { response?: unknown }).response;
if (typeof response !== "string") {
return null;
}
const trimmed = response.trim();
return trimmed || null;
}
function extractSherpaOnnxText(raw: string): string | null { function extractSherpaOnnxText(raw: string): string | null {
const tryParse = (value: string): string | null => { const tryParse = (value: string): string | null => {
const trimmed = value.trim(); const trimmed = value.trim();

28
src/media-understanding/runner.ts
View File

@@ -32,6 +32,7 @@ import {
DEFAULT_IMAGE_MODELS, DEFAULT_IMAGE_MODELS,
} from "./defaults.js"; } from "./defaults.js";
import { isMediaUnderstandingSkipError } from "./errors.js"; import { isMediaUnderstandingSkipError } from "./errors.js";
import { extractGeminiResponse } from "./output-extract.js";
import { import {
buildMediaUnderstandingRegistry, buildMediaUnderstandingRegistry,
getMediaUnderstandingProvider, getMediaUnderstandingProvider,
@@ -186,33 +187,6 @@ async function fileExists(filePath?: string | null): Promise<boolean> {
} }
} }
function extractLastJsonObject(raw: string): unknown {
const trimmed = raw.trim();
const start = trimmed.lastIndexOf("{");
if (start === -1) {
return null;
}
const slice = trimmed.slice(start);
try {
return JSON.parse(slice);
} catch {
return null;
}
}
function extractGeminiResponse(raw: string): string | null {
const payload = extractLastJsonObject(raw);
if (!payload || typeof payload !== "object") {
return null;
}
const response = (payload as { response?: unknown }).response;
if (typeof response !== "string") {
return null;
}
const trimmed = response.trim();
return trimmed || null;
}
async function probeGeminiCli(): Promise<boolean> { async function probeGeminiCli(): Promise<boolean> {
const cached = geminiProbeCache.get("gemini"); const cached = geminiProbeCache.get("gemini");
if (cached) { if (cached) {