fix: pagination error too many values to unpack (#11475)

Co-authored-by: devteamaegis <devteam.aegis@gmail.com>
Co-authored-by: Sebastian Husch Lee <10526848+sjrl@users.noreply.github.com>

Author: 3 people

haystack/utils/misc.py

@@ -39,6 +39,8 @@ 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
+    :raises ValueError:
+        If any element is not a valid integer or a range string in the format `'start-end'`.
 
     """
     expanded_page_range = []
@@ -55,7 +57,11 @@ def expand_page_range(page_range: list[str | int]) -> list[int]:
             expanded_page_range.append(int(page))
 
         elif isinstance(page, str) and "-" in page:
-            start, end = page.split("-")
+            parts = page.split("-", maxsplit=1)
+            if not parts[0].isdigit() or not parts[1].isdigit():
+                msg = "range must be a string in the format 'start-end'"
+                raise ValueError(f"Invalid page range: {page} - {msg}")
+            start, end = parts
             expanded_page_range.extend(range(int(start), int(end) + 1))
 
         else:

releasenotes/notes/fix-page-value-error-39ef3fa0300e2479.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    ``expand_page_range()`` now raises a ``ValueError: too many values to unpack`` when a page range string
+    contained more than one hyphen (e.g. ``"10-20-30"``). The parser now validates the
+    format and raises a clear ``ValueError`` with an explanatory message for invalid inputs.

test/utils/test_misc.py

@@ -13,6 +13,7 @@
     _normalize_metadata_field_name,
     _parse_dict_from_json,
     _reciprocal_rank_fusion,
+    expand_page_range,
 )
 
 
@@ -168,3 +169,29 @@ def test_parse_dict_from_json_missing_keys_raise_false(self, mock_logger):
         assert "Missing expected keys in JSON: {missing_keys}" in args[0]
         assert kwargs["missing_keys"] == ["key2"]
         assert kwargs["keys"] == ["key1"]
+
+
+class TestExpandPageRange:
+    def test_single_page_integers(self):
+        assert expand_page_range([1, 3, 5]) == [1, 3, 5]
+
+    def test_single_page_strings(self):
+        assert expand_page_range(["1", "3", "5"]) == [1, 3, 5]
+
+    def test_range_strings_expanded(self):
+        assert expand_page_range(["1-3", "5", "8", "10-12"]) == [1, 2, 3, 5, 8, 10, 11, 12]
+
+    def test_mixed_integers_and_range_strings(self):
+        assert expand_page_range([1, "3-5", 7]) == [1, 3, 4, 5, 7]
+
+    def test_empty_input_raises_value_error(self):
+        with pytest.raises(ValueError, match="No valid page numbers"):
+            expand_page_range([])
+
+    def test_invalid_string_raises_value_error(self):
+        with pytest.raises(ValueError, match="Invalid page range"):
+            expand_page_range(["abc"])
+
+    def test_malformed_range_with_multiple_hyphens_raises_value_error(self):
+        with pytest.raises(ValueError, match="Invalid page range"):
+            expand_page_range(["1-3", "5-10-15"])