Files
accounted/extensions/general/mcp-server/supplier-candidates.ts
T
4300cb711b fix(inbox): match suppliers on VAT number, not just org-nr and name (#1630)
An extracted document auto-links to a supplier by org_number, then by an
exact (case-insensitive) name match. The extractor deliberately leaves
orgNumber null unless the document carries a real Swedish
organisationsnummer, so for every foreign supplier the name was the only
key left: "ADOBE SYSTEMS SOFTWARE IRELAND LTD" prints nothing but a
momsregistreringsnummer (IE6364992H), which the suppliers table already
stores in vat_number and which no code path looked at.

Adds vat_number as a match key between org_number and name, and collapses
the five inlined copies of the lookup into lib/suppliers/match-supplier.ts:

- invoice-inbox upload (sync and deferred worker)
- invoice-inbox PUT /items/:id/extracted-data
- MCP createDocumentInboxItem (org-nr only until now: gains VAT and name)
- MCP gnubok_set_inbox_extracted_data
- MCP gnubok_create_supplier_invoice_from_inbox, which additionally read
  supplierExt.organizationNumber, a key the extraction schema never
  writes, so its org-nr lookup could not fire at all

VAT numbers are compared on a canonical key (uppercased alphanumerics), so
formatting variants match and a prefix-less "556012579001" still matches
"SE556012579001"; two different country prefixes never do.

Also escapes LIKE metacharacters in the name lookup, so a supplier named
"100 % Solutions" is no longer a wildcard pattern.

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com>
2026-08-17 14:52:50 +02:00

153 lines
4.8 KiB
TypeScript

/**
* Fuzzy supplier-candidate matching for gnubok_create_supplier_invoice_from_inbox.
*
* Exact resolution (matched id → org_number → full-name ilike) misses the
* common OCR variants: punctuation ("Polarn O. Pyret" vs "Polarn o Pyret"),
* legal-form suffixes ("… AB"), and formatted org numbers ("556677-8899" vs
* "5566778899"). When resolution fails, the tool surfaces near-miss candidates
* from these matchers so the agent can retry with supplier_id_override instead
* of dead-ending: the agent (or the approving human) makes the final call,
* fuzzy scores never auto-resolve.
*/
import { vatNumbersMatch } from '@/lib/suppliers/match-supplier'
export type SupplierRow = {
id: string
name: string
org_number: string | null
vat_number?: string | null
}
export type SupplierCandidate = {
supplier_id: string
name: string
org_number: string | null
score: number
matched_on: 'org_number' | 'vat_number' | 'name'
}
// Legal-form suffixes carry no identity signal and OCR/extraction includes
// them inconsistently. Longest-first so 'aktiebolag' is stripped before 'ab'.
const LEGAL_SUFFIXES = [
'ekonomisk förening',
'kommanditbolag',
'handelsbolag',
'aktiebolag',
'ek för',
'filial',
'ekf',
'ab',
'hb',
'kb',
]
export function normalizeSupplierName(raw: string): string {
let s = raw
.toLowerCase()
// Punctuation → space; keep letters (incl. åäöé), digits, ampersand.
.replace(/[^a-z0-9åäöéü&]+/gi, ' ')
.replace(/\s+/g, ' ')
.trim()
for (const suffix of LEGAL_SUFFIXES) {
if (s.endsWith(` ${suffix}`)) {
s = s.slice(0, -suffix.length - 1).trim()
break
}
}
return s
}
function digitsOnly(s: string): string {
return s.replace(/\D/g, '')
}
/**
* Canonical 10-digit key for a Swedish org number. Orgnr is exactly 10
* significant digits; enskild firma uses the owner's personnummer, which
* appears in both 10-digit (YYMMDDXXXX) and 12-digit (YYYYMMDDXXXX) forms:
* the last 10 digits are the same identifier. Anything else is not a Swedish
* org number and must not fuzzy-match.
*/
export function orgNumberKey(raw: string): string | null {
const d = digitsOnly(raw)
if (d.length === 10) return d
if (d.length === 12) return d.slice(-10)
return null
}
/**
* Similarity in [0, 1]. Exact normalized match = 1; containment
* ("polarn o pyret" ⊂ "polarn o pyret sverige") = 0.9; otherwise token
* Jaccard scaled to max 0.8 so partial overlaps never outrank containment.
*/
export function scoreSupplierName(a: string, b: string): number {
const na = normalizeSupplierName(a)
const nb = normalizeSupplierName(b)
if (!na || !nb) return 0
if (na === nb) return 1
if (na.includes(nb) || nb.includes(na)) return 0.9
const ta = new Set(na.split(' '))
const tb = new Set(nb.split(' '))
let intersection = 0
for (const t of ta) if (tb.has(t)) intersection++
const union = new Set([...ta, ...tb]).size
return union === 0 ? 0 : Math.round((intersection / union) * 0.8 * 100) / 100
}
export function findSupplierCandidates(
suppliers: SupplierRow[],
extractedName: string | null,
extractedOrgNumber: string | null,
extractedVatNumber: string | null = null,
options: { limit?: number; minScore?: number } = {},
): SupplierCandidate[] {
const limit = options.limit ?? 5
const minScore = options.minScore ?? 0.4
const extractedOrgKey = extractedOrgNumber ? orgNumberKey(extractedOrgNumber) : null
const scored: SupplierCandidate[] = []
for (const s of suppliers) {
// Canonical-key equality catches formatting variants ('556677-8899' vs
// '5566778899') and the 10- vs 12-digit personnummer forms of enskild
// firma org numbers: none of which the exact .eq() lookup upstream can.
if (extractedOrgKey && s.org_number && orgNumberKey(s.org_number) === extractedOrgKey) {
scored.push({
supplier_id: s.id,
name: s.name,
org_number: s.org_number,
score: 1,
matched_on: 'org_number',
})
continue
}
// The only identifier a foreign supplier prints: extraction leaves
// orgNumber null for non-Swedish entities by design, so without this a
// renamed EU supplier has no exact key left at all.
if (extractedVatNumber && vatNumbersMatch(s.vat_number, extractedVatNumber)) {
scored.push({
supplier_id: s.id,
name: s.name,
org_number: s.org_number,
score: 1,
matched_on: 'vat_number',
})
continue
}
if (extractedName) {
const score = scoreSupplierName(extractedName, s.name)
if (score >= minScore) {
scored.push({
supplier_id: s.id,
name: s.name,
org_number: s.org_number,
score,
matched_on: 'name',
})
}
}
}
return scored.sort((a, b) => b.score - a.score).slice(0, limit)
}