Skip to content

Commit a93d0ec

Browse files
committed
style: apply ruff formatting to changed files
Signed-off-by: jhchoi1182 <jhchoi1182@gmail.com>
1 parent e0111c2 commit a93d0ec

File tree

2 files changed

+22
-43
lines changed

2 files changed

+22
-43
lines changed

docling_core/transforms/serializer/common.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def _yield_page_breaks(
8484
next_page: int,
8585
lvl: int,
8686
start_index: int,
87-
) -> Iterable[Tuple[_PageBreakNode, int, int]]:
87+
) -> Iterable[tuple[_PageBreakNode, int, int]]:
8888
"""Yield page break nodes for each page in range (prev_page, next_page].
8989
9090
Generates one PageBreakNode per page transition. For example, if prev_page=1
@@ -101,11 +101,15 @@ def _yield_page_breaks(
101101
"""
102102
idx = start_index
103103
for page in range(prev_page + 1, next_page + 1):
104-
yield _PageBreakNode(
105-
self_ref=f"#/pb/{idx}",
106-
prev_page=page - 1,
107-
next_page=page,
108-
), lvl, idx + 1
104+
yield (
105+
_PageBreakNode(
106+
self_ref=f"#/pb/{idx}",
107+
prev_page=page - 1,
108+
next_page=page,
109+
),
110+
lvl,
111+
idx + 1,
112+
)
109113
idx += 1
110114

111115

test/test_page_break_skipped_pages.py

Lines changed: 12 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
from docling_core.types.doc.document import DoclingDocument
1616

17-
1817
# =============================================================================
1918
# Test: Document page count verification
2019
# =============================================================================
@@ -27,9 +26,7 @@ def test_normal_4pages_has_all_pages():
2726

2827
page_numbers = list(doc.pages.keys())
2928

