fix(ocr): tolerate legacy showZeroes sheet views in XLSX conversion - #2403
Open
Lazizbek Ergashev (lazerg) wants to merge 2 commits into
Open
fix(ocr): tolerate legacy showZeroes sheet views in XLSX conversion#2403Lazizbek Ergashev (lazerg) wants to merge 2 commits into
Lazizbek Ergashev (lazerg) wants to merge 2 commits into
Conversation
Move the repair-and-retry into a _load_xlsx_workbook helper so the OCR path mirrors the core converter, and raise the markitdown floor to the version that provides the repair helpers.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2400.
XlsxConverterWithOCRcallsload_workbook()andpandas.read_excel()directly, so it never gets theshowZeroes->showZerosworksheet repair that #2064 added to the core XLSX converter. Workbooks that still carry the legacy attribute raiseTypeError: SheetView.__init__() got an unexpected keyword argument 'showZeroes'as soon as the OCR plugin is enabled, even though plain MarkItDown converts them fine.This reuses the core repair helpers instead of duplicating them: the standard path now goes through
_read_xlsx_sheets, and the OCR path loads the workbook through a small_load_xlsx_workbookhelper that repairs and retries on that specific error, returning the repaired stream so the per-sheetread_excel()calls read it too.One packaging note: those helpers landed in #2064, after the last version bump, so the first markitdown that has them is
0.1.8b1.markitdown-ocrdeclaredmarkitdown>=0.1.0, which would give anImportErrorat plugin import time against a released markitdown, so the floor is raised here. Happy to change the pin if you would rather sequence the releases differently.Tests: two regression tests in
packages/markitdown-ocr/tests/test_xlsx_converter.pybuild a copy ofxlsx_image_start.xlsxwith the legacy attribute, covering the OCR path and the no-OCR path. They fail before the fix and pass after, and the OCR one asserts the output matches the untouched workbook, so the repair keeps the embedded images.