v1.11.0

Dockerfile_qwen3vl

@@ -0,0 +1,26 @@
+# Qwen3-VL-30B-A3B Vision Language Model
+# Q4_K_M quantization (~20GB model)
+#
+# Most powerful Qwen vision model:
+# - 256K context (expandable to 1M)
+# - Visual agent capabilities
+# - Code generation from images
+#
+# Build: docker build -f Dockerfile_qwen3vl -t qwen3vl .
+# Run:   docker run --gpus all -p 11434:11434 -v ht-ollama-models:/root/.ollama qwen3vl
+
+FROM ollama/ollama:latest
+
+# Pre-pull the model during build (optional - can also pull at runtime)
+# This makes the image larger but faster to start
+# RUN ollama serve & sleep 5 && ollama pull qwen3-vl:30b-a3b && pkill ollama
+
+# Expose Ollama API port
+EXPOSE 11434
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
+  CMD curl -f http://localhost:11434/api/tags || exit 1
+
+# Start Ollama server
+CMD ["serve"]

changelog.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## 2026-01-18 - 1.11.0 - feat(vision)
+process pages separately and make Qwen3-VL vision extraction more robust; add per-page parsing, safer JSON handling, reduced token usage, and multi-query invoice extraction
+
+- Bank statements: split extraction into extractTransactionsFromPage and sequentially process pages to avoid thinking-token exhaustion
+- Bank statements: reduced num_predict from 8000 to 4000, send single image per request, added per-page logging and non-throwing handling for empty or non-JSON responses
+- Bank statements: catch JSON.parse errors and return empty array instead of throwing
+- Invoices: introduced queryField to request single values and perform multiple simple queries (reduces model thinking usage)
+- Invoices: reduced num_predict for invoice queries from 4000 to 500 and parse amounts robustly (handles European formats like 1.234,56)
+- Invoices: normalize currency to uppercase 3-letter code, return safe defaults (empty strings / 0) instead of nulls, and parse net/vat/total with fallbacks
+- General: simplified Ollama API error messages to avoid including response body content in thrown errors
+
+## 2026-01-18 - 1.10.1 - fix(tests)
+improve Qwen3-VL invoice extraction test by switching to non-stream API, adding model availability/pull checks, simplifying response parsing, and tightening model options
+
+- Replaced streaming reader logic with direct JSON parsing of the /api/chat response
+- Added ensureQwen3Vl() to check and pull the Qwen3-VL:8b model from Ollama
+- Switched to ensureMiniCpm() to verify Ollama service is running before model checks
+- Use /no_think prompt for direct JSON output and set temperature to 0.0 and num_predict to 512
+- Removed retry loop and streaming parsing; improved error messages to include response body
+- Updated logging and test setup messages for clarity
+
+## 2026-01-18 - 1.10.0 - feat(vision)
+add Qwen3-VL vision model support with Dockerfile and tests; improve invoice OCR conversion and prompts; simplify extraction flow by removing consensus voting
+
+- Add Dockerfile_qwen3vl to provide an Ollama-based image for Qwen3-VL and expose the Ollama API on port 11434
+- Introduce test/test.invoices.qwen3vl.ts and ensureQwen3Vl() helper to pull and test qwen3-vl:8b
+- Improve PDF->PNG conversion and prompt in ministral3 tests (higher DPI, max quality, sharpen) and increase num_predict from 512 to 1024
+- Simplify extraction pipeline: remove consensus voting, log single-pass results, and simplify OCR HTML sanitization/truncation logic
+
+## 2026-01-18 - 1.9.0 - feat(tests)
+add Ministral 3 vision tests and improve invoice extraction pipeline to use Ollama chat schema, sanitization, and multi-page support
+
+- Add new vision-based test suites for Ministral 3: test/test.invoices.ministral3.ts and test/test.bankstatements.ministral3.ts (model ministral-3:8b).
+- Introduce ensureMinistral3() helper to start/check Ollama/MiniCPM model in test/helpers/docker.ts.
+- Switch invoice extraction to use Ollama /api/chat with a JSON schema (format) and streaming support (reads message.content).
+- Improve HTML handling: sanitizeHtml() to remove OCR artifacts, concatenate multi-page HTML with page markers, and increase truncation limits.
+- Enhance response parsing: strip Markdown code fences, robustly locate JSON object boundaries, and provide clearer JSON parse errors.
+- Add PDF->PNG conversion (ImageMagick) and direct image-based extraction flow for vision model tests.
+
 ## 2026-01-18 - 1.8.0 - feat(paddleocr-vl)
 add structured HTML output and table parsing for PaddleOCR-VL, update API, tests, and README
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@host.today/ht-docker-ai",
-  "version": "1.8.0",
+  "version": "1.11.0",
   "type": "module",
   "private": false,
   "description": "Docker images for AI vision-language models including MiniCPM-V 4.5",

test/helpers/docker.ts