30-
assert (
31-
len(page_numbers) == 4
32-
), f"Expected 4 pages in normal_4pages.json, got {len(page_numbers)}"
29+
assert len(page_numbers) == 4, f"Expected 4 pages in normal_4pages.json, got {len(page_numbers)}"
3330
assert page_numbers == [
3431
1,
3532
2,
@@ -45,9 +42,7 @@ def test_skipped_2pages_has_only_two_pages():
4542

4643
page_numbers = list(doc.pages.keys())
4744

48-
assert (
49-
len(page_numbers) == 2
50-
), f"Expected 2 pages in skipped_2pages.json, got {len(page_numbers)}"
45+
assert len(page_numbers) == 2, f"Expected 2 pages in skipped_2pages.json, got {len(page_numbers)}"
5146
assert page_numbers == [1, 4], f"Expected pages [1, 4], got {page_numbers}"
5247

5348

@@ -58,9 +53,7 @@ def test_skipped_1page_has_two_pages():
5853

5954
page_numbers = list(doc.pages.keys())
6055

61-
assert (
62-
len(page_numbers) == 2
63-
), f"Expected 2 pages in skipped_1page.json, got {len(page_numbers)}"
56+
assert len(page_numbers) == 2, f"Expected 2 pages in skipped_1page.json, got {len(page_numbers)}"
6457
assert page_numbers == [1, 3], f"Expected pages [1, 3], got {page_numbers}"
6558

6659

@@ -77,9 +70,7 @@ def test_doctags_page_breaks_normal():
7770
doctags_output = doc.export_to_doctags()
7871
page_break_count = doctags_output.count("<page_break>")
7972

80-
assert (
81-
page_break_count == 3
82-
), f"Expected 3 page breaks for 4-page document, got {page_break_count}"
73+
assert page_break_count == 3, f"Expected 3 page breaks for 4-page document, got {page_break_count}"
8374

8475

8576
def test_doctags_page_breaks_skipped_2pages():
@@ -98,9 +89,7 @@ def test_doctags_page_breaks_skipped_2pages():
9889
# After the fix in _yield_page_breaks(): should have 3 page breaks
9990
# (1->2, 2->3, 3->4) even though pages 2 and 3 are missing from the document.
10091
# Before the fix: only had 1 page break (1->4)
101-
assert (
102-
page_break_count == 3
103-
), f"Expected 3 page breaks for document with 2 skipped pages, got {page_break_count}"
92+
assert page_break_count == 3, f"Expected 3 page breaks for document with 2 skipped pages, got {page_break_count}"
10493

10594

10695
def test_doctags_page_breaks_skipped_1page():
@@ -118,9 +107,7 @@ def test_doctags_page_breaks_skipped_1page():
118107

119108
# Should have 2 page breaks (1->2, 2->3) even though page 2 is missing.
120109
# Before the fix: only had 1 page break (1->3)
121-
assert (
122-
page_break_count == 2
123-
), f"Expected 2 page breaks for document with 1 skipped page, got {page_break_count}"
110+
assert page_break_count == 2, f"Expected 2 page breaks for document with 1 skipped page, got {page_break_count}"
124111

125112

126113
# =============================================================================
@@ -136,9 +123,7 @@ def test_markdown_page_breaks_normal():
136123
markdown_output = doc.export_to_markdown(page_break_placeholder="---PAGE BREAK---")
137124
page_break_count = markdown_output.count("---PAGE BREAK---")
138125

139-
assert (
140-
page_break_count == 3
141-
), f"Expected 3 page breaks for 4-page document, got {page_break_count}"
126+
assert page_break_count == 3, f"Expected 3 page breaks for 4-page document, got {page_break_count}"
142127

143128

144129
def test_markdown_page_breaks_skipped_2pages():
@@ -151,9 +136,7 @@ def test_markdown_page_breaks_skipped_2pages():
151136

152137
# After the fix: should have 3 page breaks
153138
# Before the fix: only had 1 page break
154-
assert (
155-
page_break_count == 3
156-
), f"Expected 3 page breaks for document with 2 skipped pages, got {page_break_count}"
139+
assert page_break_count == 3, f"Expected 3 page breaks for document with 2 skipped pages, got {page_break_count}"
157140

158141

159142
def test_markdown_page_breaks_skipped_1page():
@@ -165,9 +148,7 @@ def test_markdown_page_breaks_skipped_1page():
165148
page_break_count = markdown_output.count("---PAGE BREAK---")
166149

167150
# Should have 2 page breaks (1->2, 2->3) even though page 2 is missing.
168-
assert (
169-
page_break_count == 2
170-
), f"Expected 2 page breaks for document with 1 skipped page, got {page_break_count}"
151+
assert page_break_count == 2, f"Expected 2 page breaks for document with 1 skipped page, got {page_break_count}"
171152

172153

173154
# =============================================================================
@@ -184,9 +165,7 @@ def test_html_split_page_view_normal():
184165
# Count page divs instead of tr tags to avoid counting nested tables
185166
page_div_count = html_output.count("<div class='page'>")
186167

187-
assert (
188-
page_div_count == 4
189-
), f"Expected 4 page divs for 4-page document, got {page_div_count}"
168+
assert page_div_count == 4, f"Expected 4 page divs for 4-page document, got {page_div_count}"
190169

191170

192171
def test_html_split_page_view_skipped_2pages():
@@ -204,9 +183,7 @@ def test_html_split_page_view_skipped_2pages():
204183
page_div_count = html_output.count("<div class='page'>")
205184

206185
# Should have 4 page divs (pages 1, 2, 3, 4) even though pages 2 and 3 are missing
207-
assert (
208-
page_div_count == 4
209-
), f"Expected 4 page divs for document with 2 skipped pages, got {page_div_count}"
186+
assert page_div_count == 4, f"Expected 4 page divs for document with 2 skipped pages, got {page_div_count}"
210187

211188

212189
def test_html_split_page_view_skipped_1page():
@@ -224,9 +201,7 @@ def test_html_split_page_view_skipped_1page():
224201
page_div_count = html_output.count("<div class='page'>")
225202

226203
# Should have 3 page divs (pages 1, 2, 3) even though page 2 is missing
227-
assert (
228-
page_div_count == 3
229-
), f"Expected 3 page divs for document with 1 skipped page, got {page_div_count}"
204+
assert page_div_count == 3, f"Expected 3 page divs for document with 1 skipped page, got {page_div_count}"
230205

231206

232207
# =============================================================================

0 commit comments

Comments
 (0)