diff --git a/packages/extraction/tests/container-client.mjs b/packages/extraction/tests/container-client.mjs index d053a9e9..3285a364 100644 --- a/packages/extraction/tests/container-client.mjs +++ b/packages/extraction/tests/container-client.mjs @@ -72,6 +72,21 @@ assert.equal( .segments[0].text, 'Compressed page text' ); +const wrappedTable = await send( + 'pdf', + readFileSync(`${fixtures}/wrapped-table.pdf`) +); +assert.equal(wrappedTable.status, 200); +assert.equal(wrappedTable.value.segments.length, 1); +assert.equal(wrappedTable.value.segments[0].kind, 'page'); +assert.equal(wrappedTable.value.segments[0].index, 1); +assert.deepEqual(wrappedTable.value.segments[0].text.trim().split(/\s+/), [ + 'Row', + 'Alpha', + 'Beta', + 'Gamma', + 'Delta', +]); const docx = await send('docx', readFileSync(`${fixtures}/body.docx`)); assert.equal(docx.status, 200); assert.deepEqual(docx.value.segments, [ diff --git a/packages/extraction/tests/fixtures/generate.py b/packages/extraction/tests/fixtures/generate.py index 70f01625..b16d8cda 100644 --- a/packages/extraction/tests/fixtures/generate.py +++ b/packages/extraction/tests/fixtures/generate.py @@ -21,6 +21,31 @@ def pdf(name, pages, compressed=False, padding=0): with (root / name).open('wb') as file: writer.write(file) +def wrapped_table_pdf(): + # Adjacent cells wrap above and below the row label's baseline. Keep every + # word separate even when the extractor keeps the fragments on one line. + writer = PdfWriter() + page = writer.add_blank_page(width=612, height=792) + font = writer._add_object(DictionaryObject({ + NameObject('/Type'): NameObject('/Font'), NameObject('/Subtype'): NameObject('/Type1'), + NameObject('/BaseFont'): NameObject('/Helvetica'), + NameObject('/Encoding'): NameObject('/WinAnsiEncoding'), + })) + page[NameObject('/Resources')] = DictionaryObject({NameObject('/Font'): DictionaryObject({NameObject('/F1'): font})}) + stream = DecodedStreamObject() + stream.set_data( + b'BT /F1 10 Tf ' + b'1 0 0 1 72 700 Tm (Row) Tj ' + b'1 0 0 1 160 706 Tm (Alpha) Tj ' + b'1 0 0 1 160 694 Tm (Beta) Tj ' + b'1 0 0 1 240 706 Tm (Gamma) Tj ' + b'1 0 0 1 240 694 Tm (Delta) Tj ET' + ) + page[NameObject('/Contents')] = writer._add_object(stream) + with (root / 'wrapped-table.pdf').open('wb') as file: + writer.write(file) + +wrapped_table_pdf() pdf('pages.pdf', ['First page text', 'Second page text']) pdf('compressed.pdf', ['Compressed page text'], True) pdf('empty.pdf', ['']) diff --git a/packages/extraction/tests/fixtures/wrapped-table.pdf b/packages/extraction/tests/fixtures/wrapped-table.pdf new file mode 100644 index 00000000..e0096e89 Binary files /dev/null and b/packages/extraction/tests/fixtures/wrapped-table.pdf differ diff --git a/packages/extraction/worker/requirements.txt b/packages/extraction/worker/requirements.txt index e0164d24..78ea721c 100644 --- a/packages/extraction/worker/requirements.txt +++ b/packages/extraction/worker/requirements.txt @@ -1,4 +1,4 @@ -pypdf==6.21.4 +pypdf==7.1.0 python-docx==1.2.0 lxml==6.1.3 typing_extensions==4.15.0