Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update pagination for collection-search #155

Merged
merged 16 commits into from
Jan 13, 2025
Merged

update pagination for collection-search #155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
456c515
add failing test
vincentsarago Oct 7, 2024
a9dce7e
handle collection paging differently (#156)
hrodmn Oct 8, 2024
66a540e
Merge branch 'main' of https://github.com/stac-utils/stac-fastapi-pgs…
vincentsarago Oct 9, 2024
8862c93
add OffsetPaginationExtension
vincentsarago Oct 9, 2024
576a9dc
uncomment test
vincentsarago Oct 9, 2024
c4a02a6
Merge branch 'main' of https://github.com/stac-utils/stac-fastapi-pgs…
vincentsarago Jan 7, 2025
de4da9f
update to pgstac 0.9.2
vincentsarago Jan 7, 2025
0d44b2c
update prev logic
vincentsarago Jan 8, 2025
e2aa27c
only test 0.9.0
vincentsarago Jan 8, 2025
c95f39a
update pypstac version
vincentsarago Jan 8, 2025
5108be4
add back 0.8 support but allow skip tests
vincentsarago Jan 9, 2025
d025c9d
skip for 0.8
vincentsarago Jan 9, 2025
9293dd8
remove warnings
vincentsarago Jan 9, 2025
bd13682
fallback to all_collections when `CollectionSearchExtension` is not e…
vincentsarago Jan 10, 2025
60deedd
add offset=0
vincentsarago Jan 10, 2025
041f2de
Update tests/conftest.py
vincentsarago Jan 13, 2025
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
3 changes: 0 additions & 3 deletions stac_fastapi/pgstac/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,6 @@ async def all_collections( # noqa: C901

linked_collections.append(coll)

if not collections:
next_link = None

links = await CollectionSearchPagingLinks(
request=request,
next=next_link,
Expand Down
18 changes: 1 addition & 17 deletions stac_fastapi/pgstac/models/links.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,23 +206,7 @@ def link_prev(self):
if self.prev is not None:
method = self.request.method
if method == "GET":
u = urlparse(self.url)
params = parse_qs(u.query)
params.update(self.prev["body"])

# if offset is equal to default value (0), drop it
if params.get("offset", -1) == 0:
_ = params.pop("offset")

param_string = unquote(urlencode(params, True))
href = ParseResult(
scheme=u.scheme,
netloc=u.netloc,
path=u.path,
params=u.params,
query=param_string,
fragment=u.fragment,
).geturl()
href = merge_params(self.url, self.prev["body"])
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted this and now we will return URLs with offset=0


# if prev link is equal to this link, skip it
if href == self.url:
Expand Down
2 changes: 1 addition & 1 deletion tests/resources/test_collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ async def test_get_collections_search_pagination(
assert len(links) == 3
assert {"root", "self", "previous"} == {link["rel"] for link in links}
prev_link = list(filter(lambda link: link["rel"] == "previous", links))[0]
assert "offset" not in prev_link["href"]
assert "offset" in prev_link["href"]

###################
# offset=0, should not have next/previous link
Expand Down
Loading