Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Updated Layout processing with forms and key-value areas #530

Merged
merged 45 commits into from
Dec 17, 2024
Merged

feat: Updated Layout processing with forms and key-value areas #530

merged 45 commits into from
Dec 17, 2024

Conversation

cau-git
Copy link
Contributor

@cau-git cau-git commented Dec 6, 2024 •
edited
Loading

Checklist:

  • Documentation has been updated, if necessary.
  • Examples have been added, if necessary.
  • Tests have been added, if necessary.

cau-git and others added 10 commits December 2, 2024 16:46
@cau-git
Upgraded Layout Postprocessing, sending old code back to ERZ
b9f8f5a 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Implement hierachical cluster layout processing
05bffd3 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Pass nested cluster processing through full pipeline
db70916 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Pass nested clusters through GLM as payload
65fa584 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Move to_docling_document from ds-glm to this repo
a1ac0c6 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge branch 'release_v3' of github.com:DS4SD/docling into cau/layout…
e826642 
…-postprocessing
@cau-git
Clean up imports again
8b04edd 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@nikos-livathinos
feat(Accelerator): Introduce options to control the num_threads and d…
ddb8ad9 
…evice from API, envvars, CLI.

- Introduce the AcceleratorOptions, AcceleratorDevice and use them to set the device where the models run.
- Introduce the accelerator_utils with function to decide the device and resolve the AUTO setting.
- Refactor the way how the docling-ibm-models are called to match the new init signature of models.
- Translate the accelerator options to the specific inputs for third-party models.
- Extend the docling CLI with parameters to set the num_threads and device.
- Add new unit tests.
- Write new example how to use the accelerator options.
@cau-git
Merge pull request #504 from DS4SD/cau/layout-postprocessing
40d7a8e 
feat: Support hierarchical layout components, expose and group content in pictures, forms and key-value regions
@cau-git
Rebase from release_v3
6f0b912 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@mergify Mergify
Copy link

mergify bot commented Dec 6, 2024 •
edited
Loading

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🟢 Enforce conventional commit

Wonderful, this rule succeeded.

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?(!)?:

🟢 Require two reviewer for test updates

Wonderful, this rule succeeded.

When test data is updated, we require two reviewers

  • #approved-reviews-by >= 2

@nikos-livathinos
fix: Improve the pydantic objects in the pipeline_options and imports.
975fe07 
Signed-off-by: Nikos Livathinos <nli@zurich.ibm.com>
@PeterStaar-IBM PeterStaar-IBM changed the title feat!: Release v3 feat: Release-candidate v3 Dec 7, 2024
@dolfim-ibm dolfim-ibm changed the title feat: Release-candidate v3 feat: Release-candidate Dec 9, 2024
nikos-livathinos and others added 11 commits December 9, 2024 11:12
@nikos-livathinos
fix: TableStructureModel: Refactor the artifacts path to use the new …
5d5d14d 
…structure for fast/accurate model

Signed-off-by: Nikos Livathinos <nli@zurich.ibm.com>
@cau-git
Updated test ground-truth
03f8690 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Updated test ground-truth (again), bugfix for empty layout
46ae215 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Rebase from main
9e99e24 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge branch 'release_v3' into nli/performance
bb1774d
@nikos-livathinos
fix: Do proper check to set the device in EasyOCR, RapidOCR.
accb7b4 
Signed-off-by: Nikos Livathinos <nli@zurich.ibm.com>
@nikos-livathinos
fix: Correct the way to set GPU for EasyOCR, RapidOCR
94caee3 
Signed-off-by: Nikos Livathinos <nli@zurich.ibm.com>
@nikos-livathinos
fix: Ocr AccleratorDevice
f46fd9c 
Signed-off-by: Nikos Livathinos <nli@zurich.ibm.com>
@cau-git
Merge pull request #514 from DS4SD/nli/performance
e282bfd 
feat(Accelerator): Introduce AI runtime configuration scheme
@cau-git
Merge pull request #556 from DS4SD/cau/layout-processing-improvement
cd579fd 
feat: layout processing improvements and bugfixes
@cau-git
Rebase from main
586abd5 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git changed the title feat: Release-candidate feat: Updated Layout processing and global accelerator support Dec 10, 2024
@cau-git
Update lockfile
bd30b46 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Update tests
c8b5915 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Update HF model ref, reset test generate
f4512d0 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@ctandrewtran
Copy link

This would be awesome!

@cau-git
Fix table box snapping
dd4f72e 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Fixes for cluster pre-ordering
a9ff29b 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git changed the title feat: Updated Layout processing and global accelerator support feat: Updated Layout processing Dec 16, 2024
@cau-git cau-git mentioned this pull request Dec 16, 2024
Closed
4 tasks
@cau-git
Rebase from main
81bf033 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Introduce OCR confidence, propagate to orphan in post-processing
18e01f6 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Fix form and key value area groups
bed8fc8 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Adjust confidence in EasyOcr
c5d1fbf 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git marked this pull request as ready for review December 17, 2024 13:07
@cau-git
Merge branch 'main' of github.com:DS4SD/docling into release_v3
8f09fcd
@cau-git
Roll back CLI changes from main
6c8c625 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Update test GT
8243325 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Update docling-core pinning
d29a245 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git changed the title feat: Updated Layout processing feat: Updated Layout processing with forms and key-value areas Dec 17, 2024
@cau-git
Annoying fixes for historical python versions
6d38c7c 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Updated test GT for legacy
dca32bf 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge branch 'main' of github.com:DS4SD/docling into release_v3
2c2026d
dolfim-ibm
dolfim-ibm previously approved these changes Dec 17, 2024
View reviewed changes
@cau-git
Comment cleanup
7649ba7 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
PeterStaar-IBM
PeterStaar-IBM approved these changes Dec 17, 2024
View reviewed changes
Copy link
Contributor

@PeterStaar-IBM PeterStaar-IBM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎖️

nikos-livathinos
nikos-livathinos approved these changes Dec 17, 2024
View reviewed changes
Copy link
Collaborator

@nikos-livathinos nikos-livathinos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@cau-git cau-git merged commit 60dc852 into main Dec 17, 2024
9 checks passed
@cau-git cau-git deleted the release_v3 branch December 17, 2024 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikos-livathinos nikos-livathinos nikos-livathinos approved these changes

@dolfim-ibm dolfim-ibm dolfim-ibm approved these changes

@PeterStaar-IBM PeterStaar-IBM PeterStaar-IBM approved these changes

@vagenas vagenas Awaiting requested review from vagenas

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cau-git @ctandrewtran @PeterStaar-IBM @dolfim-ibm @nikos-livathinos