mirrors/docling
1
0
Fork 0
mirror of https://github.com/DS4SD/docling.git synced 2025-12-08 20:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add support for additional parameters in RapidOcrOptions and fix RapidOcr font_path

Browse Source
This commit is contained in:
David Morady
2025-09-15 10:51:47 +02:00
parent 10bb0aee2d
commit 133d989060
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docling/datamodel/pipeline_options.py
View File

@@ -114,7 +114,10 @@ class RapidOcrOptions(OcrOptions):
cls_model_path: Optional[str] = None # same default as rapidocr cls_model_path: Optional[str] = None # same default as rapidocr
rec_model_path: Optional[str] = None # same default as rapidocr rec_model_path: Optional[str] = None # same default as rapidocr
rec_keys_path: Optional[str] = None # same default as rapidocr rec_keys_path: Optional[str] = None # same default as rapidocr
rec_font_path: Optional[str] = None # same default as rapidocr font_path: Optional[str] = None # same default as rapidocr
# Dictionary to overwrite or pass-through additional parameters
rapidocr_params: Dict[str, Any] = Field(default_factory=dict)
model_config = ConfigDict( model_config = ConfigDict(
extra="forbid", extra="forbid",

58
docling/models/rapid_ocr_model.py
View File

@@ -62,32 +62,40 @@ class RapidOcrModel(BaseOcrModel):
} }
backend_enum = _ALIASES.get(self.options.backend, EngineType.ONNXRUNTIME) backend_enum = _ALIASES.get(self.options.backend, EngineType.ONNXRUNTIME)
params = {
# Global settings (these are still correct)
"Global.text_score": self.options.text_score,
"Global.font_path": self.options.font_path,
# "Global.verbose": self.options.print_verbose,
# Detection model settings
"Det.model_path": self.options.det_model_path,
"Det.use_cuda": use_cuda,
"Det.use_dml": use_dml,
"Det.intra_op_num_threads": intra_op_num_threads,
# Classification model settings
"Cls.model_path": self.options.cls_model_path,
"Cls.use_cuda": use_cuda,
"Cls.use_dml": use_dml,
"Cls.intra_op_num_threads": intra_op_num_threads,
# Recognition model settings
"Rec.model_path": self.options.rec_model_path,
"Rec.font_path": self.options.rec_font_path,
"Rec.keys_path": self.options.rec_keys_path,
"Rec.use_cuda": use_cuda,
"Rec.use_dml": use_dml,
"Rec.intra_op_num_threads": intra_op_num_threads,
"Det.engine_type": backend_enum,
"Cls.engine_type": backend_enum,
"Rec.engine_type": backend_enum,
}
user_params = self.options.rapidocr_params
if user_params:
_log.debug("Overwriting RapidOCR params with user-provided values.")
params.update(user_params)
self.reader = RapidOCR( self.reader = RapidOCR(
params={ params=params,
# Global settings (these are still correct)
"Global.text_score": self.options.text_score,
# "Global.verbose": self.options.print_verbose,
# Detection model settings
"Det.model_path": self.options.det_model_path,
"Det.use_cuda": use_cuda,
"Det.use_dml": use_dml,
"Det.intra_op_num_threads": intra_op_num_threads,
# Classification model settings
"Cls.model_path": self.options.cls_model_path,
"Cls.use_cuda": use_cuda,
"Cls.use_dml": use_dml,
"Cls.intra_op_num_threads": intra_op_num_threads,
# Recognition model settings
"Rec.model_path": self.options.rec_model_path,
"Rec.font_path": self.options.rec_font_path,
"Rec.keys_path": self.options.rec_keys_path,
"Rec.use_cuda": use_cuda,
"Rec.use_dml": use_dml,
"Rec.intra_op_num_threads": intra_op_num_threads,
"Det.engine_type": backend_enum,
"Cls.engine_type": backend_enum,
"Rec.engine_type": backend_enum,
}
) )
def __call__( def __call__(