tom/qubed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix link templates

Browse Source
This commit is contained in:
Tom 2025-04-17 09:31:51 +01:00
parent 2fa99d775c
commit 10106ba6d8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stac_server/main.py
View File

@ -273,11 +273,15 @@ async def get_STAC(
request: dict[str, str | list[str]] = Depends(parse_request), request: dict[str, str | list[str]] = Depends(parse_request),
): ):
qube, paths = follow_query(request, qubes[key]) qube, paths = follow_query(request, qubes[key])
kvs = [
f"{k}={','.join(v)}" if isinstance(v, list) else f"{k}={v}"
for k, v in request.items()
]
request_params = "&".join(kvs)
def make_link(key_name, paths, values): def make_link(key_name, paths, values):
"""Take a MARS Key and information about which paths matched up to this point and use it to make a STAC Link""" """Take a MARS Key and information about which paths matched up to this point and use it to make a STAC Link"""
path = paths[0] href_template = f"/stac?{request_params}{'&' if request_params else ''}{key_name}={{{key_name}}}"
href_template = f"/stac?{'&'.join(path)}{'&' if path else ''}{key_name}={{}}"
values_from_mars_language = mars_language.get(key_name, {}).get("values", []) values_from_mars_language = mars_language.get(key_name, {}).get("values", [])
if all(isinstance(v, list) for v in values_from_mars_language): if all(isinstance(v, list) for v in values_from_mars_language):
@ -297,7 +301,7 @@ async def get_STAC(
"rel": "child", "rel": "child",
"type": "application/json", "type": "application/json",
"variables": { "variables": {
key: { key_name: {
"type": "string", "type": "string",
"description": mars_language.get(key_name, {}).get( "description": mars_language.get(key_name, {}).get(
"description", "" "description", ""
@ -330,9 +334,7 @@ async def get_STAC(
stac_collection = { stac_collection = {
"type": "Catalog", "type": "Catalog",
"stac_version": "1.0.0", "stac_version": "1.0.0",
"id": "root" "id": "root" if not request else "/stac?" + request_params,
if not request
else ",".join(f"{k}={v}" for k, v in request.items()),
"description": "STAC collection representing potential children of this request", "description": "STAC collection representing potential children of this request",
"links": [make_link(p["key"], p["paths"], p["values"]) for p in paths], "links": [make_link(p["key"], p["paths"], p["values"]) for p in paths],
"debug": { "debug": {