allow absurd page sizes

Author: aaxelb

trove/trovesearch/page_cursor.py

@@ -14,10 +14,13 @@
 MANY_MORE = -1
 MAX_OFFSET = 9997
 
+DEFAULT_PAGE_SIZE = 13
+MAX_PAGE_SIZE = 9997
+
 
 @dataclasses.dataclass
 class PageCursor:
-    page_size: int
+    page_size: int = DEFAULT_PAGE_SIZE
     total_count: int = MANY_MORE
 
     @classmethod
@@ -36,6 +39,10 @@ def from_cursor(cls, other_cursor: PageCursor) -> typing.Self:
             return dataclasses.replace(other_cursor)  # simple copy
         return cls(*dataclasses.astuple(other_cursor))
 
+    def __post_init__(self):
+        if self.page_size > MAX_PAGE_SIZE:
+            self.page_size = MAX_PAGE_SIZE
+
     def as_queryparam_value(self) -> str:
         _cls_key = _PageCursorTypes(type(self)).name
         _as_json = json.dumps([_cls_key, *dataclasses.astuple(self)])

trove/trovesearch/search_params.py

@@ -11,7 +11,10 @@
 from primitive_metadata import primitive_rdf
 
 from trove import exceptions as trove_exceptions
-from trove.trovesearch.page_cursor import PageCursor
+from trove.trovesearch.page_cursor import (
+    DEFAULT_PAGE_SIZE,
+    PageCursor,
+)
 from trove.util.queryparams import (
     QueryparamDict,
     QueryparamName,
@@ -47,10 +50,6 @@
 # optional prefix for "sort" values
 DESCENDING_SORT_PREFIX = '-'
 
-# for "page[size]" values
-DEFAULT_PAGE_SIZE = 13
-MAX_PAGE_SIZE = 101
-
 # between each step in a property path "foo.bar.baz"
 PROPERTYPATH_DELIMITER = '.'
 
@@ -671,11 +670,11 @@ def _get_page_cursor(queryparams: QueryparamDict) -> PageCursor:
     _cursor_value = _get_single_value(queryparams, QueryparamName('page', ('cursor',)))
     if _cursor_value:
         return PageCursor.from_queryparam_value(_cursor_value)
+    _size_value = _get_single_value(queryparams, QueryparamName('page', ('size',)))
+    if _size_value is None:
+        return PageCursor()
     try:
-        _size = int(  # TODO: 400 response on non-int value
-            _get_single_value(queryparams, QueryparamName('page', ('size',)))
-            or DEFAULT_PAGE_SIZE
-        )
+        _size = int(_size_value)
     except ValueError:
         raise trove_exceptions.InvalidQueryParamValue('page[size]')
-    return PageCursor(page_size=min(_size, MAX_PAGE_SIZE))
+    return PageCursor(page_size=_size)