Skip to content

advertise correct conformance class uri strings #102

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.

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 2 commits into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 27 additions & 2 deletions stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
"""FastAPI application."""
from typing import List

import attr

from stac_fastapi.api.app import StacApi
from stac_fastapi.api.models import create_get_request_model, create_post_request_model
from stac_fastapi.elasticsearch.config import ElasticsearchSettings
Expand All @@ -21,12 +25,33 @@
settings = ElasticsearchSettings()
session = Session.create_from_settings(settings)


# All of these extensions have their conformance class URL
# incorrect, with an extra `/` before the #
@attr.s
class FixedSortExtension(SortExtension):
"""Fixed Sort Extension string."""

conformance_classes: List[str] = attr.ib(
factory=lambda: ["https://api.stacspec.org/v1.0.0-beta.4/item-search#sort"]
)


@attr.s
class FixedQueryExtension(QueryExtension):
"""Fixed Query Extension string."""

conformance_classes: List[str] = attr.ib(
factory=lambda: ["https://api.stacspec.org/v1.0.0-beta.4/item-search#query"]
)


extensions = [
TransactionExtension(client=TransactionsClient(session=session), settings=settings),
BulkTransactionExtension(client=BulkTransactionsClient(session=session)),
# FieldsExtension(),
QueryExtension(),
SortExtension(),
FixedQueryExtension(),
FixedSortExtension(),
TokenPaginationExtension(),
ContextExtension(),
]
Expand Down
7 changes: 3 additions & 4 deletions stac_fastapi/elasticsearch/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@

from stac_fastapi.api.app import StacApi
from stac_fastapi.api.models import create_request_model
from stac_fastapi.elasticsearch.app import FixedQueryExtension, FixedSortExtension
from stac_fastapi.elasticsearch.config import AsyncElasticsearchSettings
from stac_fastapi.elasticsearch.core import (
BulkTransactionsClient,
CoreClient,
TransactionsClient,
)
from stac_fastapi.elasticsearch.database_logic import create_collection_index
from stac_fastapi.elasticsearch.extensions import QueryExtension
from stac_fastapi.extensions.core import ( # FieldsExtension,
ContextExtension,
SortExtension,
TokenPaginationExtension,
TransactionExtension,
)
Expand Down Expand Up @@ -144,9 +143,9 @@ async def app():
client=TransactionsClient(session=None), settings=settings
),
ContextExtension(),
SortExtension(),
FixedSortExtension(),
# FieldsExtension(),
QueryExtension(),
FixedQueryExtension(),
TokenPaginationExtension(),
]

Expand Down