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: Implement new reading-order model #916

Merged
merged 22 commits into from
Feb 20, 2025
Merged

feat: Implement new reading-order model #916

merged 22 commits into from
Feb 20, 2025
+755 −869

Conversation

cau-git
Copy link
Contributor

@cau-git cau-git commented Feb 7, 2025

Checklist:

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

@cau-git
Implement new reading-order model, replacing DS GLM model (WIP)
a56dbc5 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@mergify Mergify
Copy link

mergify bot commented Feb 7, 2025 •
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

@cau-git
Update reading-order model branch
f875fbc 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@PeterStaar-IBM PeterStaar-IBM mentioned this pull request Feb 10, 2025
Closed
3 tasks
@cau-git
Merge from main
2046ffb 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Update lockfile [skip ci]
46d7342 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge branch 'main' of github.com:DS4SD/docling into cau/integrate-re…
5aebaf5 
…ading-order
@cau-git
Add captions, footnotes and merges [skip ci]
a6ee5a4 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Updates for reading-order implementation
27b896b 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Updates for reading-order implementation
48777b1 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge from main
8606b59 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge from main
d788bf2 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Add children to output after reading-order
4e68da9 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git force-pushed the cau/integrate-reading-order branch from 3c49a3a to 4e68da9 Compare February 19, 2025 14:36
@cau-git
Update tests and lockfile
c3ac8b3 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Merge branch 'cau/fix-tests' of github.com:DS4SD/docling into cau/int…
7d55102 
…egrate-reading-order
@cau-git
Fixes, update tests
eb67337 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git changed the title feat: [WIP] Implement new reading-order model feat: Implement new reading-order model Feb 19, 2025
@cau-git
Add normalization, update tests again
857d6c4 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@dolfim-ibm dolfim-ibm self-requested a review February 19, 2025 16:10
@cau-git
Merge from main
53ee8ea 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git marked this pull request as ready for review February 19, 2025 16:27
PeterStaar-IBM
PeterStaar-IBM previously requested changes Feb 20, 2025
View reviewed changes
@cau-git
Update tests with code
a89c191 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Push final lockfile
fa6b7ee 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
dolfim-ibm
dolfim-ibm requested changes Feb 20, 2025
View reviewed changes
Copy link
Contributor

@dolfim-ibm dolfim-ibm left a comment

Choose a reason for hiding this comment

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

All furnitures as ignore and removed from the final DoclingDocument.

dolfim-ibm and others added 2 commits February 20, 2025 13:10
@dolfim-ibm
sanitize text
26dda63 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@cau-git
Inlcude furniture, Update tests with furniture
6cd81e2 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git
Fix content_layer assignment
50979e4 
Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
@cau-git cau-git requested a review from dolfim-ibm February 20, 2025 14:33
@nikos-livathinos nikos-livathinos self-requested a review February 20, 2025 15:40
@nikos-livathinos
chore: Delete empty file docling/models/ds_glm_model.py
3cdf1e5 
Signed-off-by: Nikos Livathinos <nli@zurich.ibm.com>
dolfim-ibm
dolfim-ibm approved these changes Feb 20, 2025
View reviewed changes
Copy link
Contributor

@dolfim-ibm dolfim-ibm left a comment

Choose a reason for hiding this comment

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

great!

@dolfim-ibm dolfim-ibm merged commit c93e369 into main Feb 20, 2025
10 checks passed
@dolfim-ibm dolfim-ibm deleted the cau/integrate-reading-order branch February 20, 2025 16:51
@oasissoman
Copy link

Checklist:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

@PeterStaar-IBM PeterStaar-IBM PeterStaar-IBM left review comments

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 @oasissoman @PeterStaar-IBM @dolfim-ibm @nikos-livathinos