Skip to content

Commit

Permalink
Configure whether to open assets URLs during validation, and http hea…
Browse files Browse the repository at this point in the history 
…ders
  • Loading branch information
@vprivat-ads
vprivat-ads committed Dec 2, 2024
1 parent 08968fa commit 4e93192
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ PyYAML = "^6.0.1"
Shapely = ">=1.8.4"
more_itertools = ">=8.14,<11.0"
stac-check = "^1.3.1"
stac-validator = "^3.2.0"
stac-validator = "^3.4.0"
deepdiff = ">=6.2.3,<9.0.0"

[tool.poetry.dev-dependencies]
Expand Down
31 changes: 20 additions & 11 deletions src/stac_api_validator/validations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ def stac_validate(
errors: Errors,
context: Context,
method: Method = Method.GET,
open_assets_urls: bool = True,
headers: dict = {},
) -> None:
if not body:
errors += f"[{context}] : {method} {url} body was empty when running stac-validate and stac-check"
Expand All @@ -350,8 +352,9 @@ def stac_validate(
errors += f"[{context}] : {method} {url} '{body.get('id')}' failed pystac hydration: {e}"

if _type in ["Collection", "Feature"]:
logger.debug(f"stac-validator validation: {url}")
if not (
stac_validator := StacValidate(links=True, assets=True)
stac_validator := StacValidate(links=True, assets=True, assets_open_urls=open_assets_urls, headers=headers)
).validate_dict(body):
errors += f"[{context}] : {method} {url} failed stac-validator validation: {stac_validator.message}"

Expand Down Expand Up @@ -548,6 +551,7 @@ def validate_api(
query_config: QueryConfig,
transaction_collection: Optional[str],
headers: Optional[Dict[str, str]],
open_assets_urls: bool = True,
) -> Tuple[Warnings, Errors]:
warnings = Warnings()
errors = Errors()
Expand Down Expand Up @@ -598,13 +602,13 @@ def validate_api(

if "collections" in ccs_to_validate:
logger.info("Validating STAC API - Collections conformance class.")
validate_collections(landing_page_body, collection, errors, warnings, r_session)
validate_collections(landing_page_body, collection, errors, warnings, r_session, open_assets_urls)

conforms_to = landing_page_body.get("conformsTo", [])

if "features" in ccs_to_validate:
logger.info("Validating STAC API - Features conformance class.")
validate_collections(landing_page_body, collection, errors, warnings, r_session)
validate_collections(landing_page_body, collection, errors, warnings, r_session, open_assets_urls)
validate_features(
landing_page_body,
conforms_to,
Expand All @@ -613,7 +617,8 @@ def validate_api(
warnings,
errors,
r_session,
validate_pagination=validate_pagination,
validate_pagination,
open_assets_urls,
)

if "transaction" in ccs_to_validate:
Expand Down Expand Up @@ -664,6 +669,7 @@ def validate_api(
conformance_classes=ccs_to_validate,
r_session=r_session,
validate_pagination=validate_pagination,
open_assets_urls=open_assets_urls,
)

if "item-search#fields" in ccs_to_validate:
Expand Down Expand Up @@ -963,6 +969,7 @@ def validate_collections(
errors: Errors,
warnings: Warnings,
r_session: Session,
open_assets_urls: bool = True,
) -> None:
if not (data_link := link_by_rel(root_body["links"], "data")):
errors += f"[{Context.COLLECTIONS}] /: Link[rel=data] must href /collections"
Expand Down Expand Up @@ -1019,7 +1026,7 @@ def validate_collections(
)
else:
for body in collections_list:
stac_validate(collections_url, body, errors, Context.COLLECTIONS)
stac_validate(collections_url, body, errors, Context.COLLECTIONS, open_assets_urls, r_session.headers)

collection_url = f"{data_link['href']}/{collection}"
_, body, resp_headers = retrieve(
Expand Down Expand Up @@ -1047,7 +1054,7 @@ def validate_collections(
if not link_by_rel(body.get("links", []), "parent"):
errors += f"[{Context.COLLECTIONS}] : {collection_url} does not have parent link"

stac_validate(collection_url, body, errors, Context.COLLECTIONS)
stac_validate(collection_url, body, errors, Context.COLLECTIONS, open_assets_urls, r_session.headers)
stac_check(collection_url, errors, warnings, Context.COLLECTIONS)

# todo: collection pagination
Expand All @@ -1062,6 +1069,7 @@ def validate_features(
errors: Errors,
r_session: Session,
validate_pagination: bool,
open_assets_urls: bool = True,
) -> None:
if not geometry:
errors += f"[{Context.FEATURES}] Geometry parameter required for running Features validations."
Expand Down Expand Up @@ -1132,7 +1140,7 @@ def validate_features(
if not body:
errors += f"[{Context.FEATURES}] GET {collection_items_url} returned an empty body"
else:
stac_validate(collection_items_url, body, errors, Context.FEATURES)
stac_validate(collection_items_url, body, errors, Context.FEATURES, open_assets_urls, r_session.headers)

item_url = link_by_rel(body.get("features", [])[0]["links"], "self")[
"href"
Expand All @@ -1147,7 +1155,7 @@ def validate_features(
r_session=r_session,
)

stac_validate(item_url, body, errors, Context.FEATURES)
stac_validate(item_url, body, errors, Context.FEATURES, open_assets_urls, r_session.headers)
stac_check(item_url, errors, warnings, Context.FEATURES)

# Validate Features non-existent item
Expand Down Expand Up @@ -1195,7 +1203,7 @@ def validate_features(
if not link_by_rel(body.get("links", []), "root"):
errors += f"[{Context.FEATURES}] GET {collection_items_url} does not have root link"

stac_validate(collection_items_url, body, errors, Context.FEATURES)
stac_validate(collection_items_url, body, errors, Context.FEATURES, open_assets_urls, r_session.headers)

item = next(iter(body.get("features", [])), None)

Expand Down Expand Up @@ -1233,7 +1241,7 @@ def validate_features(
if not link_by_rel(body.get("links", []), "parent"):
errors += f"[{Context.FEATURES}] GET {item_url} does not have parent link"

stac_validate(item_url, body, errors, Context.FEATURES)
stac_validate(item_url, body, errors, Context.FEATURES, open_assets_urls, r_session.headers)
stac_check(item_url, errors, warnings, Context.FEATURES)

if validate_pagination:
Expand Down Expand Up @@ -1270,6 +1278,7 @@ def validate_item_search(
conformance_classes: List[str],
r_session: Session,
validate_pagination: bool,
open_assets_urls: bool = True,
) -> None:
links = root_body.get("links")

Expand Down Expand Up @@ -1317,7 +1326,7 @@ def validate_item_search(
)

if body:
stac_validate(search_url, body, errors, Context.ITEM_SEARCH)
stac_validate(search_url, body, errors, Context.ITEM_SEARCH, open_assets_urls, r_session.headers)

validate_item_search_limit(search_url, methods, errors, r_session)
validate_item_search_bbox_xor_intersects(search_url, methods, errors, r_session)
Expand Down

0 comments on commit 4e93192

Please sign in to comment.