diff --git a/docling/datamodel/asr_model_specs.py b/docling/datamodel/asr_model_specs.py index 5527dd5b..b16ad8f9 100644 --- a/docling/datamodel/asr_model_specs.py +++ b/docling/datamodel/asr_model_specs.py @@ -12,7 +12,7 @@ from docling.datamodel.pipeline_options_asr_model import ( InferenceAsrFramework, InlineAsrNativeWhisperOptions, InlineAsrOptions, - TransformersModelType, + # TransformersModelType, ) _log = logging.getLogger(__name__) diff --git a/docling/datamodel/layout_model_specs.py b/docling/datamodel/layout_model_specs.py index b91fa7fe..ff5c8074 100644 --- a/docling/datamodel/layout_model_specs.py +++ b/docling/datamodel/layout_model_specs.py @@ -26,8 +26,6 @@ class LayoutModelConfig(BaseModel): return self.repo_id.replace("/", "--") -# HuggingFace Layout Models - # Default Docling Layout Model DOCLING_LAYOUT_V2 = LayoutModelConfig( name="docling_layout_v2", diff --git a/docling/datamodel/pipeline_options.py b/docling/datamodel/pipeline_options.py index 630b16ef..40947fd9 100644 --- a/docling/datamodel/pipeline_options.py +++ b/docling/datamodel/pipeline_options.py @@ -278,6 +278,7 @@ class VlmPipelineOptions(PaginatedPipelineOptions): # If True, text from backend will be used instead of generated text vlm_options: Union[InlineVlmOptions, ApiVlmOptions] = ( smoldocling_vlm_conversion_options + #SMOLDOCLING_TRANSFORMERS ) @@ -293,6 +294,9 @@ class AsrPipelineOptions(PipelineOptions): artifacts_path: Optional[Union[Path, str]] = None + + + class PdfPipelineOptions(PaginatedPipelineOptions): """Options for the PDF pipeline.""" diff --git a/docling/datamodel/pipeline_options_asr_model.py b/docling/datamodel/pipeline_options_asr_model.py index 20e2e453..12109ad1 100644 --- a/docling/datamodel/pipeline_options_asr_model.py +++ b/docling/datamodel/pipeline_options_asr_model.py @@ -5,10 +5,11 @@ from pydantic import AnyUrl, BaseModel from typing_extensions import deprecated from docling.datamodel.accelerator_options import AcceleratorDevice -from docling.datamodel.pipeline_options_vlm_model import ( + +# from docling.datamodel.pipeline_options_vlm_model import ( # InferenceFramework, - TransformersModelType, -) + # TransformersModelType, +# ) class BaseAsrOptions(BaseModel): diff --git a/docling/datamodel/pipeline_options_vlm_model.py b/docling/datamodel/pipeline_options_vlm_model.py index c5ed2e32..3cf2efb0 100644 --- a/docling/datamodel/pipeline_options_vlm_model.py +++ b/docling/datamodel/pipeline_options_vlm_model.py @@ -6,7 +6,6 @@ from pydantic import AnyUrl, BaseModel from typing_extensions import deprecated from docling.datamodel.accelerator_options import AcceleratorDevice -from docling.datamodel.pipeline_options import LayoutOptions class BaseVlmOptions(BaseModel): @@ -89,9 +88,12 @@ class ApiVlmOptions(BaseVlmOptions): concurrency: int = 1 response_format: ResponseFormat - +from docling.datamodel.layout_model_specs import ( + LayoutModelConfig, +) + class TwoStageVlmOptions(BaseModel): kind: Literal["inline_two_stage_model_options"] = "inline_two_stage_model_options" - vlm_options: InlineVlmOptions - layout_options: LayoutOptions + vlm_options: Union[InlineVlmOptions, ApiVlmOptions] # = SMOLDOCLING_TRANSFORMERS + layout_options: LayoutModelConfig # = DOCLING_LAYOUT_V2