Fix text file attachment detection
This commit is contained in:
parent
a7534dc223
commit
9bfaf34518
@ -1,6 +1,22 @@
|
|||||||
|
import path from "node:path";
|
||||||
|
|
||||||
import type { MoltbotConfig } from "../config/config.js";
|
import type { MoltbotConfig } from "../config/config.js";
|
||||||
import type { MsgContext } from "../auto-reply/templating.js";
|
import type { MsgContext } from "../auto-reply/templating.js";
|
||||||
import { finalizeInboundContext } from "../auto-reply/reply/inbound-context.js";
|
import { finalizeInboundContext } from "../auto-reply/reply/inbound-context.js";
|
||||||
|
import { logVerbose, shouldLogVerbose } from "../globals.js";
|
||||||
|
import {
|
||||||
|
DEFAULT_INPUT_FILE_MAX_BYTES,
|
||||||
|
DEFAULT_INPUT_FILE_MAX_CHARS,
|
||||||
|
DEFAULT_INPUT_FILE_MIMES,
|
||||||
|
DEFAULT_INPUT_MAX_REDIRECTS,
|
||||||
|
DEFAULT_INPUT_PDF_MAX_PAGES,
|
||||||
|
DEFAULT_INPUT_PDF_MAX_PIXELS,
|
||||||
|
DEFAULT_INPUT_PDF_MIN_TEXT_CHARS,
|
||||||
|
DEFAULT_INPUT_TIMEOUT_MS,
|
||||||
|
extractFileContentFromSource,
|
||||||
|
normalizeMimeList,
|
||||||
|
normalizeMimeType,
|
||||||
|
} from "../media/input-files.js";
|
||||||
import {
|
import {
|
||||||
extractMediaUserText,
|
extractMediaUserText,
|
||||||
formatAudioTranscripts,
|
formatAudioTranscripts,
|
||||||
@ -14,6 +30,7 @@ import type {
|
|||||||
} from "./types.js";
|
} from "./types.js";
|
||||||
import { runWithConcurrency } from "./concurrency.js";
|
import { runWithConcurrency } from "./concurrency.js";
|
||||||
import { resolveConcurrency } from "./resolve.js";
|
import { resolveConcurrency } from "./resolve.js";
|
||||||
|
import { resolveAttachmentKind } from "./attachments.js";
|
||||||
import {
|
import {
|
||||||
type ActiveMediaModel,
|
type ActiveMediaModel,
|
||||||
buildProviderRegistry,
|
buildProviderRegistry,
|
||||||
@ -28,9 +45,244 @@ export type ApplyMediaUnderstandingResult = {
|
|||||||
appliedImage: boolean;
|
appliedImage: boolean;
|
||||||
appliedAudio: boolean;
|
appliedAudio: boolean;
|
||||||
appliedVideo: boolean;
|
appliedVideo: boolean;
|
||||||
|
appliedFile: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
const CAPABILITY_ORDER: MediaUnderstandingCapability[] = ["image", "audio", "video"];
|
const CAPABILITY_ORDER: MediaUnderstandingCapability[] = ["image", "audio", "video"];
|
||||||
|
const EXTRA_TEXT_MIMES = [
|
||||||
|
"application/xml",
|
||||||
|
"text/xml",
|
||||||
|
"application/x-yaml",
|
||||||
|
"text/yaml",
|
||||||
|
"application/yaml",
|
||||||
|
"application/javascript",
|
||||||
|
"text/javascript",
|
||||||
|
"text/tab-separated-values",
|
||||||
|
];
|
||||||
|
const TEXT_EXT_MIME = new Map<string, string>([
|
||||||
|
[".csv", "text/csv"],
|
||||||
|
[".tsv", "text/tab-separated-values"],
|
||||||
|
[".txt", "text/plain"],
|
||||||
|
[".md", "text/markdown"],
|
||||||
|
[".log", "text/plain"],
|
||||||
|
[".ini", "text/plain"],
|
||||||
|
[".cfg", "text/plain"],
|
||||||
|
[".conf", "text/plain"],
|
||||||
|
[".env", "text/plain"],
|
||||||
|
[".json", "application/json"],
|
||||||
|
[".yaml", "text/yaml"],
|
||||||
|
[".yml", "text/yaml"],
|
||||||
|
[".xml", "application/xml"],
|
||||||
|
]);
|
||||||
|
|
||||||
|
function resolveFileLimits(cfg: MoltbotConfig) {
|
||||||
|
const files = cfg.gateway?.http?.endpoints?.responses?.files;
|
||||||
|
return {
|
||||||
|
allowUrl: files?.allowUrl ?? true,
|
||||||
|
allowedMimes: normalizeMimeList(files?.allowedMimes, DEFAULT_INPUT_FILE_MIMES),
|
||||||
|
maxBytes: files?.maxBytes ?? DEFAULT_INPUT_FILE_MAX_BYTES,
|
||||||
|
maxChars: files?.maxChars ?? DEFAULT_INPUT_FILE_MAX_CHARS,
|
||||||
|
maxRedirects: files?.maxRedirects ?? DEFAULT_INPUT_MAX_REDIRECTS,
|
||||||
|
timeoutMs: files?.timeoutMs ?? DEFAULT_INPUT_TIMEOUT_MS,
|
||||||
|
pdf: {
|
||||||
|
maxPages: files?.pdf?.maxPages ?? DEFAULT_INPUT_PDF_MAX_PAGES,
|
||||||
|
maxPixels: files?.pdf?.maxPixels ?? DEFAULT_INPUT_PDF_MAX_PIXELS,
|
||||||
|
minTextChars: files?.pdf?.minTextChars ?? DEFAULT_INPUT_PDF_MIN_TEXT_CHARS,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function appendFileBlocks(body: string | undefined, blocks: string[]): string {
|
||||||
|
if (!blocks || blocks.length === 0) {
|
||||||
|
return body ?? "";
|
||||||
|
}
|
||||||
|
const base = typeof body === "string" ? body.trim() : "";
|
||||||
|
const suffix = blocks.join("\n\n").trim();
|
||||||
|
if (!base) {
|
||||||
|
return suffix;
|
||||||
|
}
|
||||||
|
return `${base}\n\n${suffix}`.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
function isLikelyUtf16(buffer?: Buffer): boolean {
|
||||||
|
if (!buffer || buffer.length < 2) return false;
|
||||||
|
const b0 = buffer[0];
|
||||||
|
const b1 = buffer[1];
|
||||||
|
if ((b0 === 0xff && b1 === 0xfe) || (b0 === 0xfe && b1 === 0xff)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
const sampleLen = Math.min(buffer.length, 2048);
|
||||||
|
let zeroCount = 0;
|
||||||
|
for (let i = 0; i < sampleLen; i += 1) {
|
||||||
|
if (buffer[i] === 0) zeroCount += 1;
|
||||||
|
}
|
||||||
|
return zeroCount / sampleLen > 0.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
function looksLikeUtf8Text(buffer?: Buffer): boolean {
|
||||||
|
if (!buffer || buffer.length === 0) return false;
|
||||||
|
const sampleLen = Math.min(buffer.length, 4096);
|
||||||
|
let printable = 0;
|
||||||
|
let other = 0;
|
||||||
|
for (let i = 0; i < sampleLen; i += 1) {
|
||||||
|
const byte = buffer[i];
|
||||||
|
if (byte === 0) {
|
||||||
|
other += 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (byte === 9 || byte === 10 || byte === 13 || (byte >= 32 && byte <= 126)) {
|
||||||
|
printable += 1;
|
||||||
|
} else {
|
||||||
|
other += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const total = printable + other;
|
||||||
|
if (total === 0) return false;
|
||||||
|
return printable / total > 0.85;
|
||||||
|
}
|
||||||
|
|
||||||
|
function decodeTextSample(buffer?: Buffer): string {
|
||||||
|
if (!buffer || buffer.length === 0) return "";
|
||||||
|
const sample = buffer.subarray(0, Math.min(buffer.length, 8192));
|
||||||
|
if (isLikelyUtf16(sample)) {
|
||||||
|
const isBigEndian = sample[0] === 0xfe && sample[1] === 0xff;
|
||||||
|
if (isBigEndian) {
|
||||||
|
const swapped = Buffer.alloc(sample.length);
|
||||||
|
for (let i = 0; i + 1 < sample.length; i += 2) {
|
||||||
|
swapped[i] = sample[i + 1];
|
||||||
|
swapped[i + 1] = sample[i];
|
||||||
|
}
|
||||||
|
return new TextDecoder("utf-16le").decode(swapped);
|
||||||
|
}
|
||||||
|
return new TextDecoder("utf-16le").decode(sample);
|
||||||
|
}
|
||||||
|
return new TextDecoder("utf-8").decode(sample);
|
||||||
|
}
|
||||||
|
|
||||||
|
function guessDelimitedMime(text: string): string | undefined {
|
||||||
|
if (!text) return undefined;
|
||||||
|
const line = text.split(/\r?\n/)[0] ?? "";
|
||||||
|
const tabs = (line.match(/\t/g) ?? []).length;
|
||||||
|
const commas = (line.match(/,/g) ?? []).length;
|
||||||
|
if (commas > 0) {
|
||||||
|
return "text/csv";
|
||||||
|
}
|
||||||
|
if (tabs > 0) {
|
||||||
|
return "text/tab-separated-values";
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveTextMimeFromName(name?: string): string | undefined {
|
||||||
|
if (!name) return undefined;
|
||||||
|
const ext = path.extname(name).toLowerCase();
|
||||||
|
return TEXT_EXT_MIME.get(ext);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function extractFileBlocks(params: {
|
||||||
|
attachments: ReturnType<typeof normalizeMediaAttachments>;
|
||||||
|
cache: ReturnType<typeof createMediaAttachmentCache>;
|
||||||
|
limits: ReturnType<typeof resolveFileLimits>;
|
||||||
|
}): Promise<string[]> {
|
||||||
|
const { attachments, cache, limits } = params;
|
||||||
|
if (!attachments || attachments.length === 0) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
const blocks: string[] = [];
|
||||||
|
for (const attachment of attachments) {
|
||||||
|
if (!attachment) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const forcedTextMime = resolveTextMimeFromName(attachment.path ?? attachment.url ?? "");
|
||||||
|
const kind = forcedTextMime ? "document" : resolveAttachmentKind(attachment);
|
||||||
|
if (!forcedTextMime && (kind === "image" || kind === "video")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (!limits.allowUrl && attachment.url && !attachment.path) {
|
||||||
|
if (shouldLogVerbose()) {
|
||||||
|
logVerbose(`media: file attachment skipped (url disabled) index=${attachment.index}`);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let bufferResult: Awaited<ReturnType<typeof cache.getBuffer>>;
|
||||||
|
try {
|
||||||
|
bufferResult = await cache.getBuffer({
|
||||||
|
attachmentIndex: attachment.index,
|
||||||
|
maxBytes: limits.maxBytes,
|
||||||
|
timeoutMs: limits.timeoutMs,
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
if (shouldLogVerbose()) {
|
||||||
|
logVerbose(`media: file attachment skipped (buffer): ${String(err)}`);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const nameHint = bufferResult?.fileName ?? attachment.path ?? attachment.url;
|
||||||
|
const forcedTextMimeResolved = forcedTextMime ?? resolveTextMimeFromName(nameHint ?? "");
|
||||||
|
const textSample = decodeTextSample(bufferResult?.buffer);
|
||||||
|
const textLike = isLikelyUtf16(bufferResult?.buffer) || looksLikeUtf8Text(bufferResult?.buffer);
|
||||||
|
if (!forcedTextMimeResolved && kind === "audio" && !textLike) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const guessedDelimited = textLike ? guessDelimitedMime(textSample) : undefined;
|
||||||
|
const textHint = forcedTextMimeResolved ?? guessedDelimited ?? (textLike ? "text/plain" : undefined);
|
||||||
|
const rawMime = bufferResult?.mime ?? attachment.mime;
|
||||||
|
const mimeType = textHint ?? normalizeMimeType(rawMime);
|
||||||
|
if (!mimeType) {
|
||||||
|
if (shouldLogVerbose()) {
|
||||||
|
logVerbose(`media: file attachment skipped (unknown mime) index=${attachment.index}`);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const allowedMimes = new Set(limits.allowedMimes);
|
||||||
|
for (const extra of EXTRA_TEXT_MIMES) {
|
||||||
|
allowedMimes.add(extra);
|
||||||
|
}
|
||||||
|
if (mimeType.startsWith("text/")) {
|
||||||
|
allowedMimes.add(mimeType);
|
||||||
|
}
|
||||||
|
if (!allowedMimes.has(mimeType)) {
|
||||||
|
if (shouldLogVerbose()) {
|
||||||
|
logVerbose(`media: file attachment skipped (unsupported mime ${mimeType}) index=${attachment.index}`);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let extracted: Awaited<ReturnType<typeof extractFileContentFromSource>>;
|
||||||
|
try {
|
||||||
|
extracted = await extractFileContentFromSource({
|
||||||
|
source: {
|
||||||
|
type: "base64",
|
||||||
|
data: bufferResult.buffer.toString("base64"),
|
||||||
|
mediaType: mimeType,
|
||||||
|
filename: bufferResult.fileName,
|
||||||
|
},
|
||||||
|
limits: {
|
||||||
|
...limits,
|
||||||
|
allowedMimes,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
if (shouldLogVerbose()) {
|
||||||
|
logVerbose(`media: file attachment skipped (extract): ${String(err)}`);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const text = extracted?.text?.trim() ?? "";
|
||||||
|
let blockText = text;
|
||||||
|
if (!blockText) {
|
||||||
|
if (extracted?.images && extracted.images.length > 0) {
|
||||||
|
blockText = "[PDF content rendered to images; images not forwarded to model]";
|
||||||
|
} else {
|
||||||
|
blockText = "[No extractable text]";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const safeName = (bufferResult.fileName ?? `file-${attachment.index + 1}`)
|
||||||
|
.replace(/[\r\n\t]+/g, " ")
|
||||||
|
.trim();
|
||||||
|
blocks.push(`<file name="${safeName}" mime="${mimeType}">\n${blockText}\n</file>`);
|
||||||
|
}
|
||||||
|
return blocks;
|
||||||
|
}
|
||||||
|
|
||||||
export async function applyMediaUnderstanding(params: {
|
export async function applyMediaUnderstanding(params: {
|
||||||
ctx: MsgContext;
|
ctx: MsgContext;
|
||||||
@ -51,6 +303,12 @@ export async function applyMediaUnderstanding(params: {
|
|||||||
const cache = createMediaAttachmentCache(attachments);
|
const cache = createMediaAttachmentCache(attachments);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const fileBlocks = await extractFileBlocks({
|
||||||
|
attachments,
|
||||||
|
cache,
|
||||||
|
limits: resolveFileLimits(cfg),
|
||||||
|
});
|
||||||
|
|
||||||
const tasks = CAPABILITY_ORDER.map((capability) => async () => {
|
const tasks = CAPABILITY_ORDER.map((capability) => async () => {
|
||||||
const config = cfg.tools?.media?.[capability];
|
const config = cfg.tools?.media?.[capability];
|
||||||
return await runCapability({
|
return await runCapability({
|
||||||
@ -99,7 +357,15 @@ export async function applyMediaUnderstanding(params: {
|
|||||||
ctx.RawBody = originalUserText;
|
ctx.RawBody = originalUserText;
|
||||||
}
|
}
|
||||||
ctx.MediaUnderstanding = [...(ctx.MediaUnderstanding ?? []), ...outputs];
|
ctx.MediaUnderstanding = [...(ctx.MediaUnderstanding ?? []), ...outputs];
|
||||||
finalizeInboundContext(ctx, { forceBodyForAgent: true, forceBodyForCommands: true });
|
}
|
||||||
|
if (fileBlocks.length > 0) {
|
||||||
|
ctx.Body = appendFileBlocks(ctx.Body, fileBlocks);
|
||||||
|
}
|
||||||
|
if (outputs.length > 0 || fileBlocks.length > 0) {
|
||||||
|
finalizeInboundContext(ctx, {
|
||||||
|
forceBodyForAgent: true,
|
||||||
|
forceBodyForCommands: outputs.length > 0,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@ -108,6 +374,7 @@ export async function applyMediaUnderstanding(params: {
|
|||||||
appliedImage: outputs.some((output) => output.kind === "image.description"),
|
appliedImage: outputs.some((output) => output.kind === "image.description"),
|
||||||
appliedAudio: outputs.some((output) => output.kind === "audio.transcription"),
|
appliedAudio: outputs.some((output) => output.kind === "audio.transcription"),
|
||||||
appliedVideo: outputs.some((output) => output.kind === "video.description"),
|
appliedVideo: outputs.some((output) => output.kind === "video.description"),
|
||||||
|
appliedFile: fileBlocks.length > 0,
|
||||||
};
|
};
|
||||||
} finally {
|
} finally {
|
||||||
await cache.cleanup();
|
await cache.cleanup();
|
||||||
|
|||||||
@ -310,7 +310,14 @@ export async function resolveMedia(
|
|||||||
fetchImpl,
|
fetchImpl,
|
||||||
filePathHint: file.file_path,
|
filePathHint: file.file_path,
|
||||||
});
|
});
|
||||||
const saved = await saveMediaBuffer(fetched.buffer, fetched.contentType, "inbound", maxBytes);
|
const originalName = fetched.fileName ?? file.file_path;
|
||||||
|
const saved = await saveMediaBuffer(
|
||||||
|
fetched.buffer,
|
||||||
|
fetched.contentType,
|
||||||
|
"inbound",
|
||||||
|
maxBytes,
|
||||||
|
originalName,
|
||||||
|
);
|
||||||
|
|
||||||
// Check sticker cache for existing description
|
// Check sticker cache for existing description
|
||||||
const cached = sticker.file_unique_id ? getCachedSticker(sticker.file_unique_id) : null;
|
const cached = sticker.file_unique_id ? getCachedSticker(sticker.file_unique_id) : null;
|
||||||
@ -377,7 +384,14 @@ export async function resolveMedia(
|
|||||||
fetchImpl,
|
fetchImpl,
|
||||||
filePathHint: file.file_path,
|
filePathHint: file.file_path,
|
||||||
});
|
});
|
||||||
const saved = await saveMediaBuffer(fetched.buffer, fetched.contentType, "inbound", maxBytes);
|
const originalName = fetched.fileName ?? file.file_path;
|
||||||
|
const saved = await saveMediaBuffer(
|
||||||
|
fetched.buffer,
|
||||||
|
fetched.contentType,
|
||||||
|
"inbound",
|
||||||
|
maxBytes,
|
||||||
|
originalName,
|
||||||
|
);
|
||||||
let placeholder = "<media:document>";
|
let placeholder = "<media:document>";
|
||||||
if (msg.photo) placeholder = "<media:image>";
|
if (msg.photo) placeholder = "<media:image>";
|
||||||
else if (msg.video) placeholder = "<media:video>";
|
else if (msg.video) placeholder = "<media:video>";
|
||||||
|
|||||||
@ -40,7 +40,7 @@ export async function downloadTelegramFile(
|
|||||||
filePath: info.file_path,
|
filePath: info.file_path,
|
||||||
});
|
});
|
||||||
// save with inbound subdir
|
// save with inbound subdir
|
||||||
const saved = await saveMediaBuffer(array, mime, "inbound", maxBytes);
|
const saved = await saveMediaBuffer(array, mime, "inbound", maxBytes, info.file_path);
|
||||||
// Ensure extension matches mime if possible
|
// Ensure extension matches mime if possible
|
||||||
if (!saved.contentType && mime) saved.contentType = mime;
|
if (!saved.contentType && mime) saved.contentType = mime;
|
||||||
return saved;
|
return saved;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user