Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions haystack/utils/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def expand_page_range(page_range: list[str | int]) -> list[int]:

:param page_range: List of page numbers and ranges
:returns:
An expanded list of page integers
An expanded list of unique page integers, preserving their first-occurrence order
:raises ValueError:
If any element is not a valid integer or a range string in the format `'start-end'`.

Expand Down Expand Up @@ -90,7 +90,7 @@ def expand_page_range(page_range: list[str | int]) -> list[int]:
if not expanded_page_range:
raise ValueError("No valid page numbers or ranges found in the input list")

return expanded_page_range
return list(dict.fromkeys(expanded_page_range))


@overload
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixed ``PDFToImageContent`` processing pages more than once when page ranges contain duplicate or overlapping selections.
Page selection order is preserved.
7 changes: 7 additions & 0 deletions test/components/converters/image/test_pdf_to_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ def test_run_with_valid_source(self) -> None:
assert results["image_contents"][2].meta["page_number"] == 3
assert results["image_contents"][3].meta["page_number"] == 4

def test_run_with_duplicate_page_range(self) -> None:
converter = PDFToImageContent(page_range=[1, 1])
results = converter.run(sources=["./test/test_files/pdf/sample_pdf_1.pdf"])

assert len(results["image_contents"]) == 1
assert results["image_contents"][0].meta["page_number"] == 1

def test_run_with_no_sources(self) -> None:
converter = PDFToImageContent()
results = converter.run(sources=[])
Expand Down
3 changes: 3 additions & 0 deletions test/utils/test_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@ def test_range_strings_expanded(self):
def test_mixed_integers_and_range_strings(self):
assert expand_page_range([1, "3-5", 7]) == [1, 3, 4, 5, 7]

def test_duplicate_pages_are_removed_preserving_order(self):
assert expand_page_range(["3-5", 1, "4-6", 3]) == [3, 4, 5, 1, 6]

def test_empty_input_raises_value_error(self):
with pytest.raises(ValueError, match="No valid page numbers"):
expand_page_range([])
Expand Down
Loading