Skip to content

Commit 0ce70ba

Browse files
Removed cql2-text in supported filter-lang for FilterExtensionPostRequest model (#755)
* Removed `cql2-text` in supported `filter-lang` for `FilterExtensionPostRequest` model * update tests
1 parent 753341f commit 0ce70ba

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
### Removed
6+
7+
* Removed `cql2-text` in supported `filter-lang` for `FilterExtensionPostRequest` model (as per specification)
8+
59
## [3.0.2] - 2024-09-20
610

711
### Added

stac_fastapi/api/tests/test_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def get_search(
191191
"collections": ["test"],
192192
"filter": {},
193193
"filter-crs": "EPSG:4326",
194-
"filter-lang": "cql2-text",
194+
"filter-lang": "cql2-json",
195195
},
196196
)
197197

stac_fastapi/api/tests/test_models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def route(model=Depends(request_model)):
6363

6464
@pytest.mark.parametrize(
6565
"filter,passes",
66-
[(None, True), ({"test": "test"}, True), ("test==test", False), ([], False)],
66+
[(None, True), ({"test": "test"}, True), ([], False)],
6767
)
6868
def test_create_post_request_model(filter, passes):
6969
request_model = create_post_request_model(
@@ -82,7 +82,7 @@ def test_create_post_request_model(filter, passes):
8282
datetime="2020-01-01T00:00:00Z",
8383
limit=10,
8484
filter=filter,
85-
**{"filter-crs": "epsg:4326", "filter-lang": "cql2-text"},
85+
**{"filter-crs": "epsg:4326", "filter-lang": "cql2-json"},
8686
)
8787

8888
assert model.collections == ["test1", "test2"]

stac_fastapi/extensions/stac_fastapi/extensions/core/filter/request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class FilterExtensionPostRequest(BaseModel):
7070
default=None,
7171
description="The coordinate reference system (CRS) used by spatial literals in the 'filter' value. Default is `http://www.opengis.net/def/crs/OGC/1.3/CRS84`", # noqa: E501
7272
)
73-
filter_lang: Optional[FilterLang] = Field(
73+
filter_lang: Optional[Literal["cql-json", "cql2-json"]] = Field(
7474
alias="filter-lang",
7575
default="cql2-json",
7676
description="The CQL filter encoding that the 'filter' value uses.",

stac_fastapi/extensions/tests/test_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ def test_search_filter_post_filter_lang_default(client: TestClient):
6262

6363
def test_search_filter_post_filter_lang_non_default(client: TestClient):
6464
"""Test search POST endpoint with filter ext."""
65-
filter_lang_value = "cql2-text"
65+
filter_lang_value = "cql-json"
6666
response = client.post(
6767
"/search",
6868
json={
6969
"collections": ["test"],
70-
"filter": {"op": "=", "args": [{"property": "test_property"}, "test-value"]},
70+
"filter": {"eq": [{"property": "test_property"}, "test-value"]},
7171
"filter-lang": filter_lang_value,
7272
},
7373
)

0 commit comments

Comments
 (0)