Skip to content

Commit 89cf156

Browse files
Align ReadingOrderModel with enabled pattern used by other models
Replace skip_prediction option in ReadingOrderOptions with an enabled parameter in ReadingOrderModel.__init__, consistent with AutoOcrModel and other pipeline models. The do_reading_order flag in PdfPipelineOptions now controls this enabled argument directly. Signed-off-by: stone <frank.schruefer@t-online.de>
1 parent 39271da commit 89cf156

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

docling/models/stages/reading_order/readingorder_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ class ReadingOrderOptions(BaseModel):
3737
model_config = ConfigDict(protected_namespaces=())
3838

3939
model_names: str = "" # e.g. "language;term;reference"
40-
skip_prediction: bool = False # if True, keep layout postprocessor order as-is
4140

4241

4342
class ReadingOrderModel:
44-
def __init__(self, options: ReadingOrderOptions):
43+
def __init__(self, enabled: bool = True, options: ReadingOrderOptions = ReadingOrderOptions()):
44+
self.enabled = enabled
4545
self.options = options
4646
self.ro_model = ReadingOrderPredictor()
4747
self.list_item_processor = ListItemMarkerProcessor()
@@ -434,7 +434,7 @@ def __call__(self, conv_res: ConversionResult) -> DoclingDocument:
434434
page_elements = self._assembled_to_readingorder_elements(conv_res)
435435

436436
# Apply reading order
437-
if self.options.skip_prediction:
437+
if not self.enabled:
438438
sorted_elements = page_elements
439439
else:
440440
sorted_elements = self.ro_model.predict_reading_order(

docling/pipeline/standard_pdf_pipeline.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,9 +503,10 @@ def _init_models(self) -> None:
503503
enable_remote_services=self.pipeline_options.enable_remote_services,
504504
)
505505
self.assemble_model = PageAssembleModel(options=PageAssembleOptions())
506-
self.reading_order_model = ReadingOrderModel(options=ReadingOrderOptions(
507-
skip_prediction=not self.pipeline_options.do_reading_order
508-
))
506+
self.reading_order_model = ReadingOrderModel(
507+
enabled=self.pipeline_options.do_reading_order,
508+
options=ReadingOrderOptions(),
509+
)
509510

510511
# --- optional enrichment ------------------------------------------------
511512
# Create a copy to avoid mutating pipeline_options in-place,

0 commit comments

Comments
 (0)