v1.8.0

Dockerfile_minicpm45v_cpu

@@ -14,7 +14,7 @@ ENV OLLAMA_ORIGINS="*"
 ENV CUDA_VISIBLE_DEVICES=""
 
 # Copy and setup entrypoint
-COPY image_support_files/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY image_support_files/minicpm45v_entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 # Expose Ollama API port

Dockerfile_minicpm45v_gpu

@@ -12,7 +12,7 @@ ENV OLLAMA_HOST="0.0.0.0"
 ENV OLLAMA_ORIGINS="*"
 
 # Copy and setup entrypoint
-COPY image_support_files/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY image_support_files/minicpm45v_entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 # Expose Ollama API port

Dockerfile_paddleocr_vl

@@ -1,70 +0,0 @@
-# PaddleOCR-VL GPU Variant
-# Vision-Language Model for document parsing using vLLM
-FROM nvidia/cuda:12.4.0-devel-ubuntu22.04
-
-LABEL maintainer="Task Venture Capital GmbH <hello@task.vc>"
-LABEL description="PaddleOCR-VL 0.9B - Vision-Language Model for document parsing"
-LABEL org.opencontainers.image.source="https://code.foss.global/host.today/ht-docker-ai"
-
-# Environment configuration
-ENV DEBIAN_FRONTEND=noninteractive
-ENV PYTHONUNBUFFERED=1
-ENV HF_HOME=/root/.cache/huggingface
-ENV VLLM_WORKER_MULTIPROC_METHOD=spawn
-
-# Set working directory
-WORKDIR /app
-
-# Install system dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3.11 \
-    python3.11-venv \
-    python3.11-dev \
-    python3-pip \
-    git \
-    curl \
-    build-essential \
-    && rm -rf /var/lib/apt/lists/* \
-    && update-alternatives --install /usr/bin/python python /usr/bin/python3.11 1 \
-    && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1
-
-# Create and activate virtual environment
-RUN python -m venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-
-# Install PyTorch with CUDA support
-RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir \
-    torch==2.5.1 \
-    torchvision \
-    --index-url https://download.pytorch.org/whl/cu124
-
-# Install vLLM 0.11.1 (first stable release with PaddleOCR-VL support)
-RUN pip install --no-cache-dir \
-    vllm==0.11.1 \
-    --extra-index-url https://download.pytorch.org/whl/cu124
-
-# Install additional dependencies
-RUN pip install --no-cache-dir \
-    transformers \
-    accelerate \
-    safetensors \
-    pillow \
-    fastapi \
-    uvicorn[standard] \
-    python-multipart \
-    openai \
-    httpx
-
-# Copy entrypoint script
-COPY image_support_files/paddleocr-vl-entrypoint.sh /usr/local/bin/paddleocr-vl-entrypoint.sh
-RUN chmod +x /usr/local/bin/paddleocr-vl-entrypoint.sh
-
-# Expose vLLM API port
-EXPOSE 8000
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=10s --start-period=300s --retries=3 \
-    CMD curl -f http://localhost:8000/health || exit 1
-
-ENTRYPOINT ["/usr/local/bin/paddleocr-vl-entrypoint.sh"]

Dockerfile_paddleocr_vl_cpu

@@ -44,7 +44,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
 
 # Copy server files
 COPY image_support_files/paddleocr_vl_server.py /app/paddleocr_vl_server.py
-COPY image_support_files/paddleocr-vl-cpu-entrypoint.sh /usr/local/bin/paddleocr-vl-cpu-entrypoint.sh
+COPY image_support_files/paddleocr_vl_entrypoint.sh /usr/local/bin/paddleocr-vl-cpu-entrypoint.sh
 RUN chmod +x /usr/local/bin/paddleocr-vl-cpu-entrypoint.sh
 
 # Expose API port

Dockerfile_paddleocr_vl_gpu

@@ -58,7 +58,7 @@ RUN pip install --no-cache-dir \
 
 # Copy server files (same as CPU variant - it auto-detects CUDA)
 COPY image_support_files/paddleocr_vl_server.py /app/paddleocr_vl_server.py
-COPY image_support_files/paddleocr-vl-cpu-entrypoint.sh /usr/local/bin/paddleocr-vl-entrypoint.sh
+COPY image_support_files/paddleocr_vl_entrypoint.sh /usr/local/bin/paddleocr-vl-entrypoint.sh
 RUN chmod +x /usr/local/bin/paddleocr-vl-entrypoint.sh
 
 # Expose API port

build-images.sh

@@ -16,7 +16,7 @@ echo -e "${BLUE}Building ht-docker-ai images...${NC}"
 # Build GPU variant
 echo -e "${GREEN}Building MiniCPM-V 4.5 GPU variant...${NC}"
 docker build \
-    -f Dockerfile_minicpm45v \
+    -f Dockerfile_minicpm45v_gpu \
     -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:minicpm45v \
     -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:minicpm45v-gpu \
     -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:latest \
@@ -29,10 +29,10 @@ docker build \
     -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:minicpm45v-cpu \
     .
 
-# Build PaddleOCR-VL GPU variant (vLLM)
-echo -e "${GREEN}Building PaddleOCR-VL GPU variant (vLLM)...${NC}"
+# Build PaddleOCR-VL GPU variant
+echo -e "${GREEN}Building PaddleOCR-VL GPU variant...${NC}"
 docker build \
-    -f Dockerfile_paddleocr_vl \
+    -f Dockerfile_paddleocr_vl_gpu \
     -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:paddleocr-vl \
     -t ${REGISTRY}/${NAMESPACE}/${IMAGE_NAME}:paddleocr-vl-gpu \
     .

changelog.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 2026-01-18 - 1.8.0 - feat(paddleocr-vl)
+add structured HTML output and table parsing for PaddleOCR-VL, update API, tests, and README
+
+- Add result_to_html(), parse_markdown_table(), and parse_paddleocr_table() to emit semantic HTML and convert OCR/markdown tables to proper <table> elements
+- Enhance result_to_markdown() with positional/type hints (header/footer/title/table/figure) to improve downstream LLM processing
+- Expose 'html' in supported formats and handle output_format='html' in parse endpoints and CLI flow
+- Update tests to request HTML output and extract invoice fields from structured HTML (test/test.invoices.paddleocr-vl.ts)
+- Refresh README with usage, new images/tags, architecture notes, and troubleshooting for the updated pipeline
+
+## 2026-01-17 - 1.7.1 - fix(docker)
+standardize Dockerfile and entrypoint filenames; add GPU-specific Dockerfiles and update build and test references
+
+- Added Dockerfile_minicpm45v_gpu and image_support_files/minicpm45v_entrypoint.sh; removed the old Dockerfile_minicpm45v and docker-entrypoint.sh
+- Renamed and simplified PaddleOCR entrypoint to image_support_files/paddleocr_vl_entrypoint.sh and updated CPU/GPU Dockerfile references
+- Updated build-images.sh to use *_gpu Dockerfiles and clarified PaddleOCR GPU build log
+- Updated test/helpers/docker.ts to point to Dockerfile_minicpm45v_gpu so tests build the GPU variant
+
+## 2026-01-17 - 1.7.0 - feat(tests)
+use Qwen2.5 (Ollama) for invoice extraction tests and add helpers for model management; normalize dates and coerce numeric fields
+
+- Added ensureOllamaModel and ensureQwen25 test helpers to pull/check Ollama models via localhost:11434
+- Updated invoices test to use qwen2.5:7b instead of MiniCPM and removed image payload from the text-only extraction step
+- Increased Markdown truncate limit from 8000 to 12000 and reduced model num_predict from 2048 to 512
+- Rewrote extraction prompt to require strict JSON output and added post-processing to parse/convert numeric fields
+- Added normalizeDate and improved compareInvoice to normalize dates and handle numeric formatting/tolerance
+- Updated test setup to ensure Qwen2.5 is available and adjusted logging/messages to reflect the Qwen2.5-based workflow
+
 ## 2026-01-17 - 1.6.0 - feat(paddleocr-vl)
 add PaddleOCR-VL full pipeline Docker image and API server, plus integration tests and docker helpers
 

image_support_files/paddleocr-vl-entrypoint.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "==================================="
-echo "PaddleOCR-VL Server"
-echo "==================================="
-
-# Configuration
-MODEL_NAME="${MODEL_NAME:-PaddlePaddle/PaddleOCR-VL}"
-HOST="${HOST:-0.0.0.0}"
-PORT="${PORT:-8000}"
-MAX_BATCHED_TOKENS="${MAX_BATCHED_TOKENS:-16384}"
-GPU_MEMORY_UTILIZATION="${GPU_MEMORY_UTILIZATION:-0.9}"
-MAX_MODEL_LEN="${MAX_MODEL_LEN:-8192}"
-ENFORCE_EAGER="${ENFORCE_EAGER:-false}"
-
-echo "Model: ${MODEL_NAME}"
-echo "Host: ${HOST}"
-echo "Port: ${PORT}"
-echo "Max batched tokens: ${MAX_BATCHED_TOKENS}"
-echo "GPU memory utilization: ${GPU_MEMORY_UTILIZATION}"
-echo "Max model length: ${MAX_MODEL_LEN}"
-echo "Enforce eager: ${ENFORCE_EAGER}"
-echo ""
-
-# Check GPU availability
-if command -v nvidia-smi &> /dev/null; then
-    echo "GPU Information:"
-    nvidia-smi --query-gpu=name,memory.total,memory.free --format=csv
-    echo ""
-else
-    echo "WARNING: nvidia-smi not found. GPU may not be available."
-fi
-
-echo "Starting vLLM server..."
-echo "==================================="
-
-# Build vLLM command
-VLLM_ARGS=(
-    serve "${MODEL_NAME}"
-    --trust-remote-code
-    --host "${HOST}"
-    --port "${PORT}"
-    --max-num-batched-tokens "${MAX_BATCHED_TOKENS}"
-    --gpu-memory-utilization "${GPU_MEMORY_UTILIZATION}"
-    --max-model-len "${MAX_MODEL_LEN}"
-    --no-enable-prefix-caching
-    --mm-processor-cache-gb 0
-    --served-model-name "paddleocr-vl"
-    --limit-mm-per-prompt '{"image": 1}'
-)
-
-# Add enforce-eager if enabled (disables CUDA graphs, saves memory)
-if [ "${ENFORCE_EAGER}" = "true" ]; then
-    VLLM_ARGS+=(--enforce-eager)
-fi
-
-# Start vLLM server with PaddleOCR-VL
-exec vllm "${VLLM_ARGS[@]}"

image_support_files/paddleocr_vl_full_server.py

@@ -10,6 +10,7 @@ Provides REST API for document parsing using:
 
 import os
 import io
+import re
 import base64
 import logging
 import tempfile
@@ -261,23 +262,210 @@ def process_document(image: Image.Image) -> dict:
 
 
 def result_to_markdown(result: dict) -> str:
-    """Convert result to Markdown format"""
+    """Convert result to Markdown format with structural hints for LLM processing.
+
+    Adds positional and type-based formatting to help downstream LLMs
+    understand document structure:
+    - Tables are marked with **[TABLE]** prefix
+    - Header zone content (top 15%) is bolded
+    - Footer zone content (bottom 15%) is separated with horizontal rule
+    - Titles are formatted as # headers
+    - Figures/charts are marked with *[Figure: ...]*
+    """
     lines = []
+    image_height = result.get("image_size", [0, 1000])[1]
 
     for block in result.get("blocks", []):
-        block_type = block.get("type", "text")
-        content = block.get("content", "")
+        block_type = block.get("type", "text").lower()
+        content = block.get("content", "").strip()
+        bbox = block.get("bbox", [])
 
-        if "table" in block_type.lower():
-            lines.append(f"\n{content}\n")
-        elif "formula" in block_type.lower():
+        if not content:
+            continue
+
+        # Determine position zone (top 15%, middle, bottom 15%)
+        y_pos = bbox[1] if bbox and len(bbox) > 1 else 0
+        y_end = bbox[3] if bbox and len(bbox) > 3 else y_pos
+        is_header_zone = y_pos < image_height * 0.15
+        is_footer_zone = y_end > image_height * 0.85
+
+        # Format based on type and position
+        if "table" in block_type:
+            lines.append(f"\n**[TABLE]**\n{content}\n")
+        elif "title" in block_type:
+            lines.append(f"# {content}")
+        elif "formula" in block_type or "math" in block_type:
             lines.append(f"\n$$\n{content}\n$$\n")
+        elif "figure" in block_type or "chart" in block_type:
+            lines.append(f"*[Figure: {content}]*")
+        elif is_header_zone:
+            lines.append(f"**{content}**")
+        elif is_footer_zone:
+            lines.append(f"---\n{content}")
         else:
             lines.append(content)
 
     return "\n\n".join(lines)
 
 
+def parse_markdown_table(content: str) -> str:
+    """Convert table content to HTML table.
+
+    Handles:
+    - PaddleOCR-VL format: <fcel>cell<lcel>cell<nl> (detected by <fcel> tags)
+    - Pipe-delimited tables: | Header | Header |
+    - Separator rows: |---|---|
+    - Returns HTML <table> structure
+    """
+    content_stripped = content.strip()
+
+    # Check for PaddleOCR-VL table format (<fcel>, <lcel>, <ecel>, <nl>)
+    if '<fcel>' in content_stripped or '<nl>' in content_stripped:
+        return parse_paddleocr_table(content_stripped)
+
+    lines = content_stripped.split('\n')
+    if not lines:
+        return f'<pre>{content}</pre>'
+
+    # Check if it looks like a markdown table
+    if not any('|' in line for line in lines):
+        return f'<pre>{content}</pre>'
+
+    html_rows = []
+    is_header = True
+
+    for line in lines:
+        line = line.strip()
+        if not line or line.startswith('|') == False and '|' not in line:
+            continue
+
+        # Skip separator rows (|---|---|)
+        if re.match(r'^[\|\s\-:]+$', line):
+            is_header = False
+            continue
+
+        # Parse cells
+        cells = [c.strip() for c in line.split('|')]
+        cells = [c for c in cells if c]  # Remove empty from edges
+
+        if is_header:
+            row = '<tr>' + ''.join(f'<th>{c}</th>' for c in cells) + '</tr>'
+            html_rows.append(f'<thead>{row}</thead>')
+            is_header = False
+        else:
+            row = '<tr>' + ''.join(f'<td>{c}</td>' for c in cells) + '</tr>'
+            html_rows.append(row)
+
+    if html_rows:
+        # Wrap body rows in tbody
+        header = html_rows[0] if '<thead>' in html_rows[0] else ''
+        body_rows = [r for r in html_rows if '<thead>' not in r]
+        body = f'<tbody>{"".join(body_rows)}</tbody>' if body_rows else ''
+        return f'<table>{header}{body}</table>'
+
+    return f'<pre>{content}</pre>'
+
+
+def parse_paddleocr_table(content: str) -> str:
+    """Convert PaddleOCR-VL table format to HTML table.
+
+    PaddleOCR-VL uses:
+    - <fcel> = first cell in a row
+    - <lcel> = subsequent cells
+    - <ecel> = empty cell
+    - <nl> = row separator (newline)
+
+    Example input:
+    <fcel>Header1<lcel>Header2<nl><fcel>Value1<lcel>Value2<nl>
+    """
+    # Split into rows by <nl>
+    rows_raw = re.split(r'<nl>', content)
+    html_rows = []
+    is_first_row = True
+
+    for row_content in rows_raw:
+        row_content = row_content.strip()
+        if not row_content:
+            continue
+
+        # Extract cells: split by <fcel>, <lcel>, or <ecel>
+        # Each cell is the text between these markers
+        cells = []
+
+        # Pattern to match cell markers and capture content
+        # Content is everything between markers
+        parts = re.split(r'<fcel>|<lcel>|<ecel>', row_content)
+        for part in parts:
+            part = part.strip()
+            if part:
+                cells.append(part)
+
+        if not cells:
+            continue
+
+        # First row is header
+        if is_first_row:
+            row_html = '<tr>' + ''.join(f'<th>{c}</th>' for c in cells) + '</tr>'
+            html_rows.append(f'<thead>{row_html}</thead>')
+            is_first_row = False
+        else:
+            row_html = '<tr>' + ''.join(f'<td>{c}</td>' for c in cells) + '</tr>'
+            html_rows.append(row_html)
+
+    if html_rows:
+        header = html_rows[0] if '<thead>' in html_rows[0] else ''
+        body_rows = [r for r in html_rows if '<thead>' not in r]
+        body = f'<tbody>{"".join(body_rows)}</tbody>' if body_rows else ''
+        return f'<table>{header}{body}</table>'
+
+    return f'<pre>{content}</pre>'
+
+
+def result_to_html(result: dict) -> str:
+    """Convert result to semantic HTML for optimal LLM processing.
+
+    Uses semantic HTML5 tags with position metadata as data-* attributes.
+    Markdown tables are converted to proper HTML <table> tags for
+    unambiguous parsing by downstream LLMs.
+    """
+    parts = []
+    image_height = result.get("image_size", [0, 1000])[1]
+
+    parts.append('<!DOCTYPE html><html><body>')
+
+    for block in result.get("blocks", []):
+        block_type = block.get("type", "text").lower()
+        content = block.get("content", "").strip()
+        bbox = block.get("bbox", [])
+
+        if not content:
+            continue
+
+        # Position metadata
+        y_pos = bbox[1] / image_height if bbox and len(bbox) > 1 else 0
+        data_attrs = f'data-type="{block_type}" data-y="{y_pos:.2f}"'
+
+        # Format based on type
+        if "table" in block_type:
+            table_html = parse_markdown_table(content)
+            parts.append(f'<section {data_attrs} class="table-region">{table_html}</section>')
+        elif "title" in block_type:
+            parts.append(f'<h1 {data_attrs}>{content}</h1>')
+        elif "formula" in block_type or "math" in block_type:
+            parts.append(f'<div {data_attrs} class="formula"><code>{content}</code></div>')
+        elif "figure" in block_type or "chart" in block_type:
+            parts.append(f'<figure {data_attrs}><figcaption>{content}</figcaption></figure>')
+        elif y_pos < 0.15:
+            parts.append(f'<header {data_attrs}><strong>{content}</strong></header>')
+        elif y_pos > 0.85:
+            parts.append(f'<footer {data_attrs}>{content}</footer>')
+        else:
+            parts.append(f'<p {data_attrs}>{content}</p>')
+
+    parts.append('</body></html>')
+    return '\n'.join(parts)
+
+
 # Request/Response models
 class ParseRequest(BaseModel):
     image: str  # base64 encoded image
@@ -331,7 +519,7 @@ async def health_check():
 async def supported_formats():
     """List supported output formats"""
     return {
-        "output_formats": ["json", "markdown"],
+        "output_formats": ["json", "markdown", "html"],
         "image_formats": ["PNG", "JPEG", "WebP", "BMP", "GIF", "TIFF"],
         "capabilities": [
             "Layout detection (PP-DocLayoutV2)",
@@ -356,6 +544,9 @@ async def parse_document_endpoint(request: ParseRequest):
         if request.output_format == "markdown":
             markdown = result_to_markdown(result)
             output = {"markdown": markdown}
+        elif request.output_format == "html":
+            html = result_to_html(result)
+            output = {"html": html}
         else:
             output = result
 
@@ -408,6 +599,8 @@ async def chat_completions(request: dict):
 
         if output_format == "markdown":
             content = result_to_markdown(result)
+        elif output_format == "html":
+            content = result_to_html(result)
         else:
             content = json.dumps(result, ensure_ascii=False, indent=2)
 

package.json

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

readme.md

@@ -1,23 +1,40 @@
-# @host.today/ht-docker-ai
+# @host.today/ht-docker-ai 🚀
 
-Docker images for AI vision-language models, starting with MiniCPM-V 4.5.
+Production-ready Docker images for state-of-the-art AI Vision-Language Models. Run powerful multimodal AI locally with GPU acceleration or CPU fallback—no cloud API keys required.
 
-## Overview
+## Issue Reporting and Security
 
-This project provides ready-to-use Docker containers for running state-of-the-art AI vision-language models. Built on Ollama for simplified model management and a consistent REST API.
+For reporting bugs, issues, or security vulnerabilities, please visit [community.foss.global/](https://community.foss.global/). This is the central community hub for all issue reporting. Developers who sign and comply with our contribution agreement and go through identification can also get a [code.foss.global/](https://code.foss.global/) account to submit Pull Requests directly.
 
-## Available Images
+## 🎯 What's Included
 
-| Tag | Description | Requirements |
-|-----|-------------|--------------|
-| `minicpm45v` | MiniCPM-V 4.5 with GPU support | NVIDIA GPU, 9-18GB VRAM |
-| `minicpm45v-cpu` | MiniCPM-V 4.5 CPU-only | 8GB+ RAM |
-| `latest` | Alias for `minicpm45v` | NVIDIA GPU |
+| Model | Parameters | Best For | API |
+|-------|-----------|----------|-----|
+| **MiniCPM-V 4.5** | 8B | General vision understanding, image analysis, multi-image | Ollama-compatible |
+| **PaddleOCR-VL** | 0.9B | Document parsing, table extraction, OCR | OpenAI-compatible |
 
-## Quick Start
+## 📦 Available Images
 
-### GPU (Recommended)
+```
+code.foss.global/host.today/ht-docker-ai:<tag>
+```
 
+| Tag | Model | Hardware | Port |
+|-----|-------|----------|------|
+| `minicpm45v` / `latest` | MiniCPM-V 4.5 | NVIDIA GPU (9-18GB VRAM) | 11434 |
+| `minicpm45v-cpu` | MiniCPM-V 4.5 | CPU only (8GB+ RAM) | 11434 |
+| `paddleocr-vl` / `paddleocr-vl-gpu` | PaddleOCR-VL | NVIDIA GPU | 8000 |
+| `paddleocr-vl-cpu` | PaddleOCR-VL | CPU only | 8000 |
+
+---
+
+## 🖼️ MiniCPM-V 4.5
+
+A GPT-4o level multimodal LLM from OpenBMB—handles image understanding, OCR, multi-image analysis, and visual reasoning across 30+ languages.
+
+### Quick Start
+
+**GPU (Recommended):**
 ```bash
 docker run -d \
   --name minicpm \
@@ -27,8 +44,7 @@ docker run -d \
   code.foss.global/host.today/ht-docker-ai:minicpm45v
 ```
 
-### CPU Only
-
+**CPU Only:**
 ```bash
 docker run -d \
   --name minicpm \
@@ -37,18 +53,16 @@ docker run -d \
   code.foss.global/host.today/ht-docker-ai:minicpm45v-cpu
 ```
 
-## API Usage
+> 💡 **Pro tip:** Mount the volume to persist downloaded models (~5GB). Without it, models re-download on every container start.
 
-The container exposes the Ollama API on port 11434.
-
-### List Available Models
+### API Examples
 
+**List models:**
 ```bash
 curl http://localhost:11434/api/tags
 ```
 
-### Generate Text from Image
-
+**Analyze an image:**
 ```bash
 curl http://localhost:11434/api/generate -d '{
   "model": "minicpm-v",
@@ -57,60 +71,128 @@ curl http://localhost:11434/api/generate -d '{
 }'
 ```
 
-### Chat with Vision
-
+**Chat with vision:**
 ```bash
 curl http://localhost:11434/api/chat -d '{
   "model": "minicpm-v",
-  "messages": [
-    {
-      "role": "user",
-      "content": "Describe this image in detail",
-      "images": ["<base64-encoded-image>"]
-    }
-  ]
+  "messages": [{
+    "role": "user",
+    "content": "Describe this image in detail",
+    "images": ["<base64-encoded-image>"]
+  }]
 }'
 ```
 
-## Environment Variables
+### Hardware Requirements
 
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `MODEL_NAME` | `minicpm-v` | Model to pull on startup |
-| `OLLAMA_HOST` | `0.0.0.0` | Host address for API |
-| `OLLAMA_ORIGINS` | `*` | Allowed CORS origins |
+| Variant | VRAM/RAM | Notes |
+|---------|----------|-------|
+| GPU (int4 quantized) | 9GB VRAM | Recommended for most use cases |
+| GPU (full precision) | 18GB VRAM | Maximum quality |
+| CPU (GGUF) | 8GB+ RAM | Slower but accessible |
 
-## Hardware Requirements
+---
 
-### GPU Variant (`minicpm45v`)
+## 📄 PaddleOCR-VL
 
-- NVIDIA GPU with CUDA support
-- Minimum 9GB VRAM (int4 quantized)
-- Recommended 18GB VRAM (full precision)
-- NVIDIA Container Toolkit installed
+A specialized 0.9B Vision-Language Model optimized for document parsing. Native support for tables, formulas, charts, and text extraction in 109 languages.
 
-### CPU Variant (`minicpm45v-cpu`)
+### Quick Start
 
-- Minimum 8GB RAM
-- Recommended 16GB+ RAM for better performance
-- No GPU required
+**GPU:**
+```bash
+docker run -d \
+  --name paddleocr \
+  --gpus all \
+  -p 8000:8000 \
+  -v hf-cache:/root/.cache/huggingface \
+  code.foss.global/host.today/ht-docker-ai:paddleocr-vl
+```
 
-## Model Information
+**CPU:**
+```bash
+docker run -d \
+  --name paddleocr \
+  -p 8000:8000 \
+  -v hf-cache:/root/.cache/huggingface \
+  code.foss.global/host.today/ht-docker-ai:paddleocr-vl-cpu
+```
 
-**MiniCPM-V 4.5** is a GPT-4o level multimodal large language model developed by OpenBMB.
+### OpenAI-Compatible API
 
-- **Parameters**: 8B (Qwen3-8B + SigLIP2-400M)
-- **Capabilities**: Image understanding, OCR, multi-image analysis
-- **Languages**: 30+ languages including English, Chinese, French, Spanish
+PaddleOCR-VL exposes a fully OpenAI-compatible `/v1/chat/completions` endpoint:
 
-## Docker Compose Example
+```bash
+curl http://localhost:8000/v1/chat/completions \
+  -H "Content-Type: application/json" \
+  -d '{
+    "model": "paddleocr-vl",
+    "messages": [{
+      "role": "user",
+      "content": [
+        {"type": "image_url", "image_url": {"url": "data:image/png;base64,<base64>"}},
+        {"type": "text", "text": "Table Recognition:"}
+      ]
+    }],
+    "max_tokens": 8192
+  }'
+```
+
+### Task Prompts
+
+| Prompt | Output | Use Case |
+|--------|--------|----------|
+| `OCR:` | Plain text | General text extraction |
+| `Table Recognition:` | Markdown table | Invoices, bank statements, spreadsheets |
+| `Formula Recognition:` | LaTeX | Math equations, scientific notation |
+| `Chart Recognition:` | Description | Graphs and visualizations |
+
+### API Endpoints
+
+| Endpoint | Method | Description |
+|----------|--------|-------------|
+| `/health` | GET | Health check with model/device info |
+| `/formats` | GET | Supported image formats and input methods |
+| `/v1/models` | GET | List available models |
+| `/v1/chat/completions` | POST | OpenAI-compatible chat completions |
+| `/ocr` | POST | Legacy OCR endpoint |
+
+### Image Input Methods
+
+PaddleOCR-VL accepts images in multiple formats:
+
+```javascript
+// Base64 data URL
+"data:image/png;base64,iVBORw0KGgo..."
+
+// HTTP URL
+"https://example.com/document.png"
+
+// Raw base64
+"iVBORw0KGgo..."
+```
+
+**Supported formats:** PNG, JPEG, WebP, BMP, GIF, TIFF
+
+**Optimal resolution:** 1080p–2K. Images are automatically scaled for best results.
+
+### Performance
+
+| Mode | Speed per Page |
+|------|----------------|
+| GPU (CUDA) | 2–5 seconds |
+| CPU | 30–60 seconds |
+
+---
+
+## 🐳 Docker Compose
 
 ```yaml
 version: '3.8'
 services:
+  # General vision tasks
   minicpm:
     image: code.foss.global/host.today/ht-docker-ai:minicpm45v
-    container_name: minicpm
     ports:
       - "11434:11434"
     volumes:
@@ -124,11 +206,50 @@ services:
               capabilities: [gpu]
     restart: unless-stopped
 
+  # Document parsing / OCR
+  paddleocr:
+    image: code.foss.global/host.today/ht-docker-ai:paddleocr-vl
+    ports:
+      - "8000:8000"
+    volumes:
+      - hf-cache:/root/.cache/huggingface
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
+    restart: unless-stopped
+
 volumes:
   ollama-data:
+  hf-cache:
 ```
 
-## Building Locally
+---
+
+## ⚙️ Environment Variables
+
+### MiniCPM-V 4.5
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `MODEL_NAME` | `minicpm-v` | Ollama model to pull on startup |
+| `OLLAMA_HOST` | `0.0.0.0` | API bind address |
+| `OLLAMA_ORIGINS` | `*` | Allowed CORS origins |
+
+### PaddleOCR-VL
+
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `MODEL_NAME` | `PaddlePaddle/PaddleOCR-VL` | HuggingFace model ID |
+| `SERVER_HOST` | `0.0.0.0` | API bind address |
+| `SERVER_PORT` | `8000` | API port |
+
+---
+
+## 🔧 Building from Source
 
 ```bash
 # Clone the repository
@@ -142,6 +263,77 @@ cd ht-docker-ai
 ./test-images.sh
 ```
 
-## License
+---
 
-MIT - Task Venture Capital GmbH
+## 🏗️ Architecture Notes
+
+### Dual-VLM Consensus Strategy
+
+For production document extraction, consider using both models together:
+
+1. **Pass 1:** MiniCPM-V visual extraction (images → JSON)
+2. **Pass 2:** PaddleOCR-VL table recognition (images → markdown → JSON)
+3. **Consensus:** If results match → Done (fast path)
+4. **Pass 3+:** Additional visual passes if needed
+
+This dual-VLM approach catches extraction errors that single models miss.
+
+### Why This Works
+
+- **Different architectures:** Two independent models cross-validate each other
+- **Specialized strengths:** PaddleOCR-VL excels at tables; MiniCPM-V handles general vision
+- **Native processing:** Both VLMs see original images—no intermediate HTML/structure loss
+
+---
+
+## 🔍 Troubleshooting
+
+### Model download hangs
+```bash
+docker logs -f <container-name>
+```
+Model downloads can take several minutes (~5GB for MiniCPM-V).
+
+### Out of memory
+- **GPU:** Use the CPU variant or upgrade VRAM
+- **CPU:** Increase container memory: `--memory=16g`
+
+### API not responding
+1. Check container health: `docker ps`
+2. Review logs: `docker logs <container>`
+3. Verify port: `curl localhost:11434/api/tags` or `curl localhost:8000/health`
+
+### Enable NVIDIA GPU support on host
+```bash
+# Install NVIDIA Container Toolkit
+curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg
+curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \
+  sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \
+  sudo tee /etc/apt/sources.list.d/nvidia-container-toolkit.list
+sudo apt-get update && sudo apt-get install -y nvidia-container-toolkit
+sudo nvidia-ctk runtime configure --runtime=docker
+sudo systemctl restart docker
+```
+
+---
+
+## License and Legal Information
+
+This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./LICENSE) file.
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH or third parties, and are not included within the scope of the MIT license granted herein.
+
+Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines or the guidelines of the respective third-party owners, and any usage must be approved in writing. Third-party trademarks used herein are the property of their respective owners and used only in a descriptive manner, e.g. for an implementation of an API or similar.
+
+### Company Information
+
+Task Venture Capital GmbH
+Registered at District Court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

test/helpers/docker.ts

@@ -49,7 +49,7 @@ export const IMAGES = {
 
   minicpm: {
     name: 'minicpm45v',
-    dockerfile: 'Dockerfile_minicpm45v',
+    dockerfile: 'Dockerfile_minicpm45v_gpu',
     buildContext: '.',
     containerName: 'minicpm-test',
     ports: ['11434:11434'],
@@ -295,3 +295,66 @@ export async function ensurePaddleOcrVlFull(): Promise<boolean> {
   }
   return ensureService(IMAGES.paddleocrVlFull);
 }
+
+/**
+ * Ensure an Ollama model is pulled and available
+ * Uses the MiniCPM container (which runs Ollama) to pull the model
+ */
+export async function ensureOllamaModel(modelName: string): Promise<boolean> {
+  const OLLAMA_URL = 'http://localhost:11434';
+
+  console.log(`\n[Ollama] Ensuring model: ${modelName}`);
+
+  // Check if model exists
+  try {
+    const response = await fetch(`${OLLAMA_URL}/api/tags`);
+    if (response.ok) {
+      const data = await response.json();
+      const models = data.models || [];
+      const exists = models.some((m: { name: string }) =>
+        m.name === modelName || m.name.startsWith(modelName.split(':')[0])
+      );
+
+      if (exists) {
+        console.log(`[Ollama] Model already available: ${modelName}`);
+        return true;
+      }
+    }
+  } catch {
+    console.log(`[Ollama] Cannot check models, Ollama may not be running`);
+    return false;
+  }
+
+  // Pull the model
+  console.log(`[Ollama] Pulling model: ${modelName} (this may take a while)...`);
+  try {
+    const response = await fetch(`${OLLAMA_URL}/api/pull`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ name: modelName, stream: false }),
+    });
+
+    if (response.ok) {
+      console.log(`[Ollama] Model pulled successfully: ${modelName}`);
+      return true;
+    } else {
+      console.log(`[Ollama] Failed to pull model: ${response.status}`);
+      return false;
+    }
+  } catch (err) {
+    console.log(`[Ollama] Error pulling model: ${err}`);
+    return false;
+  }
+}
+
+/**
+ * Ensure Qwen2.5 7B model is available (for text-only JSON extraction)
+ */
+export async function ensureQwen25(): Promise<boolean> {
+  // First ensure the Ollama service (MiniCPM container) is running
+  const ollamaOk = await ensureMiniCpm();
+  if (!ollamaOk) return false;
+
+  // Then ensure the Qwen2.5 model is pulled
+  return ensureOllamaModel('qwen2.5:7b');
+}

