From 16e2443c9bec42f68796bfc96bf6125773eb9773 Mon Sep 17 00:00:00 2001 From: tjellicoe Date: Fri, 26 Apr 2024 16:26:25 +0100 Subject: [PATCH 1/4] Corrected collection search response class --- .../extensions/core/collectionSearch/collectionSearch.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py index 91f4fc6d6..cbf216bb4 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py @@ -5,7 +5,7 @@ import attr from fastapi import APIRouter, FastAPI -from starlette.responses import Response +from starlette.responses import JSONResponse, Response from stac_pydantic.api.collections import Collections from stac_fastapi.api.models import JSONSchemaResponse @@ -67,8 +67,7 @@ class CollectionSearchExtension(ApiExtension): ] ) router: APIRouter = attr.ib(factory=APIRouter) - response_class: Type[Response] = attr.ib(default=JSONSchemaResponse) - + response_class: Type[Response] = attr.ib(default=JSONResponse) def register(self, app: FastAPI) -> None: """Register the extension with a FastAPI application. From 948ce1eb0f4b0e9c89ecd6d8e33e69827b083b99 Mon Sep 17 00:00:00 2001 From: tjellicoe Date: Fri, 26 Apr 2024 16:30:25 +0100 Subject: [PATCH 2/4] Updating collection search response model --- .../extensions/core/collectionSearch/collectionSearch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py index cbf216bb4..defaa5702 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py @@ -82,7 +82,7 @@ def register(self, app: FastAPI) -> None: self.router.add_api_route( name="Collection Search", path="/collection-search", - response_model=Collections, + response_model=None, response_class=self.response_class, response_model_exclude_unset=True, response_model_exclude_none=True, @@ -95,7 +95,7 @@ def register(self, app: FastAPI) -> None: self.router.add_api_route( name="Collection Search", path="/collection-search", - response_model=Collections, + response_model=None, response_class=self.response_class, response_model_exclude_unset=True, response_model_exclude_none=True, From 6a125074ab234ea7eee23203458720e445623473 Mon Sep 17 00:00:00 2001 From: tjellicoe Date: Fri, 26 Apr 2024 16:45:12 +0100 Subject: [PATCH 3/4] Updating response model for collection search --- .../extensions/core/collectionSearch/collectionSearch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py index defaa5702..cbf216bb4 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py @@ -82,7 +82,7 @@ def register(self, app: FastAPI) -> None: self.router.add_api_route( name="Collection Search", path="/collection-search", - response_model=None, + response_model=Collections, response_class=self.response_class, response_model_exclude_unset=True, response_model_exclude_none=True, @@ -95,7 +95,7 @@ def register(self, app: FastAPI) -> None: self.router.add_api_route( name="Collection Search", path="/collection-search", - response_model=None, + response_model=Collections, response_class=self.response_class, response_model_exclude_unset=True, response_model_exclude_none=True, From cb30fbb4311365fe615d99ab05783261025bd77e Mon Sep 17 00:00:00 2001 From: tjellicoe Date: Fri, 26 Apr 2024 16:51:22 +0100 Subject: [PATCH 4/4] Updating response model for collection search --- .../extensions/core/collectionSearch/collectionSearch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py index cbf216bb4..defaa5702 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/collectionSearch/collectionSearch.py @@ -82,7 +82,7 @@ def register(self, app: FastAPI) -> None: self.router.add_api_route( name="Collection Search", path="/collection-search", - response_model=Collections, + response_model=None, response_class=self.response_class, response_model_exclude_unset=True, response_model_exclude_none=True, @@ -95,7 +95,7 @@ def register(self, app: FastAPI) -> None: self.router.add_api_route( name="Collection Search", path="/collection-search", - response_model=Collections, + response_model=None, response_class=self.response_class, response_model_exclude_unset=True, response_model_exclude_none=True,