diff --git a/haystack/utils/misc.py b/haystack/utils/misc.py index 3196b13dfc7..b4b1b0319e0 100644 --- a/haystack/utils/misc.py +++ b/haystack/utils/misc.py @@ -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'`. @@ -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 diff --git a/releasenotes/notes/fix-duplicate-pdf-page-selections-13830.yaml b/releasenotes/notes/fix-duplicate-pdf-page-selections-13830.yaml new file mode 100644 index 00000000000..25ae79fd9c0 --- /dev/null +++ b/releasenotes/notes/fix-duplicate-pdf-page-selections-13830.yaml @@ -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. diff --git a/test/components/converters/image/test_pdf_to_image.py b/test/components/converters/image/test_pdf_to_image.py index cb07706d7f7..3eb034a3d64 100644 --- a/test/components/converters/image/test_pdf_to_image.py +++ b/test/components/converters/image/test_pdf_to_image.py @@ -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=[]) diff --git a/test/utils/test_misc.py b/test/utils/test_misc.py index 716214af86a..c0379070fe2 100644 --- a/test/utils/test_misc.py +++ b/test/utils/test_misc.py @@ -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([])