mirror of
https://github.com/VectifyAI/PageIndex.git
synced 2026-07-15 21:11:05 +02:00
Addresses items 9-13 and a/b/c/f from the max-effort review of PR #272. - pdf.py: image colorspace check was `pix.n > 4`, which treats CMYK-without- alpha (n==4, same as RGBA) as not needing RGB conversion; pix.save() as .png then raises "unsupported colorspace", silently dropped by the surrounding except. Fixed to `pix.n - pix.alpha >= 4` (correctly converts CMYK, leaves RGBA untouched). - pipeline.py: detect_strategy([]) (an empty/whitespace-only source file) returned "content_based", routing into the PDF-oriented TOC-detection pipeline -- wasting a real LLM call before raising IndexingError. Empty node lists now route to level_based, whose build_tree_from_levels([]) returns an empty structure instantly with zero LLM calls. - page_index.py (shim): pageindex/__init__.py binds the canonical `page_index` function as the package attribute, but this file is ALSO a real submodule of the same name -- importing it anywhere (import machinery, unconditional) overwrites that attribute with the module object, breaking `from pageindex import page_index; page_index(x)` for the rest of the process. Made the shim module itself callable (delegates to the real function via a ModuleType subclass), so whichever object ends up in that slot is callable regardless of import order. - storage/sqlite.py: create_collection let a raw sqlite3.IntegrityError escape on a duplicate name (new CollectionAlreadyExistsError); the collections table's CHECK constraint only validated the name's first character (GLOB '*' is a wildcard, not a regex quantifier over the preceding class) -- fixed to validate the whole string, and SQLiteStorage now also validates in Python (it's a public StorageEngine usable directly, bypassing LocalBackend's own check). - tests/test_review_fixes_2.py: two tests used a ContentNode with no `level` set, so build_index took the content_based path and made real (retried, slow, and -- with a valid key -- billable) LLM calls instead of testing the text-stripping logic they claimed to. Mocked out _content_based_pipeline. - retrieve.py: _parse_pages/_get_pdf_page_content were independent copies of the canonical parse_pages/get_pdf_page_content that had already drifted (missing the p>=1 filter and 1000-page DoS cap) -- delegate to canonical now, so the legacy pageindex.get_page_content path can't silently regress again. - parser/markdown.py: a leading UTF-8 BOM broke first-header detection (not whitespace, .strip() doesn't remove it) -- decode utf-8-sig. Only backtick fences were recognized as code blocks, so a '#'-prefixed line inside a ~~~-fenced block (valid CommonMark) was misparsed as a heading -- recognize both fence styles. - run_pageindex.py: --if-thinning wasn't migrated to the bare-flag + legacy-yes/no convention the other four --if-add-* flags got; bare usage raised an argparse error and it never went through the shared coercion. - types.py: DocumentDetail's `structure` field was inside the class's total=False body, so TypedDict rules made it optional even though every backend always populates it. Split into a required base class. Adds regression tests for all of the above. Full suite: 244 passed, 2 skipped (one pre-existing, unrelated flaky cloud-streaming test). Claude-Session: https://claude.ai/code/session_01Kx5DgKbhK1N8autqXH8SmS
110 lines
4.3 KiB
Python
110 lines
4.3 KiB
Python
import json
|
|
|
|
try:
|
|
from .index.utils import (
|
|
get_number_of_pages, remove_fields, get_md_page_content,
|
|
parse_pages, get_pdf_page_content,
|
|
)
|
|
except ImportError:
|
|
from index.utils import (
|
|
get_number_of_pages, remove_fields, get_md_page_content,
|
|
parse_pages, get_pdf_page_content,
|
|
)
|
|
|
|
|
|
# ── Helpers ──────────────────────────────────────────────────────────────────
|
|
|
|
def _parse_pages(pages: str) -> list[int]:
|
|
"""Parse a pages string like '5-7', '3,8', or '12' into a sorted list of ints.
|
|
Delegates to the canonical implementation so the two never drift again —
|
|
this one used to lack the p>=1 filter and the 1000-page DoS cap."""
|
|
return parse_pages(pages)
|
|
|
|
|
|
def _count_pages(doc_info: dict) -> int:
|
|
"""Return total page count for a PDF document."""
|
|
if doc_info.get('page_count'):
|
|
return doc_info['page_count']
|
|
if doc_info.get('pages'):
|
|
return len(doc_info['pages'])
|
|
return get_number_of_pages(doc_info['path'])
|
|
|
|
|
|
def _get_pdf_page_content(doc_info: dict, page_nums: list[int]) -> list[dict]:
|
|
"""Extract text for specific PDF pages (1-indexed). Prefer cached pages,
|
|
else delegate the file-read fallback to the canonical implementation."""
|
|
cached_pages = doc_info.get('pages')
|
|
if cached_pages:
|
|
page_map = {p['page']: p['content'] for p in cached_pages}
|
|
return [
|
|
{'page': p, 'content': page_map[p]}
|
|
for p in page_nums if p in page_map
|
|
]
|
|
return get_pdf_page_content(doc_info['path'], page_nums)
|
|
|
|
|
|
def _get_md_page_content(doc_info: dict, page_nums: list[int]) -> list[dict]:
|
|
"""For Markdown documents, 'pages' are line numbers. Delegates to the
|
|
canonical implementation so the two never drift again."""
|
|
return get_md_page_content(doc_info.get('structure', []), page_nums)
|
|
|
|
|
|
# ── Tool functions ────────────────────────────────────────────────────────────
|
|
|
|
def get_document(documents: dict, doc_id: str) -> str:
|
|
"""Return JSON with document metadata: doc_id, doc_name, doc_description, type, status, page_count (PDF) or line_count (Markdown)."""
|
|
doc_info = documents.get(doc_id)
|
|
if not doc_info:
|
|
return json.dumps({'error': f'Document {doc_id} not found'})
|
|
result = {
|
|
'doc_id': doc_id,
|
|
'doc_name': doc_info.get('doc_name', ''),
|
|
'doc_description': doc_info.get('doc_description', ''),
|
|
'type': doc_info.get('type', ''),
|
|
'status': 'completed',
|
|
}
|
|
if doc_info.get('type') == 'pdf':
|
|
result['page_count'] = _count_pages(doc_info)
|
|
else:
|
|
result['line_count'] = doc_info.get('line_count', 0)
|
|
return json.dumps(result)
|
|
|
|
|
|
def get_document_structure(documents: dict, doc_id: str) -> str:
|
|
"""Return tree structure JSON with text fields removed (saves tokens)."""
|
|
doc_info = documents.get(doc_id)
|
|
if not doc_info:
|
|
return json.dumps({'error': f'Document {doc_id} not found'})
|
|
structure = doc_info.get('structure', [])
|
|
structure_no_text = remove_fields(structure, fields=['text'])
|
|
return json.dumps(structure_no_text, ensure_ascii=False)
|
|
|
|
|
|
def get_page_content(documents: dict, doc_id: str, pages: str) -> str:
|
|
"""
|
|
Retrieve page content for a document.
|
|
|
|
pages format: '5-7', '3,8', or '12'
|
|
For PDF: pages are physical page numbers (1-indexed).
|
|
For Markdown: pages are line numbers corresponding to node headers.
|
|
|
|
Returns JSON list of {'page': int, 'content': str}.
|
|
"""
|
|
doc_info = documents.get(doc_id)
|
|
if not doc_info:
|
|
return json.dumps({'error': f'Document {doc_id} not found'})
|
|
|
|
try:
|
|
page_nums = _parse_pages(pages)
|
|
except (ValueError, AttributeError) as e:
|
|
return json.dumps({'error': f'Invalid pages format: {pages!r}. Use "5-7", "3,8", or "12". Error: {e}'})
|
|
|
|
try:
|
|
if doc_info.get('type') == 'pdf':
|
|
content = _get_pdf_page_content(doc_info, page_nums)
|
|
else:
|
|
content = _get_md_page_content(doc_info, page_nums)
|
|
except Exception as e:
|
|
return json.dumps({'error': f'Failed to read page content: {e}'})
|
|
|
|
return json.dumps(content, ensure_ascii=False)
|