From 8738b68eb72f057a60720b7a71010197b82ec9e6 Mon Sep 17 00:00:00 2001 From: jamesfisher-gis Date: Sun, 23 Jun 2024 12:47:48 -0400 Subject: [PATCH 1/5] aggregations type --- DEV.ipynb | 0 .../stac_fastapi/extensions/core/aggregation/request.py | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 DEV.ipynb diff --git a/DEV.ipynb b/DEV.ipynb new file mode 100644 index 000000000..e69de29bb diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py index fcab3323f..d9658269f 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py @@ -8,17 +8,17 @@ FilterExtensionGetRequest, FilterExtensionPostRequest, ) -from stac_fastapi.types.search import BaseSearchGetRequest, BaseSearchPostRequest +from stac_fastapi.types.search import BaseSearchGetRequest, BaseSearchPostRequest, str2list @attr.s class AggregationExtensionGetRequest(BaseSearchGetRequest, FilterExtensionGetRequest): """Aggregation Extension GET request model.""" - aggregations: Optional[str] = attr.ib(default=None) + aggregations: Optional[str] = attr.ib(default=None, converter=str2list) class AggregationExtensionPostRequest(BaseSearchPostRequest, FilterExtensionPostRequest): """Aggregation Extension POST request model.""" - aggregations: Optional[Union[str, List[str]]] = attr.ib(default=None) + aggregations: Optional[List[str]] = attr.ib(default=None) From 403a83f4ccc3d1e4687a6a8f14a0214ac917f9c4 Mon Sep 17 00:00:00 2001 From: jamesfisher-gis Date: Sun, 23 Jun 2024 12:48:19 -0400 Subject: [PATCH 2/5] aggregations type --- DEV.ipynb | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 DEV.ipynb diff --git a/DEV.ipynb b/DEV.ipynb deleted file mode 100644 index e69de29bb..000000000 From e14a1081a3f5a9abc20765d034ac80efb4e23bd4 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 24 Jun 2024 17:14:26 -0400 Subject: [PATCH 3/5] remove filter extension dependency --- .../stac_fastapi/extensions/core/aggregation/request.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py index d9658269f..13f359dc8 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py @@ -4,21 +4,17 @@ import attr -from stac_fastapi.extensions.core.filter.request import ( - FilterExtensionGetRequest, - FilterExtensionPostRequest, -) from stac_fastapi.types.search import BaseSearchGetRequest, BaseSearchPostRequest, str2list @attr.s -class AggregationExtensionGetRequest(BaseSearchGetRequest, FilterExtensionGetRequest): +class AggregationExtensionGetRequest(BaseSearchGetRequest): """Aggregation Extension GET request model.""" aggregations: Optional[str] = attr.ib(default=None, converter=str2list) -class AggregationExtensionPostRequest(BaseSearchPostRequest, FilterExtensionPostRequest): +class AggregationExtensionPostRequest(BaseSearchPostRequest): """Aggregation Extension POST request model.""" aggregations: Optional[List[str]] = attr.ib(default=None) From 5038dfe19292fc36cfa99072b2e39fe847398e26 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 24 Jun 2024 17:16:18 -0400 Subject: [PATCH 4/5] linting --- .../stac_fastapi/extensions/core/aggregation/request.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py b/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py index 13f359dc8..08ebe0cfc 100644 --- a/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py +++ b/stac_fastapi/extensions/stac_fastapi/extensions/core/aggregation/request.py @@ -1,10 +1,14 @@ """Request model for the Aggregation extension.""" -from typing import List, Optional, Union +from typing import List, Optional import attr -from stac_fastapi.types.search import BaseSearchGetRequest, BaseSearchPostRequest, str2list +from stac_fastapi.types.search import ( + BaseSearchGetRequest, + BaseSearchPostRequest, + str2list, +) @attr.s From 9c36ba17f7a58dc508db4587aa35dbfba7e9440d Mon Sep 17 00:00:00 2001 From: James Date: Mon, 24 Jun 2024 17:29:49 -0400 Subject: [PATCH 5/5] update changelog --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 3d63fea65..ea0209926 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ * Updated default filter language in filter extension's POST search request model to match the extension's documentation [#711](https://github.com/stac-utils/stac-fastapi/issues/711) +### Removed + +* Removed the Filter Extension depenency from `AggregationExtensionPostRequest` and `AggregationExtensionGetRequest` [#716](https://github.com/stac-utils/stac-fastapi/pull/716) + ## [3.0.0a3] - 2024-06-13 ### Added