Skip to content

better queryables and illegal_argument_exception fix for OS items load #427

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

Merged
merged 11 commits into from
Sep 23, 2025
Merged

better queryables and illegal_argument_exception fix for OS items load #427

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a4dc5b
added missing copy(), updated DEFAULT_QUERYABLES so it contains only …
MathewNWSH Sep 4, 2025
defafc5
precommit fixes
MathewNWSH Sep 4, 2025
c14529c
queryables, updated:
MathewNWSH Sep 4, 2025
45b4b96
provided mandatory fixes mentioned by Zaczero
MathewNWSH Sep 5, 2025
9b2c7f2
removed Optional from url_str
MathewNWSH Sep 5, 2025
f4a98e3
fix error causing illegal_argument_exception
MathewNWSH Sep 12, 2025
8586473
Merge branch 'main' into main
jonhealy1 Sep 22, 2025
20b576f
updated changelog
MathewNWSH Sep 23, 2025
b4e075d
lint edits
MathewNWSH Sep 23, 2025
3d9a906
fix changelog
MathewNWSH Sep 23, 2025
b1297bc
Merge branch 'main' into main
jonhealy1 Sep 23, 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
18 changes: 0 additions & 18 deletions stac_fastapi/core/stac_fastapi/core/extensions/filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,6 @@
"description": "Creation Timestamp",
"$ref": "https://schemas.stacspec.org/v1.0.0/item-spec/json-schema/datetime.json#/properties/updated",
},
"cloud_cover": {
"description": "Cloud Cover",
"$ref": "https://stac-extensions.github.io/eo/v1.0.0/schema.json#/definitions/fields/properties/eo:cloud_cover",
},
"cloud_shadow_percentage": {
"title": "Cloud Shadow Percentage",
"description": "Cloud Shadow Percentage",
"type": "number",
"minimum": 0,
"maximum": 100,
},
"nodata_pixel_percentage": {
"title": "No Data Pixel Percentage",
"description": "No Data Pixel Percentage",
"type": "number",
"minimum": 0,
"maximum": 100,
},
}
"""Queryables that are present in all collections."""

Expand Down
18 changes: 9 additions & 9 deletions stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/filter/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from typing import Any, Dict, Optional, Tuple

import attr
from fastapi import Request

from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
from stac_fastapi.core.extensions.filter import ALL_QUERYABLES, DEFAULT_QUERYABLES
Expand All @@ -20,6 +21,7 @@ class EsAsyncBaseFiltersClient(AsyncBaseFiltersClient):
async def get_queryables(
self, collection_id: Optional[str] = None, **kwargs
) -> Dict[str, Any]:
request: Optional[Request] = kwargs.get("request").url
Copy link
Contributor

Choose a reason for hiding this comment

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

Here, you put code before a docstring, which I believe removes the docstring from the method. This typing : Optional[Request] also seems incorrect. url with either be of Url or str type.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done, thanks :)

"""Get the queryables available for the given collection_id.

If collection_id is None, returns the intersection of all
Expand All @@ -38,8 +40,8 @@ async def get_queryables(
Dict[str, Any]: A dictionary containing the queryables for the given collection.
"""
queryables: Dict[str, Any] = {
"$schema": "https://json-schema.org/draft/2019-09/schema",
"$id": "https://stac-api.example.com/queryables",
"$schema": "https://json-schema.org/draft-07/schema#",
Copy link
Contributor

Choose a reason for hiding this comment

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

An empty fragment # in links does nothing. May as well remove the extra character to keep the link clean.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done, thanks :)

"$id": f"{request!s}",
"type": "object",
"title": "Queryables for STAC API",
"description": "Queryable names for the STAC API Item Search filter.",
Expand All @@ -49,13 +51,11 @@ async def get_queryables(
if not collection_id:
return queryables

properties: Dict[str, Any] = queryables["properties"]
queryables.update(
{
"properties": properties,
"additionalProperties": False,
}
)
properties: Dict[str, Any] = queryables["properties"].copy()
queryables.update({
"properties": properties,
"additionalProperties": False,
})

mapping_data = await self.database.get_items_mapping(collection_id)
mapping_properties = next(iter(mapping_data.values()))["mappings"]["properties"]
Expand Down