rename new status, populate ConversionResult errors

Signed-off-by: Panos Vagenas <[email protected]>
DS4SD · Dec 2, 2024 · 8e57c85 · 8e57c85
1 parent 4138110
commit 8e57c85
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/docling/datamodel/base_models.py b/docling/datamodel/base_models.py
@@ -22,7 +22,7 @@ class ConversionStatus(str, Enum):
     FAILURE = auto()
     SUCCESS = auto()
     PARTIAL_SUCCESS = auto()
-    UNSUPPORTED = auto()
+    SKIPPED = auto()
 
 
 class InputFormat(str, Enum):
@@ -94,6 +94,7 @@ class DoclingComponentType(str, Enum):
     DOCUMENT_BACKEND = auto()
     MODEL = auto()
     DOC_ASSEMBLER = auto()
+    USER_INPUT = auto()
 
 
 class ErrorItem(BaseModel):

diff --git a/docling/document_converter.py b/docling/document_converter.py
@@ -15,7 +15,13 @@
 from docling.backend.msexcel_backend import MsExcelDocumentBackend
 from docling.backend.mspowerpoint_backend import MsPowerpointDocumentBackend
 from docling.backend.msword_backend import MsWordDocumentBackend
-from docling.datamodel.base_models import ConversionStatus, DocumentStream, InputFormat
+from docling.datamodel.base_models import (
+    ConversionStatus,
+    DoclingComponentType,
+    DocumentStream,
+    ErrorItem,
+    InputFormat,
+)
 from docling.datamodel.document import (
     ConversionResult,
     InputDocument,
@@ -262,11 +268,17 @@ def _process_document(
         if valid:
             conv_res = self._execute_pipeline(in_doc, raises_on_error=raises_on_error)
         else:
+            error_message = f"File format not allowed: {in_doc.file}"
             if raises_on_error:
-                raise ConversionError(f"Unsupported format in: {in_doc.file}")
+                raise ConversionError(error_message)
             else:
+                error_item = ErrorItem(
+                    component_type=DoclingComponentType.USER_INPUT,
+                    module_name="",
+                    error_message=error_message,
+                )
                 conv_res = ConversionResult(
-                    input=in_doc, status=ConversionStatus.UNSUPPORTED
+                    input=in_doc, status=ConversionStatus.SKIPPED, errors=[error_item]
                 )
 
         return conv_res

diff --git a/tests/test_invalid_input.py b/tests/test_invalid_input.py
@@ -24,7 +24,7 @@ def test_convert_unsupported_doc_format_wout_exception(converter: DocumentConver
     result = converter.convert(
         DocumentStream(name="input.xyz", stream=BytesIO(b"xyz")), raises_on_error=False
     )
-    assert result.status == ConversionStatus.UNSUPPORTED
+    assert result.status == ConversionStatus.SKIPPED
 
 
 def test_convert_unsupported_doc_format_with_exception(converter: DocumentConverter):