test/test.invoices.paddleocr-vl.ts

@@ -4,22 +4,25 @@
  * This tests the complete PaddleOCR-VL pipeline:
  *   1. PP-DocLayoutV2 for layout detection
  *   2. PaddleOCR-VL for recognition
- *   3. Structured Markdown output
- *   4. MiniCPM extracts invoice fields from structured Markdown
+ *   3. Structured HTML output (semantic tags with proper tables)
+ *   4. Qwen2.5 extracts invoice fields from structured HTML
  *
- * The structured Markdown has proper tables and formatting,
- * making it much easier for MiniCPM to extract invoice data.
+ * HTML output is used instead of Markdown because:
+ * - <table> tags are unambiguous (no parser variations)
+ * - LLMs are heavily trained on web/HTML data
+ * - Semantic tags (header, footer, section) provide clear structure
  */
 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 { ensurePaddleOcrVlFull, ensureMiniCpm } from './helpers/docker.js';
+import { ensurePaddleOcrVlFull, ensureQwen25 } from './helpers/docker.js';
 
 const PADDLEOCR_VL_URL = 'http://localhost:8000';
 const OLLAMA_URL = 'http://localhost:11434';
-const MINICPM_MODEL = 'minicpm-v:latest';
+// Use Qwen2.5 for text-only JSON extraction (not MiniCPM which is vision-focused)
+const TEXT_MODEL = 'qwen2.5:7b';
 
 interface IInvoice {
   invoice_number: string;
@@ -60,7 +63,7 @@ function convertPdfToImages(pdfPath: string): string[] {
 }
 
 /**
- * Parse document using PaddleOCR-VL Full Pipeline (returns structured Markdown)
+ * Parse document using PaddleOCR-VL Full Pipeline (returns structured HTML)
  */
 async function parseDocument(imageBase64: string): Promise<string> {
   const response = await fetch(`${PADDLEOCR_VL_URL}/parse`, {
@@ -68,7 +71,7 @@ async function parseDocument(imageBase64: string): Promise<string> {
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({
       image: imageBase64,
-      output_format: 'markdown',
+      output_format: 'html',
     }),
   });
 
@@ -83,46 +86,57 @@ async function parseDocument(imageBase64: string): Promise<string> {
     throw new Error(`PaddleOCR-VL error: ${data.error}`);
   }
 
-  return data.result?.markdown || '';
+  return data.result?.html || '';
 }
 
 /**
- * Extract invoice fields from structured Markdown using MiniCPM with image context
+ * Extract invoice fields from structured HTML using Qwen2.5 (text-only model)
  */
-async function extractInvoiceFromMarkdown(markdown: string, images: string[]): Promise<IInvoice> {
-  // Truncate if too long
-  const truncated = markdown.length > 8000 ? markdown.slice(0, 8000) : markdown;
-  console.log(`    [Extract] Processing ${truncated.length} chars of Markdown`);
+async function extractInvoiceFromHtml(html: string): Promise<IInvoice> {
+  // Truncate if too long (HTML is more valuable per byte, allow more)
+  const truncated = html.length > 16000 ? html.slice(0, 16000) : html;
+  console.log(`    [Extract] Processing ${truncated.length} chars of HTML`);
 
-  const prompt = `/nothink
-You are an invoice parser. Extract fields from this invoice image.
+  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.
+
+The HTML uses semantic tags:
+- <table> with <thead>/<tbody> for structured tables (invoice line items, totals)
+- <header> for document header (company info, invoice number)
+- <footer> for document footer (payment terms, legal text)
+- <section class="table-region"> for table regions
+- data-type and data-y attributes indicate block type and vertical position
 
 Required fields:
-- invoice_number: The invoice/receipt number
-- invoice_date: Date in YYYY-MM-DD format
+- invoice_number: The invoice/receipt/document number
+- invoice_date: Date in YYYY-MM-DD format (convert from any format)
 - vendor_name: Company that issued the invoice
-- currency: EUR, USD, etc.
-- net_amount: Amount before tax
-- vat_amount: Tax/VAT amount (0 if reverse charge)
-- total_amount: Final amount due
+- 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)
 
-Return ONLY a JSON object like:
-{"invoice_number":"123","invoice_date":"2022-01-28","vendor_name":"Adobe","currency":"EUR","net_amount":24.99,"vat_amount":0,"total_amount":24.99}
+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}
 
-Use null for missing strings, 0 for missing numbers. No explanation.
+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"
 
-OCR text from the invoice (for reference):
----
+HTML Document:
 ${truncated}
----`;
+
+JSON:`;
 
   const payload = {
-    model: MINICPM_MODEL,
+    model: TEXT_MODEL,
     prompt,
-    images,  // Send the actual image to MiniCPM
     stream: true,
     options: {
-      num_predict: 2048,
+      num_predict: 512,
       temperature: 0.1,
     },
   };
@@ -173,26 +187,41 @@ ${truncated}
   }
 
   const jsonStr = fullText.substring(startIdx, endIdx);
-  return JSON.parse(jsonStr);
+  const parsed = JSON.parse(jsonStr);
+
+  // Ensure numeric fields are actually numbers
+  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,
+  };
 }
 
 /**
- * Single extraction pass: Parse with PaddleOCR-VL Full, extract with MiniCPM
+ * Single extraction pass: Parse with PaddleOCR-VL Full, extract with Qwen2.5 (text-only)
  */
 async function extractOnce(images: string[], passNum: number): Promise<IInvoice> {
-  // Parse document with full pipeline
-  const markdown = await parseDocument(images[0]);
-  console.log(`    [Parse] Got ${markdown.split('\n').length} lines of Markdown`);
+  // Parse document with full pipeline (PaddleOCR-VL) -> returns HTML
+  const html = await parseDocument(images[0]);
+  console.log(`    [Parse] Got ${html.split('\n').length} lines of HTML`);
 
-  // Extract invoice fields from Markdown with image context
-  return extractInvoiceFromMarkdown(markdown, images);
+  // Extract invoice fields from HTML using text-only model (no images)
+  return extractInvoiceFromHtml(html);
 }
 
 /**
  * Create a hash of invoice for comparison (using key fields)
  */
 function hashInvoice(invoice: IInvoice): string {
-  return `${invoice.invoice_number}|${invoice.invoice_date}|${invoice.total_amount.toFixed(2)}`;
+  // Ensure total_amount is a number
+  const amount = typeof invoice.total_amount === 'number'
+    ? invoice.total_amount.toFixed(2)
+    : String(invoice.total_amount || 0);
+  return `${invoice.invoice_number}|${invoice.invoice_date}|${amount}`;
 }
 
 /**
@@ -243,6 +272,43 @@ async function extractWithConsensus(images: string[], invoiceName: string, maxPa
   return best.invoice;
 }
 
+/**
+ * Normalize date to YYYY-MM-DD format
+ */
+function normalizeDate(dateStr: string | null): string {
+  if (!dateStr) return '';
+
+  // Already in correct format
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) {
+    return dateStr;
+  }
+
+  // Handle DD-MMM-YYYY format (e.g., "28-JUN-2022")
+  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',
+  };
+
+  const match = dateStr.match(/^(\d{1,2})-([A-Z]{3})-(\d{4})$/i);
+  if (match) {
+    const day = match[1].padStart(2, '0');
+    const month = monthMap[match[2].toUpperCase()] || '01';
+    const year = match[3];
+    return `${year}-${month}-${day}`;
+  }
+
+  // Handle DD/MM/YYYY or DD.MM.YYYY
+  const match2 = dateStr.match(/^(\d{1,2})[\/.](\d{1,2})[\/.](\d{4})$/);
+  if (match2) {
+    const day = match2[1].padStart(2, '0');
+    const month = match2[2].padStart(2, '0');
+    const year = match2[3];
+    return `${year}-${month}-${day}`;
+  }
+
+  return dateStr;
+}
+
 /**
  * Compare extracted invoice against expected
  */
@@ -259,8 +325,10 @@ function compareInvoice(
     errors.push(`invoice_number: expected "${expected.invoice_number}", got "${extracted.invoice_number}"`);
   }
 
-  // Compare date
-  if (extracted.invoice_date !== expected.invoice_date) {
+  // Compare date (normalize format first)
+  const extDate = normalizeDate(extracted.invoice_date);
+  const expDate = normalizeDate(expected.invoice_date);
+  if (extDate !== expDate) {
     errors.push(`invoice_date: expected "${expected.invoice_date}", got "${extracted.invoice_date}"`);
   }
 
@@ -317,9 +385,9 @@ tap.test('setup: ensure Docker containers are running', async () => {
   const paddleOk = await ensurePaddleOcrVlFull();
   expect(paddleOk).toBeTrue();
 
-  // Ensure MiniCPM is running (for field extraction from Markdown)
-  const minicpmOk = await ensureMiniCpm();
-  expect(minicpmOk).toBeTrue();
+  // Ensure Qwen2.5 is available (for text-only JSON extraction)
+  const qwenOk = await ensureQwen25();
+  expect(qwenOk).toBeTrue();
 
   console.log('\n[Setup] All containers ready!\n');
 });
@@ -380,7 +448,7 @@ tap.test('summary', async () => {
   console.log(`\n======================================================`);
   console.log(`   Invoice Extraction Summary (PaddleOCR-VL Full)`);
   console.log(`======================================================`);
-  console.log(`  Method:    PaddleOCR-VL Full Pipeline -> MiniCPM`);
+  console.log(`  Method:    PaddleOCR-VL Full Pipeline (HTML) -> Qwen2.5 (text-only)`);
   console.log(`  Passed:    ${passedCount}/${totalInvoices}`);
   console.log(`  Failed:    ${failedCount}/${totalInvoices}`);
   console.log(`  Accuracy:  ${accuracy.toFixed(1)}%`);