@@ -311,9 +311,8 @@ export async function ensureOllamaModel(modelName: string): Promise<boolean> {
     if (response.ok) {
       const data = await response.json();
       const models = data.models || [];
-      const exists = models.some((m: { name: string }) =>
+      // Exact match required - don't match on prefix
-        m.name === modelName || m.name.startsWith(modelName.split(':')[0])
+      const exists = models.some((m: { name: string }) => m.name === modelName);
-      );
 
       if (exists) {
         console.log(`[Ollama] Model already available: ${modelName}`);
@@ -358,3 +357,29 @@ export async function ensureQwen25(): Promise<boolean> {
   // Then ensure the Qwen2.5 model is pulled
   return ensureOllamaModel('qwen2.5:7b');
 }
+
+/**
+ * Ensure Ministral 3 8B model is available (for structured JSON extraction)
+ * Ministral 3 has native JSON output support and OCR-style document extraction
+ */
+export async function ensureMinistral3(): Promise<boolean> {
+  // First ensure the Ollama service (MiniCPM container) is running
+  const ollamaOk = await ensureMiniCpm();
+  if (!ollamaOk) return false;
+
+  // Then ensure the Ministral 3 8B model is pulled
+  return ensureOllamaModel('ministral-3:8b');
+}
+
+/**
+ * Ensure Qwen3-VL 8B model is available (vision-language model)
+ * Q4_K_M quantization (~5GB) - fits in 15GB VRAM with room to spare
+ */
+export async function ensureQwen3Vl(): Promise<boolean> {
+  // First ensure the Ollama service is running
+  const ollamaOk = await ensureMiniCpm();
+  if (!ollamaOk) return false;
+
+  // Then ensure Qwen3-VL 8B is pulled
+  return ensureOllamaModel('qwen3-vl:8b');
+}

test/test.bankstatements.ministral3.ts

@@ -0,0 +1,348 @@
+/**
+ * Bank Statement extraction using Ministral 3 Vision (Direct)
+ *
+ * NO OCR pipeline needed - Ministral 3 has built-in vision encoder:
+ *   1. Convert PDF to images
+ *   2. Send images directly to Ministral 3 via Ollama
+ *   3. Extract transactions as structured JSON
+ */
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as os from 'os';
+import { ensureMinistral3 } from './helpers/docker.js';
+
+const OLLAMA_URL = 'http://localhost:11434';
+const VISION_MODEL = 'ministral-3:8b';
+
+interface ITransaction {
+  date: string;
+  counterparty: string;
+  amount: number;
+}
+
+/**
+ * Convert PDF to PNG images using ImageMagick
+ */
+function convertPdfToImages(pdfPath: string): string[] {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pdf-convert-'));
+  const outputPattern = path.join(tempDir, 'page-%d.png');
+
+  try {
+    execSync(
+      `convert -density 200 -quality 90 "${pdfPath}" -background white -alpha remove "${outputPattern}"`,
+      { stdio: 'pipe' }
+    );
+
+    const files = fs.readdirSync(tempDir).filter((f) => f.endsWith('.png')).sort();
+    const images: string[] = [];
+
+    for (const file of files) {
+      const imagePath = path.join(tempDir, file);
+      const imageData = fs.readFileSync(imagePath);
+      images.push(imageData.toString('base64'));
+    }
+
+    return images;
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+/**
+ * Extract transactions from a single page image using Ministral 3 Vision
+ */
+async function extractTransactionsFromPage(image: string, pageNum: number): Promise<ITransaction[]> {
+  console.log(`    [Vision] Processing page ${pageNum}`);
+
+  // JSON schema for array of transactions
+  const transactionSchema = {
+    type: 'array',
+    items: {
+      type: 'object',
+      properties: {
+        date: { type: 'string', description: 'Transaction date in YYYY-MM-DD format' },
+        counterparty: { type: 'string', description: 'Name of the other party' },
+        amount: { type: 'number', description: 'Amount (negative for debits, positive for credits)' },
+      },
+      required: ['date', 'counterparty', 'amount'],
+    },
+  };
+
+  const prompt = `Extract ALL bank transactions from this bank statement page.
+
+For each transaction, extract:
+- date: Transaction date in YYYY-MM-DD format
+- counterparty: The name/description of the other party (merchant, payee, etc.)
+- amount: The amount as a number (NEGATIVE for debits/expenses, POSITIVE for credits/income)
+
+Return a JSON array of transactions. If no transactions visible, return empty array [].
+Example: [{"date":"2021-06-01","counterparty":"AMAZON","amount":-50.00}]`;
+
+  const response = await fetch(`${OLLAMA_URL}/api/chat`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      model: VISION_MODEL,
+      messages: [
+        {
+          role: 'user',
+          content: prompt,
+          images: [image],
+        },
+      ],
+      format: transactionSchema,
+      stream: true,
+      options: {
+        num_predict: 4096,  // Bank statements can have many transactions
+        temperature: 0.0,
+      },
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`Ollama API error: ${response.status}`);
+  }
+
+  const reader = response.body?.getReader();
+  if (!reader) {
+    throw new Error('No response body');
+  }
+
+  const decoder = new TextDecoder();
+  let fullText = '';
+
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+
+    const chunk = decoder.decode(value, { stream: true });
+    const lines = chunk.split('\n').filter((l) => l.trim());
+
+    for (const line of lines) {
+      try {
+        const json = JSON.parse(line);
+        if (json.message?.content) {
+          fullText += json.message.content;
+        }
+      } catch {
+        // Skip invalid JSON lines
+      }
+    }
+  }
+
+  // Parse JSON response
+  let jsonStr = fullText.trim();
+
+  if (jsonStr.startsWith('```json')) jsonStr = jsonStr.slice(7);
+  else if (jsonStr.startsWith('```')) jsonStr = jsonStr.slice(3);
+  if (jsonStr.endsWith('```')) jsonStr = jsonStr.slice(0, -3);
+  jsonStr = jsonStr.trim();
+
+  // Find array boundaries
+  const startIdx = jsonStr.indexOf('[');
+  const endIdx = jsonStr.lastIndexOf(']') + 1;
+
+  if (startIdx < 0 || endIdx <= startIdx) {
+    console.log(`    [Page ${pageNum}] No transactions found`);
+    return [];
+  }
+
+  try {
+    const parsed = JSON.parse(jsonStr.substring(startIdx, endIdx));
+    console.log(`    [Page ${pageNum}] Found ${parsed.length} transactions`);
+    return parsed.map((t: { date?: string; counterparty?: string; amount?: number }) => ({
+      date: t.date || '',
+      counterparty: t.counterparty || '',
+      amount: parseFloat(String(t.amount)) || 0,
+    }));
+  } catch (e) {
+    console.log(`    [Page ${pageNum}] Parse error: ${e}`);
+    return [];
+  }
+}
+
+/**
+ * Extract all transactions from all pages
+ */
+async function extractAllTransactions(images: string[]): Promise<ITransaction[]> {
+  const allTransactions: ITransaction[] = [];
+
+  for (let i = 0; i < images.length; i++) {
+    const pageTransactions = await extractTransactionsFromPage(images[i], i + 1);
+    allTransactions.push(...pageTransactions);
+  }
+
+  return allTransactions;
+}
+
+/**
+ * Normalize date to YYYY-MM-DD
+ */
+function normalizeDate(dateStr: string): string {
+  if (!dateStr) return '';
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr;
+
+  // Handle DD/MM/YYYY or DD.MM.YYYY
+  const match = dateStr.match(/^(\d{1,2})[\/.](\d{1,2})[\/.](\d{4})$/);
+  if (match) {
+    return `${match[3]}-${match[2].padStart(2, '0')}-${match[1].padStart(2, '0')}`;
+  }
+
+  return dateStr;
+}
+
+/**
+ * Compare extracted transactions vs expected
+ */
+function compareTransactions(
+  extracted: ITransaction[],
+  expected: ITransaction[]
+): { matchRate: number; matched: number; missed: number; extra: number; errors: string[] } {
+  const errors: string[] = [];
+  let matched = 0;
+
+  // Normalize all dates
+  const normalizedExtracted = extracted.map((t) => ({
+    ...t,
+    date: normalizeDate(t.date),
+    counterparty: t.counterparty.toUpperCase().trim(),
+  }));
+
+  const normalizedExpected = expected.map((t) => ({
+    ...t,
+    date: normalizeDate(t.date),
+    counterparty: t.counterparty.toUpperCase().trim(),
+  }));
+
+  // Try to match each expected transaction
+  const matchedIndices = new Set<number>();
+
+  for (const exp of normalizedExpected) {
+    let found = false;
+
+    for (let i = 0; i < normalizedExtracted.length; i++) {
+      if (matchedIndices.has(i)) continue;
+
+      const ext = normalizedExtracted[i];
+
+      // Match by date + amount (counterparty names can vary)
+      if (ext.date === exp.date && Math.abs(ext.amount - exp.amount) < 0.02) {
+        matched++;
+        matchedIndices.add(i);
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      errors.push(`Missing: ${exp.date} | ${exp.counterparty} | ${exp.amount}`);
+    }
+  }
+
+  const missed = expected.length - matched;
+  const extra = extracted.length - matched;
+  const matchRate = expected.length > 0 ? (matched / expected.length) * 100 : 0;
+
+  return { matchRate, matched, missed, extra, errors };
+}
+
+/**
+ * Find test cases (PDF + JSON pairs in .nogit/)
+ */
+function findTestCases(): Array<{ name: string; pdfPath: string; jsonPath: string }> {
+  const testDir = path.join(process.cwd(), '.nogit');
+  if (!fs.existsSync(testDir)) return [];
+
+  const files = fs.readdirSync(testDir);
+  const testCases: Array<{ name: string; pdfPath: string; jsonPath: string }> = [];
+
+  for (const pdf of files.filter((f) => f.endsWith('.pdf'))) {
+    const baseName = pdf.replace('.pdf', '');
+    const jsonFile = `${baseName}.json`;
+    if (files.includes(jsonFile)) {
+      // Skip invoice files - only bank statements
+      if (!baseName.includes('invoice')) {
+        testCases.push({
+          name: baseName,
+          pdfPath: path.join(testDir, pdf),
+          jsonPath: path.join(testDir, jsonFile),
+        });
+      }
+    }
+  }
+
+  return testCases.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+// Tests
+
+tap.test('setup: ensure Ministral 3 is running', async () => {
+  console.log('\n[Setup] Checking Ministral 3...\n');
+  const ok = await ensureMinistral3();
+  expect(ok).toBeTrue();
+  console.log('\n[Setup] Ready!\n');
+});
+
+const testCases = findTestCases();
+console.log(`\nFound ${testCases.length} bank statement test cases (Ministral 3 Vision)\n`);
+
+let totalMatched = 0;
+let totalExpected = 0;
+const times: number[] = [];
+
+for (const testCase of testCases) {
+  tap.test(`should extract bank statement: ${testCase.name}`, async () => {
+    const expected: ITransaction[] = JSON.parse(fs.readFileSync(testCase.jsonPath, 'utf-8'));
+    console.log(`\n=== ${testCase.name} ===`);
+    console.log(`Expected: ${expected.length} transactions`);
+
+    const start = Date.now();
+    const images = convertPdfToImages(testCase.pdfPath);
+    console.log(`  Pages: ${images.length}`);
+
+    const extracted = await extractAllTransactions(images);
+    const elapsed = Date.now() - start;
+    times.push(elapsed);
+
+    console.log(`  Extracted: ${extracted.length} transactions`);
+
+    const result = compareTransactions(extracted, expected);
+    totalMatched += result.matched;
+    totalExpected += expected.length;
+
+    console.log(`  Match rate: ${result.matchRate.toFixed(1)}% (${result.matched}/${expected.length})`);
+    console.log(`  Missed: ${result.missed}, Extra: ${result.extra}`);
+    console.log(`  Time: ${(elapsed / 1000).toFixed(1)}s`);
+
+    if (result.errors.length > 0 && result.errors.length <= 5) {
+      result.errors.forEach((e) => console.log(`    - ${e}`));
+    } else if (result.errors.length > 5) {
+      console.log(`    (${result.errors.length} missing transactions)`);
+    }
+
+    // Consider it a pass if we match at least 70% of transactions
+    expect(result.matchRate).toBeGreaterThan(70);
+  });
+}
+
+tap.test('summary', async () => {
+  const overallMatchRate = totalExpected > 0 ? (totalMatched / totalExpected) * 100 : 0;
+  const totalTime = times.reduce((a, b) => a + b, 0) / 1000;
+  const avgTime = times.length > 0 ? totalTime / times.length : 0;
+
+  console.log(`\n======================================================`);
+  console.log(`   Bank Statement Extraction Summary (Ministral 3)`);
+  console.log(`======================================================`);
+  console.log(`  Method:      Ministral 3 8B Vision (Direct)`);
+  console.log(`  Statements:  ${testCases.length}`);
+  console.log(`  Matched:     ${totalMatched}/${totalExpected} transactions`);
+  console.log(`  Match rate:  ${overallMatchRate.toFixed(1)}%`);
+  console.log(`------------------------------------------------------`);
+  console.log(`  Total time:  ${totalTime.toFixed(1)}s`);
+  console.log(`  Avg per stmt: ${avgTime.toFixed(1)}s`);
+  console.log(`======================================================\n`);
+});
+
+export default tap.start();

test/test.bankstatements.qwen3vl.ts

@@ -0,0 +1,284 @@
+/**
+ * Bank statement extraction using Qwen3-VL 8B Vision (Direct)
+ *
+ * Single-step pipeline: PDF → Images → Qwen3-VL → JSON
+ *
+ * Key insights:
+ * - Use /no_think in prompt + think:false in API to disable reasoning
+ * - Need high num_predict (8000+) for many transactions
+ * - Single pass extraction, no consensus needed
+ */
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as os from 'os';
+import { ensureMiniCpm } from './helpers/docker.js';
+
+const OLLAMA_URL = 'http://localhost:11434';
+const VISION_MODEL = 'qwen3-vl:8b';
+
+interface ITransaction {
+  date: string;
+  counterparty: string;
+  amount: number;
+}
+
+/**
+ * Convert PDF to PNG images
+ */
+function convertPdfToImages(pdfPath: string): string[] {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pdf-convert-'));
+  const outputPattern = path.join(tempDir, 'page-%d.png');
+
+  try {
+    execSync(
+      `convert -density 150 -quality 90 "${pdfPath}" -background white -alpha remove "${outputPattern}"`,
+      { stdio: 'pipe' }
+    );
+
+    const files = fs.readdirSync(tempDir).filter((f: string) => f.endsWith('.png')).sort();
+    const images: string[] = [];
+
+    for (const file of files) {
+      const imagePath = path.join(tempDir, file);
+      const imageData = fs.readFileSync(imagePath);
+      images.push(imageData.toString('base64'));
+    }
+
+    return images;
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+/**
+ * Extract transactions from a single page
+ * Processes one page at a time to minimize thinking tokens
+ */
+async function extractTransactionsFromPage(image: string, pageNum: number): Promise<ITransaction[]> {
+  const prompt = `/no_think
+Extract transactions from this bank statement page.
+Amount: "- 21,47 €" = -21.47, "+ 1.000,00 €" = 1000.00 (European format)
+Return JSON array only: [{"date":"YYYY-MM-DD","counterparty":"NAME","amount":-21.47},...]`;
+
+  const response = await fetch(`${OLLAMA_URL}/api/chat`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      model: VISION_MODEL,
+      messages: [{
+        role: 'user',
+        content: prompt,
+        images: [image],
+      }],
+      stream: false,
+      think: false,
+      options: {
+        num_predict: 4000,
+        temperature: 0.1,
+      },
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`Ollama API error: ${response.status}`);
+  }
+
+  const data = await response.json();
+  let content = data.message?.content || '';
+
+  if (!content) {
+    console.log(`    [Page ${pageNum}] Empty response`);
+    return [];
+  }
+
+  // Parse JSON array
+  if (content.startsWith('```json')) content = content.slice(7);
+  else if (content.startsWith('```')) content = content.slice(3);
+  if (content.endsWith('```')) content = content.slice(0, -3);
+  content = content.trim();
+
+  const startIdx = content.indexOf('[');
+  const endIdx = content.lastIndexOf(']') + 1;
+
+  if (startIdx < 0 || endIdx <= startIdx) {
+    console.log(`    [Page ${pageNum}] No JSON array found`);
+    return [];
+  }
+
+  try {
+    const transactions = JSON.parse(content.substring(startIdx, endIdx));
+    console.log(`    [Page ${pageNum}] Found ${transactions.length} transactions`);
+    return transactions;
+  } catch {
+    console.log(`    [Page ${pageNum}] JSON parse error`);
+    return [];
+  }
+}
+
+/**
+ * Extract transactions using Qwen3-VL vision
+ * Processes each page separately to avoid thinking token exhaustion
+ */
+async function extractTransactions(images: string[]): Promise<ITransaction[]> {
+  console.log(`    [Vision] Processing ${images.length} page(s) with Qwen3-VL`);
+
+  const allTransactions: ITransaction[] = [];
+
+  // Process pages sequentially to avoid overwhelming the model
+  for (let i = 0; i < images.length; i++) {
+    const pageTransactions = await extractTransactionsFromPage(images[i], i + 1);
+    allTransactions.push(...pageTransactions);
+  }
+
+  console.log(`    [Vision] Total: ${allTransactions.length} transactions`);
+  return allTransactions;
+}
+
+/**
+ * Compare transactions
+ */
+function compareTransactions(
+  extracted: ITransaction[],
+  expected: ITransaction[]
+): { matches: number; total: number; errors: string[] } {
+  const errors: string[] = [];
+  let matches = 0;
+
+  for (let i = 0; i < expected.length; i++) {
+    const exp = expected[i];
+    const ext = extracted[i];
+
+    if (!ext) {
+      errors.push(`Missing transaction ${i}: ${exp.date} ${exp.counterparty}`);
+      continue;
+    }
+
+    const dateMatch = ext.date === exp.date;
+    const amountMatch = Math.abs(ext.amount - exp.amount) < 0.01;
+
+    if (dateMatch && amountMatch) {
+      matches++;
+    } else {
+      errors.push(`Mismatch at ${i}: expected ${exp.date}/${exp.amount}, got ${ext.date}/${ext.amount}`);
+    }
+  }
+
+  if (extracted.length > expected.length) {
+    errors.push(`Extra transactions: ${extracted.length - expected.length}`);
+  }
+
+  return { matches, total: expected.length, errors };
+}
+
+/**
+ * Find test cases in .nogit/
+ */
+function findTestCases(): Array<{ name: string; pdfPath: string; jsonPath: string }> {
+  const testDir = path.join(process.cwd(), '.nogit');
+  if (!fs.existsSync(testDir)) return [];
+
+  const files = fs.readdirSync(testDir);
+  const testCases: Array<{ name: string; pdfPath: string; jsonPath: string }> = [];
+
+  for (const pdf of files.filter((f: string) => f.endsWith('.pdf'))) {
+    const baseName = pdf.replace('.pdf', '');
+    const jsonFile = `${baseName}.json`;
+    if (files.includes(jsonFile)) {
+      testCases.push({
+        name: baseName,
+        pdfPath: path.join(testDir, pdf),
+        jsonPath: path.join(testDir, jsonFile),
+      });
+    }
+  }
+
+  return testCases.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+/**
+ * Ensure Qwen3-VL model is available
+ */
+async function ensureQwen3Vl(): Promise<boolean> {
+  try {
+    const response = await fetch(`${OLLAMA_URL}/api/tags`);
+    if (response.ok) {
+      const data = await response.json();
+      const models = data.models || [];
+      if (models.some((m: { name: string }) => m.name === VISION_MODEL)) {
+        console.log(`[Ollama] Model available: ${VISION_MODEL}`);
+        return true;
+      }
+    }
+  } catch {
+    return false;
+  }
+
+  console.log(`[Ollama] Pulling ${VISION_MODEL}...`);
+  const pullResponse = await fetch(`${OLLAMA_URL}/api/pull`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ name: VISION_MODEL, stream: false }),
+  });
+
+  return pullResponse.ok;
+}
+
+// Tests
+
+tap.test('setup: ensure Qwen3-VL is running', async () => {
+  console.log('\n[Setup] Checking Qwen3-VL 8B...\n');
+  const ollamaOk = await ensureMiniCpm();
+  expect(ollamaOk).toBeTrue();
+  const visionOk = await ensureQwen3Vl();
+  expect(visionOk).toBeTrue();
+  console.log('\n[Setup] Ready!\n');
+});
+
+const testCases = findTestCases();
+console.log(`\nFound ${testCases.length} bank statement test cases (Qwen3-VL)\n`);
+
+let passedCount = 0;
+let failedCount = 0;
+
+for (const testCase of testCases) {
+  tap.test(`should extract: ${testCase.name}`, async () => {
+    const expected: ITransaction[] = JSON.parse(fs.readFileSync(testCase.jsonPath, 'utf-8'));
+    console.log(`\n=== ${testCase.name} ===`);
+    console.log(`Expected: ${expected.length} transactions`);
+
+    const images = convertPdfToImages(testCase.pdfPath);
+    console.log(`  Pages: ${images.length}`);
+
+    const extracted = await extractTransactions(images);
+    console.log(`  Extracted: ${extracted.length} transactions`);
+
+    const result = compareTransactions(extracted, expected);
+    const accuracy = result.total > 0 ? result.matches / result.total : 0;
+
+    if (accuracy >= 0.95 && extracted.length === expected.length) {
+      passedCount++;
+      console.log(`  Result: PASS (${result.matches}/${result.total})`);
+    } else {
+      failedCount++;
+      console.log(`  Result: FAIL (${result.matches}/${result.total})`);
+      result.errors.slice(0, 5).forEach((e) => console.log(`    - ${e}`));
+    }
+
+    expect(accuracy).toBeGreaterThan(0.95);
+    expect(extracted.length).toEqual(expected.length);
+  });
+}
+
+tap.test('summary', async () => {
+  const total = testCases.length;
+  console.log(`\n======================================================`);
+  console.log(`   Bank Statement Summary (Qwen3-VL Vision)`);
+  console.log(`======================================================`);
+  console.log(`  Passed: ${passedCount}/${total}`);
+  console.log(`  Failed: ${failedCount}/${total}`);
+  console.log(`======================================================\n`);
+});
+
+export default tap.start();

test/test.invoices.ministral3.ts

@@ -0,0 +1,334 @@
+/**
+ * Invoice extraction using Ministral 3 Vision (Direct)
+ *
+ * NO PaddleOCR needed - Ministral 3 has built-in vision encoder:
+ *   1. Convert PDF to images
+ *   2. Send images directly to Ministral 3 via Ollama
+ *   3. Extract structured JSON with native schema support
+ *
+ * This is the simplest possible pipeline.
+ */
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as os from 'os';
+import { ensureMinistral3 } from './helpers/docker.js';
+
+const OLLAMA_URL = 'http://localhost:11434';
+const VISION_MODEL = 'ministral-3:8b';
+
+interface IInvoice {
+  invoice_number: string;
+  invoice_date: string;
+  vendor_name: string;
+  currency: string;
+  net_amount: number;
+  vat_amount: number;
+  total_amount: number;
+}
+
+/**
+ * Convert PDF to PNG images using ImageMagick
+ */
+function convertPdfToImages(pdfPath: string): string[] {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pdf-convert-'));
+  const outputPattern = path.join(tempDir, 'page-%d.png');
+
+  try {
+    // High quality conversion: 300 DPI, max quality, sharpen for better OCR
+    execSync(
+      `convert -density 300 -quality 100 "${pdfPath}" -background white -alpha remove -sharpen 0x1 "${outputPattern}"`,
+      { stdio: 'pipe' }
+    );
+
+    const files = fs.readdirSync(tempDir).filter((f) => f.endsWith('.png')).sort();
+    const images: string[] = [];
+
+    for (const file of files) {
+      const imagePath = path.join(tempDir, file);
+      const imageData = fs.readFileSync(imagePath);
+      images.push(imageData.toString('base64'));
+    }
+
+    return images;
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+/**
+ * Extract invoice data directly from images using Ministral 3 Vision
+ */
+async function extractInvoiceFromImages(images: string[]): Promise<IInvoice> {
+  console.log(`    [Vision] Processing ${images.length} page(s) with Ministral 3`);
+
+  // JSON schema for structured output
+  const invoiceSchema = {
+    type: 'object',
+    properties: {
+      invoice_number: { type: 'string' },
+      invoice_date: { type: 'string' },
+      vendor_name: { type: 'string' },
+      currency: { type: 'string' },
+      net_amount: { type: 'number' },
+      vat_amount: { type: 'number' },
+      total_amount: { type: 'number' },
+    },
+    required: ['invoice_number', 'invoice_date', 'vendor_name', 'currency', 'net_amount', 'vat_amount', 'total_amount'],
+  };
+
+  const prompt = `You are an expert invoice data extraction system. Carefully analyze this invoice document and extract the following fields with high precision.
+
+INVOICE NUMBER:
+- Look for labels: "Invoice No", "Invoice #", "Invoice Number", "Rechnung Nr", "Rechnungsnummer", "Document No", "Bill No", "Reference"
+- Usually alphanumeric, often starts with letters (e.g., R0014359508, INV-2024-001)
+- Located near the top of the invoice
+
+INVOICE DATE:
+- Look for labels: "Invoice Date", "Date", "Datum", "Rechnungsdatum", "Issue Date", "Bill Date"
+- Convert ANY date format to YYYY-MM-DD (e.g., 14/10/2021 → 2021-10-14, Oct 14, 2021 → 2021-10-14)
+- Usually near the invoice number
+
+VENDOR NAME:
+- The company ISSUING the invoice (not the recipient)
+- Found in letterhead, logo area, or header - typically the largest/most prominent company name
+- Examples: "Hetzner Online GmbH", "Adobe Inc", "DigitalOcean LLC"
+
+CURRENCY:
+- Detect from symbols: € = EUR, $ = USD, £ = GBP
+- Or from text: "EUR", "USD", "GBP"
+- Default to EUR if unclear
+
+AMOUNTS (Critical - read carefully!):
+- total_amount: The FINAL amount due/payable - look for "Total", "Grand Total", "Amount Due", "Balance Due", "Gesamtbetrag", "Endbetrag"
+- net_amount: Subtotal BEFORE tax - look for "Subtotal", "Net", "Netto", "excl. VAT"
+- vat_amount: Tax amount - look for "VAT", "Tax", "MwSt", "USt", "19%", "20%"
+- For multi-page invoices: the FINAL totals are usually on the LAST page
+
+Return ONLY valid JSON with the extracted values.`;
+
+  const response = await fetch(`${OLLAMA_URL}/api/chat`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      model: VISION_MODEL,
+      messages: [
+        {
+          role: 'user',
+          content: prompt,
+          images: images,  // Send all page images
+        },
+      ],
+      format: invoiceSchema,
+      stream: true,
+      options: {
+        num_predict: 1024,
+        temperature: 0.0,
+      },
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`Ollama API error: ${response.status}`);
+  }
+
+  const reader = response.body?.getReader();
+  if (!reader) {
+    throw new Error('No response body');
+  }
+
+  const decoder = new TextDecoder();
+  let fullText = '';
+
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+
+    const chunk = decoder.decode(value, { stream: true });
+    const lines = chunk.split('\n').filter((l) => l.trim());
+
+    for (const line of lines) {
+      try {
+        const json = JSON.parse(line);
+        if (json.message?.content) {
+          fullText += json.message.content;
+        }
+      } catch {
+        // Skip invalid JSON lines
+      }
+    }
+  }
+
+  // Parse JSON response
+  let jsonStr = fullText.trim();
+
+  if (jsonStr.startsWith('```json')) jsonStr = jsonStr.slice(7);
+  else if (jsonStr.startsWith('```')) jsonStr = jsonStr.slice(3);
+  if (jsonStr.endsWith('```')) jsonStr = jsonStr.slice(0, -3);
+  jsonStr = jsonStr.trim();
+
+  const startIdx = jsonStr.indexOf('{');
+  const endIdx = jsonStr.lastIndexOf('}') + 1;
+
+  if (startIdx < 0 || endIdx <= startIdx) {
+    throw new Error(`No JSON found: ${fullText.substring(0, 200)}`);
+  }
+
+  const parsed = JSON.parse(jsonStr.substring(startIdx, endIdx));
+
+  return {
+    invoice_number: parsed.invoice_number || null,
+    invoice_date: parsed.invoice_date || null,
+    vendor_name: parsed.vendor_name || null,
+    currency: parsed.currency || 'EUR',
+    net_amount: parseFloat(parsed.net_amount) || 0,
+    vat_amount: parseFloat(parsed.vat_amount) || 0,
+    total_amount: parseFloat(parsed.total_amount) || 0,
+  };
+}
+
+
+/**
+ * Normalize date to YYYY-MM-DD
+ */
+function normalizeDate(dateStr: string | null): string {
+  if (!dateStr) return '';
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr;
+
+  const monthMap: Record<string, string> = {
+    JAN: '01', FEB: '02', MAR: '03', APR: '04', MAY: '05', JUN: '06',
+    JUL: '07', AUG: '08', SEP: '09', OCT: '10', NOV: '11', DEC: '12',
+  };
+
+  let match = dateStr.match(/^(\d{1,2})-([A-Z]{3})-(\d{4})$/i);
+  if (match) {
+    return `${match[3]}-${monthMap[match[2].toUpperCase()] || '01'}-${match[1].padStart(2, '0')}`;
+  }
+
+  match = dateStr.match(/^(\d{1,2})[\/.](\d{1,2})[\/.](\d{4})$/);
+  if (match) {
+    return `${match[3]}-${match[2].padStart(2, '0')}-${match[1].padStart(2, '0')}`;
+  }
+
+  return dateStr;
+}
+
+/**
+ * Compare extracted vs expected
+ */
+function compareInvoice(extracted: IInvoice, expected: IInvoice): { match: boolean; errors: string[] } {
+  const errors: string[] = [];
+
+  const extNum = extracted.invoice_number?.replace(/\s/g, '').toLowerCase() || '';
+  const expNum = expected.invoice_number?.replace(/\s/g, '').toLowerCase() || '';
+  if (extNum !== expNum) {
+    errors.push(`invoice_number: expected "${expected.invoice_number}", got "${extracted.invoice_number}"`);
+  }
+
+  if (normalizeDate(extracted.invoice_date) !== normalizeDate(expected.invoice_date)) {
+    errors.push(`invoice_date: expected "${expected.invoice_date}", got "${extracted.invoice_date}"`);
+  }
+
+  if (Math.abs(extracted.total_amount - expected.total_amount) > 0.02) {
+    errors.push(`total_amount: expected ${expected.total_amount}, got ${extracted.total_amount}`);
+  }
+
+  if (extracted.currency?.toUpperCase() !== expected.currency?.toUpperCase()) {
+    errors.push(`currency: expected "${expected.currency}", got "${extracted.currency}"`);
+  }
+
+  return { match: errors.length === 0, errors };
+}
+
+/**
+ * Find test cases
+ */
+function findTestCases(): Array<{ name: string; pdfPath: string; jsonPath: string }> {
+  const testDir = path.join(process.cwd(), '.nogit/invoices');
+  if (!fs.existsSync(testDir)) return [];
+
+  const files = fs.readdirSync(testDir);
+  const testCases: Array<{ name: string; pdfPath: string; jsonPath: string }> = [];
+
+  for (const pdf of files.filter((f) => f.endsWith('.pdf'))) {
+    const baseName = pdf.replace('.pdf', '');
+    const jsonFile = `${baseName}.json`;
+    if (files.includes(jsonFile)) {
+      testCases.push({
+        name: baseName,
+        pdfPath: path.join(testDir, pdf),
+        jsonPath: path.join(testDir, jsonFile),
+      });
+    }
+  }
+
+  return testCases.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+// Tests
+
+tap.test('setup: ensure Ministral 3 is running', async () => {
+  console.log('\n[Setup] Checking Ministral 3...\n');
+  const ok = await ensureMinistral3();
+  expect(ok).toBeTrue();
+  console.log('\n[Setup] Ready!\n');
+});
+
+const testCases = findTestCases();
+console.log(`\nFound ${testCases.length} invoice test cases (Ministral 3 Vision Direct)\n`);
+
+let passedCount = 0;
+let failedCount = 0;
+const times: number[] = [];
+
+for (const testCase of testCases) {
+  tap.test(`should extract invoice: ${testCase.name}`, async () => {
+    const expected: IInvoice = JSON.parse(fs.readFileSync(testCase.jsonPath, 'utf-8'));
+    console.log(`\n=== ${testCase.name} ===`);
+    console.log(`Expected: ${expected.invoice_number} | ${expected.invoice_date} | ${expected.total_amount} ${expected.currency}`);
+
+    const start = Date.now();
+    const images = convertPdfToImages(testCase.pdfPath);
+    console.log(`  Pages: ${images.length}`);
+
+    const extracted = await extractInvoiceFromImages(images);
+    console.log(`  Extracted: ${extracted.invoice_number} | ${extracted.invoice_date} | ${extracted.total_amount} ${extracted.currency}`);
+    const elapsed = Date.now() - start;
+    times.push(elapsed);
+
+    const result = compareInvoice(extracted, expected);
+
+    if (result.match) {
+      passedCount++;
+      console.log(`  Result: MATCH (${(elapsed / 1000).toFixed(1)}s)`);
+    } else {
+      failedCount++;
+      console.log(`  Result: MISMATCH (${(elapsed / 1000).toFixed(1)}s)`);
+      result.errors.forEach((e) => console.log(`    - ${e}`));
+    }
+
+    expect(result.match).toBeTrue();
+  });
+}
+
+tap.test('summary', async () => {
+  const total = testCases.length;
+  const accuracy = total > 0 ? (passedCount / total) * 100 : 0;
+  const totalTime = times.reduce((a, b) => a + b, 0) / 1000;
+  const avgTime = times.length > 0 ? totalTime / times.length : 0;
+
+  console.log(`\n======================================================`);
+  console.log(`   Invoice Extraction Summary (Ministral 3 Vision)`);
+  console.log(`======================================================`);
+  console.log(`  Method:    Ministral 3 8B Vision (Direct)`);
+  console.log(`  Passed:    ${passedCount}/${total}`);
+  console.log(`  Failed:    ${failedCount}/${total}`);
+  console.log(`  Accuracy:  ${accuracy.toFixed(1)}%`);
+  console.log(`------------------------------------------------------`);
+  console.log(`  Total time:   ${totalTime.toFixed(1)}s`);
+  console.log(`  Avg per inv:  ${avgTime.toFixed(1)}s`);
+  console.log(`======================================================\n`);
+});
+
+export default tap.start();

test/test.invoices.paddleocr-vl.ts

@@ -90,61 +90,59 @@ async function parseDocument(imageBase64: string): Promise<string> {
 }
 
 /**
- * Extract invoice fields from structured HTML using Qwen2.5 (text-only model)
+ * Extract invoice fields using simple direct prompt
+ * The OCR output has clearly labeled fields - just ask the LLM to read them
  */
 async function extractInvoiceFromHtml(html: string): Promise<IInvoice> {
-  // Truncate if too long (HTML is more valuable per byte, allow more)
+  // OCR output is already good - just truncate if too long
-  const truncated = html.length > 16000 ? html.slice(0, 16000) : html;
+  const truncated = html.length > 32000 ? html.slice(0, 32000) : html;
-  console.log(`    [Extract] Processing ${truncated.length} chars of HTML`);
+  console.log(`    [Extract] ${truncated.length} chars of HTML`);
 
-  const prompt = `You are an invoice data extractor. Extract the following fields from this HTML document (OCR output with semantic structure) and return ONLY a valid JSON object.
+  // JSON schema for structured output
-
+  const invoiceSchema = {
-The HTML uses semantic tags:
+    type: 'object',
-- <table> with <thead>/<tbody> for structured tables (invoice line items, totals)
+    properties: {
-- <header> for document header (company info, invoice number)
+      invoice_number: { type: 'string' },
-- <footer> for document footer (payment terms, legal text)
+      invoice_date: { type: 'string' },
-- <section class="table-region"> for table regions
+      vendor_name: { type: 'string' },
-- data-type and data-y attributes indicate block type and vertical position
+      currency: { type: 'string' },
-
+      net_amount: { type: 'number' },
-Required fields:
+      vat_amount: { type: 'number' },
-- invoice_number: The invoice/receipt/document number
+      total_amount: { type: 'number' },
-- invoice_date: Date in YYYY-MM-DD format (convert from any format)
-- vendor_name: Company that issued the invoice
-- currency: EUR, USD, GBP, etc.
-- net_amount: Amount before tax (number)
-- vat_amount: Tax/VAT amount (number, use 0 if reverse charge or not shown)
-- total_amount: Final total amount (number)
-
-Example output format:
-{"invoice_number":"INV-123","invoice_date":"2022-01-28","vendor_name":"Adobe","currency":"EUR","net_amount":24.99,"vat_amount":0,"total_amount":24.99}
-
-Rules:
-- Return ONLY the JSON object, no explanation or markdown
-- Use null for missing string fields
-- Use 0 for missing numeric fields
-- Convert dates to YYYY-MM-DD format (e.g., "28-JAN-2022" becomes "2022-01-28")
-- Extract numbers without currency symbols
-- Look for totals in <table> sections, especially rows with "Total", "Amount Due", "Grand Total"
-
-HTML Document:
-${truncated}
-
-JSON:`;
-
-  const payload = {
-    model: TEXT_MODEL,
-    prompt,
-    stream: true,
-    options: {
-      num_predict: 512,
-      temperature: 0.1,
     },
+    required: ['invoice_number', 'invoice_date', 'vendor_name', 'currency', 'net_amount', 'vat_amount', 'total_amount'],
   };
 
-  const response = await fetch(`${OLLAMA_URL}/api/generate`, {
+  // Simple, direct prompt - the OCR output already has labeled fields
+  const systemPrompt = `You read invoice HTML and extract labeled fields. Return JSON only.`;
+
+  const userPrompt = `Extract from this invoice HTML:
+- invoice_number: Find "Invoice no.", "Invoice #", "Invoice", "Rechnung", "Document No" and extract the value
+- invoice_date: Find "Invoice date", "Date", "Datum" and convert to YYYY-MM-DD format
+- vendor_name: The company name issuing the invoice (in header/letterhead)
+- currency: EUR, USD, or GBP (look for € $ £ symbols or text)
+- total_amount: Find "Total", "Grand Total", "Amount Due", "Gesamtbetrag" - the FINAL total amount
+- net_amount: Amount before VAT/tax (Subtotal, Net)
+- vat_amount: VAT/tax amount
+
+HTML:
+${truncated}
+
+Return ONLY valid JSON: {"invoice_number":"...", "invoice_date":"YYYY-MM-DD", "vendor_name":"...", "currency":"EUR", "net_amount":0, "vat_amount":0, "total_amount":0}`;
+
+  const response = await fetch(`${OLLAMA_URL}/api/chat`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(payload),
+    body: JSON.stringify({
+      model: TEXT_MODEL,
+      messages: [
+        { role: 'system', content: systemPrompt },
+        { role: 'user', content: userPrompt },
+      ],
+      format: invoiceSchema,
+      stream: true,
+      options: { num_predict: 512, temperature: 0.0 },
+    }),
   });
 
   if (!response.ok) {
@@ -169,7 +167,9 @@ JSON:`;
     for (const line of lines) {
       try {
         const json = JSON.parse(line);
-        if (json.response) {
+        if (json.message?.content) {
+          fullText += json.message.content;
+        } else if (json.response) {
           fullText += json.response;
         }
       } catch {
@@ -179,17 +179,37 @@ JSON:`;
   }
 
   // Extract JSON from response
-  const startIdx = fullText.indexOf('{');
+  let jsonStr = fullText.trim();
-  const endIdx = fullText.lastIndexOf('}') + 1;
+
+  // Remove markdown code block if present
+  if (jsonStr.startsWith('```json')) {
+    jsonStr = jsonStr.slice(7);
+  } else if (jsonStr.startsWith('```')) {
+    jsonStr = jsonStr.slice(3);
+  }
+  if (jsonStr.endsWith('```')) {
+    jsonStr = jsonStr.slice(0, -3);
+  }
+  jsonStr = jsonStr.trim();
+
+  // Find JSON object boundaries
+  const startIdx = jsonStr.indexOf('{');
+  const endIdx = jsonStr.lastIndexOf('}') + 1;
 
   if (startIdx < 0 || endIdx <= startIdx) {
     throw new Error(`No JSON object found in response: ${fullText.substring(0, 200)}`);
   }
 
-  const jsonStr = fullText.substring(startIdx, endIdx);
+  jsonStr = jsonStr.substring(startIdx, endIdx);
-  const parsed = JSON.parse(jsonStr);
 
-  // Ensure numeric fields are actually numbers
+  let parsed;
+  try {
+    parsed = JSON.parse(jsonStr);
+  } catch (e) {
+    throw new Error(`Invalid JSON: ${jsonStr.substring(0, 200)}`);
+  }
+
+  // Normalize response to expected format
   return {
     invoice_number: parsed.invoice_number || null,
     invoice_date: parsed.invoice_date || null,
@@ -203,14 +223,23 @@ JSON:`;
 
 /**
  * Single extraction pass: Parse with PaddleOCR-VL Full, extract with Qwen2.5 (text-only)
+ * Processes ALL pages and concatenates HTML for multi-page invoice support
  */
 async function extractOnce(images: string[], passNum: number): Promise<IInvoice> {
-  // Parse document with full pipeline (PaddleOCR-VL) -> returns HTML
+  // Parse ALL pages and concatenate HTML with page markers
-  const html = await parseDocument(images[0]);
+  const htmlParts: string[] = [];
-  console.log(`    [Parse] Got ${html.split('\n').length} lines of HTML`);
+
+  for (let i = 0; i < images.length; i++) {
+    const pageHtml = await parseDocument(images[i]);
+    // Add page marker for context
+    htmlParts.push(`<!-- Page ${i + 1} -->\n${pageHtml}`);
+  }
+
+  const fullHtml = htmlParts.join('\n\n');
+  console.log(`    [Parse] Got ${fullHtml.split('\n').length} lines from ${images.length} page(s)`);
 
   // Extract invoice fields from HTML using text-only model (no images)
-  return extractInvoiceFromHtml(html);
+  return extractInvoiceFromHtml(fullHtml);
 }
 
 /**

test/test.invoices.qwen3vl.ts

@@ -0,0 +1,309 @@
+/**
+ * Invoice extraction using Qwen3-VL 8B Vision (Direct)
+ *
+ * Single-step pipeline: PDF → Images → Qwen3-VL → JSON
+ * Uses /no_think to disable reasoning mode for fast, direct responses.
+ *
+ * Qwen3-VL outperforms PaddleOCR-VL on certain invoice formats.
+ */
+import { tap, expect } from '@git.zone/tstest/tapbundle';
+import * as fs from 'fs';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import * as os from 'os';
+import { ensureMiniCpm } from './helpers/docker.js';
+
+const OLLAMA_URL = 'http://localhost:11434';
+const VISION_MODEL = 'qwen3-vl:8b';
+
+interface IInvoice {
+  invoice_number: string;
+  invoice_date: string;
+  vendor_name: string;
+  currency: string;
+  net_amount: number;
+  vat_amount: number;
+  total_amount: number;
+}
+
+/**
+ * Convert PDF to PNG images using ImageMagick
+ */
+function convertPdfToImages(pdfPath: string): string[] {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pdf-convert-'));
+  const outputPattern = path.join(tempDir, 'page-%d.png');
+
+  try {
+    // 150 DPI is sufficient for invoice extraction, reduces context size
+    execSync(
+      `convert -density 150 -quality 90 "${pdfPath}" -background white -alpha remove "${outputPattern}"`,
+      { stdio: 'pipe' }
+    );
+
+    const files = fs.readdirSync(tempDir).filter((f) => f.endsWith('.png')).sort();
+    const images: string[] = [];
+
+    for (const file of files) {
+      const imagePath = path.join(tempDir, file);
+      const imageData = fs.readFileSync(imagePath);
+      images.push(imageData.toString('base64'));
+    }
+
+    return images;
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
+/**
+ * Query Qwen3-VL for a single field
+ * Uses simple prompts to minimize thinking tokens
+ */
+async function queryField(images: string[], question: string): Promise<string> {
+  const response = await fetch(`${OLLAMA_URL}/api/chat`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      model: VISION_MODEL,
+      messages: [{
+        role: 'user',
+        content: `/no_think\n${question} Reply with just the value, nothing else.`,
+        images: images,
+      }],
+      stream: false,
+      think: false,
+      options: {
+        num_predict: 500,
+        temperature: 0.1,
+      },
+    }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`Ollama API error: ${response.status}`);
+  }
+
+  const data = await response.json();
+  return (data.message?.content || '').trim();
+}
+
+/**
+ * Extract invoice data using multiple simple queries
+ * Each query asks for 1-2 fields to minimize thinking tokens
+ * (Qwen3's thinking mode uses all tokens on complex prompts)
+ */
+async function extractInvoiceFromImages(images: string[]): Promise<IInvoice> {
+  console.log(`    [Vision] Processing ${images.length} page(s) with Qwen3-VL (multi-query)`);
+
+  // Query each field separately to avoid excessive thinking tokens
+  const [invoiceNum, invoiceDate, vendor, currency, amounts] = await Promise.all([
+    queryField(images, 'What is the invoice number on this document?'),
+    queryField(images, 'What is the invoice date? Format as YYYY-MM-DD.'),
+    queryField(images, 'What company issued this invoice?'),
+    queryField(images, 'What currency is used? Answer EUR, USD, or GBP.'),
+    queryField(images, 'What are the net amount, VAT amount, and total amount? Format: net,vat,total'),
+  ]);
+
+  console.log(`    [Vision] Got: ${invoiceNum} | ${invoiceDate} | ${vendor} | ${currency}`);
+
+  // Parse amounts (format: "net,vat,total" or similar)
+  const amountMatch = amounts.match(/([\d.,]+)/g) || [];
+  const parseAmount = (s: string): number => {
+    if (!s) return 0;
+    // Handle European format: 1.234,56 → 1234.56
+    const normalized = s.includes(',') && s.indexOf(',') > s.lastIndexOf('.')
+      ? s.replace(/\./g, '').replace(',', '.')
+      : s.replace(/,/g, '');
+    return parseFloat(normalized) || 0;
+  };
+
+  return {
+    invoice_number: invoiceNum || '',
+    invoice_date: invoiceDate || '',
+    vendor_name: vendor || '',
+    currency: (currency || 'EUR').toUpperCase().replace(/[^A-Z]/g, '').slice(0, 3) || 'EUR',
+    net_amount: parseAmount(amountMatch[0] || ''),
+    vat_amount: parseAmount(amountMatch[1] || ''),
+    total_amount: parseAmount(amountMatch[2] || amountMatch[0] || ''),
+  };
+}
+
+/**
+ * Normalize date to YYYY-MM-DD
+ */
+function normalizeDate(dateStr: string | null): string {
+  if (!dateStr) return '';
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr;
+
+  const monthMap: Record<string, string> = {
+    JAN: '01', FEB: '02', MAR: '03', APR: '04', MAY: '05', JUN: '06',
+    JUL: '07', AUG: '08', SEP: '09', OCT: '10', NOV: '11', DEC: '12',
+  };
+
+  let match = dateStr.match(/^(\d{1,2})-([A-Z]{3})-(\d{4})$/i);
+  if (match) {
+    return `${match[3]}-${monthMap[match[2].toUpperCase()] || '01'}-${match[1].padStart(2, '0')}`;
+  }
+
+  match = dateStr.match(/^(\d{1,2})[\/.](\d{1,2})[\/.](\d{4})$/);
+  if (match) {
+    return `${match[3]}-${match[2].padStart(2, '0')}-${match[1].padStart(2, '0')}`;
+  }
+
+  return dateStr;
+}
+
+/**
+ * Compare extracted vs expected
+ */
+function compareInvoice(extracted: IInvoice, expected: IInvoice): { match: boolean; errors: string[] } {
+  const errors: string[] = [];
+
+  const extNum = extracted.invoice_number?.replace(/\s/g, '').toLowerCase() || '';
+  const expNum = expected.invoice_number?.replace(/\s/g, '').toLowerCase() || '';
+  if (extNum !== expNum) {
+    errors.push(`invoice_number: expected "${expected.invoice_number}", got "${extracted.invoice_number}"`);
+  }
+
+  if (normalizeDate(extracted.invoice_date) !== normalizeDate(expected.invoice_date)) {
+    errors.push(`invoice_date: expected "${expected.invoice_date}", got "${extracted.invoice_date}"`);
+  }
+
+  if (Math.abs(extracted.total_amount - expected.total_amount) > 0.02) {
+    errors.push(`total_amount: expected ${expected.total_amount}, got ${extracted.total_amount}`);
+  }
+
+  if (extracted.currency?.toUpperCase() !== expected.currency?.toUpperCase()) {
+    errors.push(`currency: expected "${expected.currency}", got "${extracted.currency}"`);
+  }
+
+  return { match: errors.length === 0, errors };
+}
+
+/**
+ * Find test cases
+ */
+function findTestCases(): Array<{ name: string; pdfPath: string; jsonPath: string }> {
+  const testDir = path.join(process.cwd(), '.nogit/invoices');
+  if (!fs.existsSync(testDir)) return [];
+
+  const files = fs.readdirSync(testDir);
+  const testCases: Array<{ name: string; pdfPath: string; jsonPath: string }> = [];
+
+  for (const pdf of files.filter((f) => f.endsWith('.pdf'))) {
+    const baseName = pdf.replace('.pdf', '');
+    const jsonFile = `${baseName}.json`;
+    if (files.includes(jsonFile)) {
+      testCases.push({
+        name: baseName,
+        pdfPath: path.join(testDir, pdf),
+        jsonPath: path.join(testDir, jsonFile),
+      });
+    }
+  }
+
+  return testCases.sort((a, b) => a.name.localeCompare(b.name));
+}
+
+/**
+ * Ensure Qwen3-VL 8B model is available
+ */
+async function ensureQwen3Vl(): Promise<boolean> {
+  try {
+    const response = await fetch(`${OLLAMA_URL}/api/tags`);
+    if (response.ok) {
+      const data = await response.json();
+      const models = data.models || [];
+      if (models.some((m: { name: string }) => m.name === VISION_MODEL)) {
+        console.log(`[Ollama] Model already available: ${VISION_MODEL}`);
+        return true;
+      }
+    }
+  } catch {
+    console.log('[Ollama] Cannot check models');
+    return false;
+  }
+
+  console.log(`[Ollama] Pulling model: ${VISION_MODEL}...`);
+  const pullResponse = await fetch(`${OLLAMA_URL}/api/pull`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ name: VISION_MODEL, stream: false }),
+  });
+
+  return pullResponse.ok;
+}
+
+// Tests
+
+tap.test('setup: ensure Qwen3-VL is running', async () => {
+  console.log('\n[Setup] Checking Qwen3-VL 8B...\n');
+
+  // Ensure Ollama service is running
+  const ollamaOk = await ensureMiniCpm();
+  expect(ollamaOk).toBeTrue();
+
+  // Ensure Qwen3-VL 8B model
+  const visionOk = await ensureQwen3Vl();
+  expect(visionOk).toBeTrue();
+
+  console.log('\n[Setup] Ready!\n');
+});
+
+const testCases = findTestCases();
+console.log(`\nFound ${testCases.length} invoice test cases (Qwen3-VL Vision)\n`);
+
+let passedCount = 0;
+let failedCount = 0;
+const times: number[] = [];
+
+for (const testCase of testCases) {
+  tap.test(`should extract invoice: ${testCase.name}`, async () => {
+    const expected: IInvoice = JSON.parse(fs.readFileSync(testCase.jsonPath, 'utf-8'));
+    console.log(`\n=== ${testCase.name} ===`);
+    console.log(`Expected: ${expected.invoice_number} | ${expected.invoice_date} | ${expected.total_amount} ${expected.currency}`);
+
+    const start = Date.now();
+    const images = convertPdfToImages(testCase.pdfPath);
+    console.log(`  Pages: ${images.length}`);
+
+    const extracted = await extractInvoiceFromImages(images);
+    console.log(`  Extracted: ${extracted.invoice_number} | ${extracted.invoice_date} | ${extracted.total_amount} ${extracted.currency}`);
+    const elapsed = Date.now() - start;
+    times.push(elapsed);
+
+    const result = compareInvoice(extracted, expected);
+
+    if (result.match) {
+      passedCount++;
+      console.log(`  Result: MATCH (${(elapsed / 1000).toFixed(1)}s)`);
+    } else {
+      failedCount++;
+      console.log(`  Result: MISMATCH (${(elapsed / 1000).toFixed(1)}s)`);
+      result.errors.forEach((e) => console.log(`    - ${e}`));
+    }
+
+    expect(result.match).toBeTrue();
+  });
+}
+
+tap.test('summary', async () => {
+  const total = testCases.length;
+  const accuracy = total > 0 ? (passedCount / total) * 100 : 0;
+  const totalTime = times.reduce((a, b) => a + b, 0) / 1000;
+  const avgTime = times.length > 0 ? totalTime / times.length : 0;
+
+  console.log(`\n======================================================`);
+  console.log(`   Invoice Extraction Summary (Qwen3-VL Vision)`);
+  console.log(`======================================================`);
+  console.log(`  Method:    Qwen3-VL 8B Direct Vision (/no_think)`);
+  console.log(`  Passed:    ${passedCount}/${total}`);
+  console.log(`  Failed:    ${failedCount}/${total}`);
+  console.log(`  Accuracy:  ${accuracy.toFixed(1)}%`);
+  console.log(`------------------------------------------------------`);
+  console.log(`  Total time:   ${totalTime.toFixed(1)}s`);
+  console.log(`  Avg per inv:  ${avgTime.toFixed(1)}s`);
+  console.log(`======================================================\n`);
+});
+
+export default tap.start();