From 00dd9d8ef2b1bf09d26c992618fa84e3ea60df48 Mon Sep 17 00:00:00 2001 From: geospatial-jeff Date: Thu, 4 Aug 2022 05:10:55 -0600 Subject: [PATCH 1/3] dont break on app startup when pagination extension is not included --- stac_fastapi/api/stac_fastapi/api/app.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stac_fastapi/api/stac_fastapi/api/app.py b/stac_fastapi/api/stac_fastapi/api/app.py index 0632a5bab..e06f23602 100644 --- a/stac_fastapi/api/stac_fastapi/api/app.py +++ b/stac_fastapi/api/stac_fastapi/api/app.py @@ -275,11 +275,15 @@ def register_get_item_collection(self): Returns: None """ - get_pagination_model = self.get_extension(self.pagination_extension).GET + is_paginated = self.get_extension(self.pagination_extension) + if is_paginated is not None: + mixins = [is_paginated.GET] + else: + mixins = None request_model = create_request_model( "ItemCollectionURI", base_model=ItemCollectionUri, - mixins=[get_pagination_model], + mixins=mixins, ) self.router.add_api_route( name="Get ItemCollection", From 8271588453f61eeb28612a4f7f031faa04f38dd5 Mon Sep 17 00:00:00 2001 From: geospatial-jeff Date: Thu, 4 Aug 2022 05:13:24 -0600 Subject: [PATCH 2/3] update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 6bffd8bc8..1d1d4a92c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -43,6 +43,7 @@ from the request body, if present, and falls back to using the path parameter if no `"collection"` property is found in the body ([#425](https://github.com/stac-utils/stac-fastapi/pull/425)) * PGStac Backend Transactions endpoints return added Item/Collection instead of Item/Collection from request ([#424](https://github.com/stac-utils/stac-fastapi/pull/424)) +* Application no longer breaks on startup when pagination extension is not included ([#444](https://github.com/stac-utils/stac-fastapi/pull/444)) ## [2.3.0] From baa90b6c4df65e30ca0a9071c6a6ac42543c187d Mon Sep 17 00:00:00 2001 From: geospatial-jeff Date: Thu, 4 Aug 2022 05:14:33 -0600 Subject: [PATCH 3/3] better variable names --- stac_fastapi/api/stac_fastapi/api/app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stac_fastapi/api/stac_fastapi/api/app.py b/stac_fastapi/api/stac_fastapi/api/app.py index e06f23602..eee9ad748 100644 --- a/stac_fastapi/api/stac_fastapi/api/app.py +++ b/stac_fastapi/api/stac_fastapi/api/app.py @@ -275,9 +275,9 @@ def register_get_item_collection(self): Returns: None """ - is_paginated = self.get_extension(self.pagination_extension) - if is_paginated is not None: - mixins = [is_paginated.GET] + pagination_extension = self.get_extension(self.pagination_extension) + if pagination_extension is not None: + mixins = [pagination_extension.GET] else: mixins = None request_model = create_request_model(