feat(tests): integrate smartagent DualAgentOrchestrator with streaming support
- Update test.invoices.nanonets.ts to use DualAgentOrchestrator for JSON extraction - Enable streaming token callback for real-time progress visibility - Add markdown caching to avoid re-running Nanonets OCR for cached files - Update test.bankstatements.minicpm.ts and test.invoices.minicpm.ts with streaming - Update dependencies to @push.rocks/smartai@0.11.1 and @push.rocks/smartagent@1.2.8
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
/**
|
||||
* Bank statement extraction using MiniCPM-V (visual extraction)
|
||||
*
|
||||
* JSON per-page approach:
|
||||
* JSON per-page approach with streaming output:
|
||||
* 1. Ask for structured JSON of all transactions per page
|
||||
* 2. Consensus: extract twice, compare, retry if mismatch
|
||||
* 2. Single pass extraction (no consensus)
|
||||
*/
|
||||
import { tap, expect } from '@git.zone/tstest/tapbundle';
|
||||
import * as fs from 'fs';
|
||||
@@ -66,11 +66,11 @@ function convertPdfToImages(pdfPath: string): string[] {
|
||||
}
|
||||
|
||||
/**
|
||||
* Query for JSON extraction
|
||||
* Query for JSON extraction with streaming output
|
||||
*/
|
||||
async function queryJson(image: string, queryId: string): Promise<string> {
|
||||
console.log(` [${queryId}] Sending request to ${MODEL}...`);
|
||||
const startTime = Date.now();
|
||||
process.stdout.write(` [${queryId}] `);
|
||||
|
||||
const response = await fetch(`${OLLAMA_URL}/api/chat`, {
|
||||
method: 'POST',
|
||||
@@ -82,25 +82,50 @@ async function queryJson(image: string, queryId: string): Promise<string> {
|
||||
content: JSON_PROMPT,
|
||||
images: [image],
|
||||
}],
|
||||
stream: false,
|
||||
stream: true,
|
||||
options: {
|
||||
num_ctx: 32768,
|
||||
num_predict: 4000,
|
||||
temperature: 0.1,
|
||||
},
|
||||
}),
|
||||
});
|
||||
|
||||
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
||||
|
||||
if (!response.ok) {
|
||||
console.log(` [${queryId}] ERROR: ${response.status} (${elapsed}s)`);
|
||||
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
||||
process.stdout.write(`ERROR: ${response.status} (${elapsed}s)\n`);
|
||||
throw new Error(`Ollama API error: ${response.status}`);
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
const content = (data.message?.content || '').trim();
|
||||
console.log(` [${queryId}] Response received (${elapsed}s, ${content.length} chars)`);
|
||||
return content;
|
||||
let content = '';
|
||||
const reader = response.body!.getReader();
|
||||
const decoder = new TextDecoder();
|
||||
|
||||
try {
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
if (done) break;
|
||||
|
||||
const chunk = decoder.decode(value, { stream: true });
|
||||
for (const line of chunk.split('\n').filter(l => l.trim())) {
|
||||
try {
|
||||
const json = JSON.parse(line);
|
||||
const token = json.message?.content || '';
|
||||
if (token) {
|
||||
process.stdout.write(token);
|
||||
content += token;
|
||||
}
|
||||
} catch {
|
||||
// Ignore parse errors for partial chunks
|
||||
}
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
||||
process.stdout.write(` (${elapsed}s)\n`);
|
||||
}
|
||||
|
||||
return content.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -284,102 +309,29 @@ function parseAmount(value: unknown): number {
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two transaction arrays for consensus
|
||||
*/
|
||||
function transactionArraysMatch(a: ITransaction[], b: ITransaction[]): boolean {
|
||||
if (a.length !== b.length) return false;
|
||||
|
||||
for (let i = 0; i < a.length; i++) {
|
||||
const dateMatch = a[i].date === b[i].date;
|
||||
const amountMatch = Math.abs(a[i].amount - b[i].amount) < 0.01;
|
||||
if (!dateMatch || !amountMatch) return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two transaction arrays and log differences
|
||||
*/
|
||||
function compareAndLogDifferences(txs1: ITransaction[], txs2: ITransaction[], pageNum: number): void {
|
||||
if (txs1.length !== txs2.length) {
|
||||
console.log(` [Page ${pageNum}] Length mismatch: Q1=${txs1.length}, Q2=${txs2.length}`);
|
||||
return;
|
||||
}
|
||||
|
||||
for (let i = 0; i < txs1.length; i++) {
|
||||
const dateMatch = txs1[i].date === txs2[i].date;
|
||||
const amountMatch = Math.abs(txs1[i].amount - txs2[i].amount) < 0.01;
|
||||
|
||||
if (!dateMatch || !amountMatch) {
|
||||
console.log(` [Page ${pageNum}] Tx ${i + 1} differs:`);
|
||||
console.log(` Q1: ${txs1[i].date} | ${txs1[i].amount}`);
|
||||
console.log(` Q2: ${txs2[i].date} | ${txs2[i].amount}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract transactions from a single page with consensus
|
||||
* Extract transactions from a single page (single pass)
|
||||
*/
|
||||
async function extractTransactionsFromPage(image: string, pageNum: number): Promise<ITransaction[]> {
|
||||
const MAX_ATTEMPTS = 5;
|
||||
console.log(`\n ======== Page ${pageNum} ========`);
|
||||
console.log(` [Page ${pageNum}] Starting JSON extraction...`);
|
||||
|
||||
for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
|
||||
console.log(`\n [Page ${pageNum}] --- Attempt ${attempt}/${MAX_ATTEMPTS} ---`);
|
||||
const queryId = `P${pageNum}`;
|
||||
const response = await queryJson(image, queryId);
|
||||
const transactions = parseJsonResponse(response, queryId);
|
||||
|
||||
// Extract twice in parallel
|
||||
const q1Id = `P${pageNum}A${attempt}Q1`;
|
||||
const q2Id = `P${pageNum}A${attempt}Q2`;
|
||||
|
||||
const [response1, response2] = await Promise.all([
|
||||
queryJson(image, q1Id),
|
||||
queryJson(image, q2Id),
|
||||
]);
|
||||
|
||||
const txs1 = parseJsonResponse(response1, q1Id);
|
||||
const txs2 = parseJsonResponse(response2, q2Id);
|
||||
|
||||
console.log(` [Page ${pageNum}] Results: Q1=${txs1.length} txs, Q2=${txs2.length} txs`);
|
||||
|
||||
if (txs1.length > 0 && transactionArraysMatch(txs1, txs2)) {
|
||||
console.log(` [Page ${pageNum}] ✓ CONSENSUS REACHED: ${txs1.length} transactions`);
|
||||
console.log(` [Page ${pageNum}] Transactions:`);
|
||||
for (let i = 0; i < txs1.length; i++) {
|
||||
const tx = txs1[i];
|
||||
console.log(` ${(i + 1).toString().padStart(2)}. ${tx.date} | ${tx.counterparty.substring(0, 30).padEnd(30)} | ${tx.amount >= 0 ? '+' : ''}${tx.amount.toFixed(2)}`);
|
||||
}
|
||||
return txs1;
|
||||
}
|
||||
|
||||
console.log(` [Page ${pageNum}] ✗ NO CONSENSUS`);
|
||||
compareAndLogDifferences(txs1, txs2, pageNum);
|
||||
|
||||
if (attempt < MAX_ATTEMPTS) {
|
||||
console.log(` [Page ${pageNum}] Retrying...`);
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: use last response
|
||||
console.log(`\n [Page ${pageNum}] === FALLBACK (no consensus after ${MAX_ATTEMPTS} attempts) ===`);
|
||||
const fallbackId = `P${pageNum}FALLBACK`;
|
||||
const fallbackResponse = await queryJson(image, fallbackId);
|
||||
const fallback = parseJsonResponse(fallbackResponse, fallbackId);
|
||||
console.log(` [Page ${pageNum}] ~ FALLBACK RESULT: ${fallback.length} transactions`);
|
||||
for (let i = 0; i < fallback.length; i++) {
|
||||
const tx = fallback[i];
|
||||
console.log(` [Page ${pageNum}] Extracted ${transactions.length} transactions:`);
|
||||
for (let i = 0; i < transactions.length; i++) {
|
||||
const tx = transactions[i];
|
||||
console.log(` ${(i + 1).toString().padStart(2)}. ${tx.date} | ${tx.counterparty.substring(0, 30).padEnd(30)} | ${tx.amount >= 0 ? '+' : ''}${tx.amount.toFixed(2)}`);
|
||||
}
|
||||
return fallback;
|
||||
|
||||
return transactions;
|
||||
}
|
||||
|
||||
/**
|
||||
* Extract all transactions from bank statement
|
||||
*/
|
||||
async function extractTransactions(images: string[]): Promise<ITransaction[]> {
|
||||
console.log(` [Vision] Processing ${images.length} page(s) with ${MODEL} (JSON consensus)`);
|
||||
console.log(` [Vision] Processing ${images.length} page(s) with ${MODEL} (single pass)`);
|
||||
|
||||
const allTransactions: ITransaction[] = [];
|
||||
|
||||
@@ -527,7 +479,7 @@ tap.test('summary', async () => {
|
||||
console.log(`\n======================================================`);
|
||||
console.log(` Bank Statement Summary (${MODEL})`);
|
||||
console.log(`======================================================`);
|
||||
console.log(` Method: JSON per-page + consensus`);
|
||||
console.log(` Method: JSON per-page (single pass)`);
|
||||
console.log(` Passed: ${passedCount}/${total}`);
|
||||
console.log(` Failed: ${failedCount}/${total}`);
|
||||
console.log(`======================================================\n`);
|
||||
|
||||
Reference in New Issue
Block a user