chore: Implementation cleanup and fixes for new class design

docling_eval/cli/main.py

@@ -8,7 +8,7 @@
 import typer
 from tabulate import tabulate  # type: ignore
 
-from docling_eval.datamodels.constants import (
+from docling_eval.datamodels.types import (
     BenchMarkNames,
     ConverterTypes,
     EvaluationModality,
@@ -284,7 +284,6 @@ def evaluate(
             json.dump(table_evaluation.model_dump(), fd, indent=2, sort_keys=True)
 
     elif modality == EvaluationModality.READING_ORDER:
-        # readingorder_evaluator = ReadingOrderEvaluatorGlm()
         readingorder_evaluator = ReadingOrderEvaluator()
 
         readingorder_evaluation = readingorder_evaluator(idir, split=split)

docling_eval/datamodels/dataset_record.py

@@ -12,7 +12,7 @@
 from docling_core.types.io import DocumentStream
 from pydantic import BaseModel, ConfigDict, Field, model_validator
 
-from docling_eval.datamodels.constants import EvaluationModality, PredictionFormats
+from docling_eval.datamodels.types import EvaluationModality, PredictionFormats
 
 
 class DatasetRecord(

docling_eval/datamodels/constants.py → docling_eval/datamodels/types.py

@@ -1,4 +1,8 @@
 from enum import Enum
+from typing import List
+
+from docling_core.types.doc import BoundingBox
+from pydantic import BaseModel
 
 
 class BenchMarkColumns(str, Enum):
@@ -82,3 +86,17 @@ class PredictionFormats(str, Enum):
     JSON = "json"
     YAML = "yaml"
     DOCTAGS = "doctags"
+
+
+class PageToken(BaseModel):
+    bbox: BoundingBox
+
+    text: str
+    id: int
+
+
+class PageTokens(BaseModel):
+    tokens: List[PageToken]
+
+    height: float
+    width: float