From ed376f1872ddeaf63277ee5e336ffdf55d4777b6 Mon Sep 17 00:00:00 2001 From: yhampe Date: Thu, 1 Feb 2024 10:45:18 +0100 Subject: [PATCH] RED-7375 table extractor prototype created new branch because old one broke --- .../processor/model/text/TextPositionSequence.java | 1 + .../processor/python_api/model/image/Classification.java | 2 +- .../processor/python_api/model/image/ImageServiceResponse.java | 3 ++- .../processor/python_api/model/table/TableData.java | 1 + .../processor/python_api/model/table/TableServiceResponse.java | 2 +- .../service/layoutparser/server/graph/ViewerDocumentTest.java | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java index 82829c6..6c7cdff 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/model/text/TextPositionSequence.java @@ -28,6 +28,7 @@ public class TextPositionSequence implements CharSequence { public static final int HEIGHT_PADDING = 2; private int page; + @Builder.Default private List textPositions = new ArrayList<>(); private TextDirection dir; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java index 00b8cd0..41c7b6f 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/Classification.java @@ -13,7 +13,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class Classification { - + @Builder.Default private Map probabilities = new HashMap<>(); private String label; diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java index 0a7f176..6442f04 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/image/ImageServiceResponse.java @@ -22,8 +22,9 @@ public class ImageServiceResponse { @JsonProperty(value = "imageMetadata") @JsonAlias("data") + @Builder.Default private List data = new ArrayList<>(); - + @Builder.Default private List dataCV = new ArrayList<>(); diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java index be1d492..99dc0df 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableData.java @@ -15,6 +15,7 @@ import lombok.NoArgsConstructor; public class TableData { private PageInfo pageInfo; + @Builder.Default private List tableCells = new ArrayList<>(); } diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java index fbfea32..f98e35e 100644 --- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java +++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/python_api/model/table/TableServiceResponse.java @@ -19,7 +19,7 @@ public class TableServiceResponse { private String operation; private String targetFileExtension; private String responseFileExtension; - + @Builder.Default private List data = new ArrayList<>(); } diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java index c8f5207..840fe79 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/graph/ViewerDocumentTest.java @@ -26,7 +26,7 @@ public class ViewerDocumentTest extends BuildDocumentTest { ViewerDocumentService viewerDocumentService = new ViewerDocumentService(layoutGridService, null); Document document = buildGraph(fileName, LayoutParsingType.REDACT_MANAGER); var documentFile = new ClassPathResource(fileName).getFile(); - viewerDocumentService.createViewerDocument(documentFile, document, new File(tmpFileName), true); + viewerDocumentService.createViewerDocument(documentFile, document, new File(tmpFileName),null, true); } }