From 311fabdcc607a281f529991a8476228613c0087b Mon Sep 17 00:00:00 2001 From: jonhealy1 Date: Wed, 31 Jan 2024 11:20:01 +0800 Subject: [PATCH] reorganize code, tests --- Dockerfile.dev.es | 7 ++++--- docker-compose.yml | 7 ++++--- .../tests => stac_api}/__init__.py | 0 {stac_fastapi => stac_api}/common/__init__.py | 0 .../common/base_database_logic.py | 0 {stac_fastapi => stac_api}/common/core.py | 20 +++++++++---------- .../common/datetime_utils.py | 0 .../common/extensions/__init__.py | 0 .../common/extensions/filter.py | 0 .../common/extensions/query.py | 0 .../common/models/__init__.py | 0 .../common/models/links.py | 0 .../common/models/search.py | 0 .../common/types/search.py | 2 +- .../elastic_search/README.md | 0 .../elastic_search/__init__.py | 0 .../elastic_search/app.py | 12 +++++------ .../elastic_search/config.py | 0 .../elastic_search/database_logic.py | 14 ++++++------- .../elastic_search/serializers.py | 2 +- .../elastic_search/session.py | 0 .../elastic_search/setup.cfg | 0 .../elastic_search/setup.py | 2 +- .../elastic_search/utilities.py | 0 .../elastic_search/version.py | 0 .../open_search/setup.cfg | 0 .../open_search/setup.py | 0 .../open_search/version.py | 0 .../elastic_search => stac_api}/pytest.ini | 0 .../tests/api => stac_api/tests}/__init__.py | 0 .../tests/api}/__init__.py | 0 .../tests/api/test_api.py | 0 .../tests/clients}/__init__.py | 0 .../tests/clients/test_elasticsearch.py | 0 .../tests/conftest.py | 12 +++++------ .../tests/data/test_collection.json | 0 .../tests/data/test_item.json | 0 .../tests/extensions/cql2/example01.json | 0 .../tests/extensions/cql2/example04.json | 0 .../tests/extensions/cql2/example05a.json | 0 .../tests/extensions/cql2/example06b.json | 0 .../tests/extensions/cql2/example08.json | 0 .../tests/extensions/cql2/example09.json | 0 .../tests/extensions/cql2/example1.json | 0 .../tests/extensions/cql2/example10.json | 0 .../tests/extensions/cql2/example14.json | 0 .../tests/extensions/cql2/example15.json | 0 .../tests/extensions/cql2/example17.json | 0 .../tests/extensions/cql2/example18.json | 0 .../tests/extensions/cql2/example19.json | 0 .../tests/extensions/cql2/example20.json | 0 .../tests/extensions/cql2/example21.json | 0 .../tests/extensions/cql2/example22.json | 0 .../tests/extensions/test_filter.py | 0 stac_api/tests/resources/__init__.py | 0 .../tests/resources/test_collection.py | 0 .../tests/resources/test_conformance.py | 0 .../tests/resources/test_item.py | 0 .../tests/resources/test_mgmt.py | 0 59 files changed, 40 insertions(+), 38 deletions(-) rename {stac_fastapi/elastic_search/tests => stac_api}/__init__.py (100%) rename {stac_fastapi => stac_api}/common/__init__.py (100%) rename {stac_fastapi => stac_api}/common/base_database_logic.py (100%) rename {stac_fastapi => stac_api}/common/core.py (98%) rename {stac_fastapi => stac_api}/common/datetime_utils.py (100%) rename {stac_fastapi => stac_api}/common/extensions/__init__.py (100%) rename {stac_fastapi => stac_api}/common/extensions/filter.py (100%) rename {stac_fastapi => stac_api}/common/extensions/query.py (100%) rename {stac_fastapi => stac_api}/common/models/__init__.py (100%) rename {stac_fastapi => stac_api}/common/models/links.py (100%) rename {stac_fastapi => stac_api}/common/models/search.py (100%) rename {stac_fastapi => stac_api}/common/types/search.py (97%) rename {stac_fastapi => stac_api}/elastic_search/README.md (100%) rename {stac_fastapi => stac_api}/elastic_search/__init__.py (100%) rename {stac_fastapi => stac_api}/elastic_search/app.py (86%) rename {stac_fastapi => stac_api}/elastic_search/config.py (100%) rename {stac_fastapi => stac_api}/elastic_search/database_logic.py (98%) rename {stac_fastapi => stac_api}/elastic_search/serializers.py (98%) rename {stac_fastapi => stac_api}/elastic_search/session.py (100%) rename {stac_fastapi => stac_api}/elastic_search/setup.cfg (100%) rename {stac_fastapi => stac_api}/elastic_search/setup.py (95%) rename {stac_fastapi => stac_api}/elastic_search/utilities.py (100%) rename {stac_fastapi => stac_api}/elastic_search/version.py (100%) rename {stac_fastapi => stac_api}/open_search/setup.cfg (100%) rename {stac_fastapi => stac_api}/open_search/setup.py (100%) rename {stac_fastapi => stac_api}/open_search/version.py (100%) rename {stac_fastapi/elastic_search => stac_api}/pytest.ini (100%) rename {stac_fastapi/elastic_search/tests/api => stac_api/tests}/__init__.py (100%) rename {stac_fastapi/elastic_search/tests/clients => stac_api/tests/api}/__init__.py (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/api/test_api.py (100%) rename {stac_fastapi/elastic_search/tests/resources => stac_api/tests/clients}/__init__.py (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/clients/test_elasticsearch.py (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/conftest.py (94%) rename {stac_fastapi/elastic_search => stac_api}/tests/data/test_collection.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/data/test_item.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example01.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example04.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example05a.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example06b.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example08.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example09.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example1.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example10.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example14.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example15.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example17.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example18.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example19.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example20.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example21.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/cql2/example22.json (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/extensions/test_filter.py (100%) create mode 100644 stac_api/tests/resources/__init__.py rename {stac_fastapi/elastic_search => stac_api}/tests/resources/test_collection.py (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/resources/test_conformance.py (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/resources/test_item.py (100%) rename {stac_fastapi/elastic_search => stac_api}/tests/resources/test_mgmt.py (100%) diff --git a/Dockerfile.dev.es b/Dockerfile.dev.es index b64e2217..f1194d1d 100644 --- a/Dockerfile.dev.es +++ b/Dockerfile.dev.es @@ -13,8 +13,9 @@ ENV CURL_CA BUNDLE=/etc/ssl/certs/ca-certificates.crt WORKDIR /app # Copy the contents of common and elastic_search directories directly into /app -COPY ./stac_fastapi/common /app/stac_fastapi/common -COPY ./stac_fastapi/elastic_search /app/stac_fastapi/elastic_search +COPY ./stac_api/common /app/stac_api/common +COPY ./stac_api/elastic_search /app/stac_api/elastic_search +COPY ./stac_api/tests /app/stac_api/tests # Install dependencies -RUN pip install --no-cache-dir -e ./stac_fastapi/elastic_search[dev,server] +RUN pip install --no-cache-dir -e ./stac_api/elastic_search[dev,server] diff --git a/docker-compose.yml b/docker-compose.yml index 84a36cf5..6cfe18ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,14 +22,15 @@ services: ports: - "8080:8080" volumes: - - ./stac_fastapi/elastic_search:/app/stac_fastapi/elastic_search - - ./stac_fastapi/common:/app/stac_fastapi/common + - ./stac_api/elastic_search:/app/stac_api/elastic_search + - ./stac_api/common:/app/stac_api/common + - ./stac_api/tests:/app/stac_api/tests - ./scripts:/app/scripts - ./esdata:/usr/share/elasticsearch/data depends_on: - elasticsearch command: - bash -c "./scripts/wait-for-it-es.sh es-container:9200 && python -m stac_fastapi.elastic_search.app" + bash -c "./scripts/wait-for-it-es.sh es-container:9200 && python -m stac_api.elastic_search.app" app-opensearch: container_name: stac-fastapi-os diff --git a/stac_fastapi/elastic_search/tests/__init__.py b/stac_api/__init__.py similarity index 100% rename from stac_fastapi/elastic_search/tests/__init__.py rename to stac_api/__init__.py diff --git a/stac_fastapi/common/__init__.py b/stac_api/common/__init__.py similarity index 100% rename from stac_fastapi/common/__init__.py rename to stac_api/common/__init__.py diff --git a/stac_fastapi/common/base_database_logic.py b/stac_api/common/base_database_logic.py similarity index 100% rename from stac_fastapi/common/base_database_logic.py rename to stac_api/common/base_database_logic.py diff --git a/stac_fastapi/common/core.py b/stac_api/common/core.py similarity index 98% rename from stac_fastapi/common/core.py rename to stac_api/common/core.py index 29c653a5..918b5ce0 100644 --- a/stac_fastapi/common/core.py +++ b/stac_api/common/core.py @@ -20,10 +20,10 @@ from stac_pydantic.shared import MimeTypes # from common.base_database_logic import BaseDatabaseLogic -from stac_fastapi.common.models.links import PagingLinks -from stac_fastapi.elastic_search import serializers -from stac_fastapi.elastic_search.serializers import CollectionSerializer, ItemSerializer -from stac_fastapi.elastic_search.session import Session +from stac_api.common.models.links import PagingLinks +from stac_api.elastic_search import serializers +from stac_api.elastic_search.serializers import CollectionSerializer, ItemSerializer +from stac_api.elastic_search.session import Session from stac_fastapi.extensions.third_party.bulk_transactions import ( BaseBulkTransactionsClient, BulkTransactionMethod, @@ -85,13 +85,13 @@ def __attrs_post_init__(self): try: # Dynamically import the database logic based on installed package database_module = importlib.import_module( - "stac_fastapi.elastic_search.database_logic" + "stac_api.elastic_search.database_logic" ) DatabaseLogicClass = getattr(database_module, "DatabaseLogic") except ImportError: # Fall back to OpenSearch if Elasticsearch is not available database_module = importlib.import_module( - "stac_fastapi.open_search.database_logic" + "stac_api.open_search.database_logic" ) DatabaseLogicClass = getattr(database_module, "DatabaseLogic") @@ -580,13 +580,13 @@ def __attrs_post_init__(self): try: # Dynamically import the database logic based on installed package database_module = importlib.import_module( - "stac_fastapi.elastic_search.database_logic" + "stac_api.elastic_search.database_logic" ) DatabaseLogicClass = getattr(database_module, "DatabaseLogic") except ImportError: # Fall back to OpenSearch if Elasticsearch is not available database_module = importlib.import_module( - "stac_fastapi.opensearch.database_logic" + "stac_api.opensearch.database_logic" ) DatabaseLogicClass = getattr(database_module, "DatabaseLogic") @@ -774,13 +774,13 @@ def __attrs_post_init__(self): try: # Dynamically import the database logic based on installed package database_module = importlib.import_module( - "stac_fastapi.elastic_search.database_logic" + "stac_api.elastic_search.database_logic" ) DatabaseLogicClass = getattr(database_module, "DatabaseLogic") except ImportError: # Fall back to OpenSearch if Elasticsearch is not available database_module = importlib.import_module( - "stac_fastapi.opensearch.database_logic" + "stac_api.opensearch.database_logic" ) DatabaseLogicClass = getattr(database_module, "DatabaseLogic") diff --git a/stac_fastapi/common/datetime_utils.py b/stac_api/common/datetime_utils.py similarity index 100% rename from stac_fastapi/common/datetime_utils.py rename to stac_api/common/datetime_utils.py diff --git a/stac_fastapi/common/extensions/__init__.py b/stac_api/common/extensions/__init__.py similarity index 100% rename from stac_fastapi/common/extensions/__init__.py rename to stac_api/common/extensions/__init__.py diff --git a/stac_fastapi/common/extensions/filter.py b/stac_api/common/extensions/filter.py similarity index 100% rename from stac_fastapi/common/extensions/filter.py rename to stac_api/common/extensions/filter.py diff --git a/stac_fastapi/common/extensions/query.py b/stac_api/common/extensions/query.py similarity index 100% rename from stac_fastapi/common/extensions/query.py rename to stac_api/common/extensions/query.py diff --git a/stac_fastapi/common/models/__init__.py b/stac_api/common/models/__init__.py similarity index 100% rename from stac_fastapi/common/models/__init__.py rename to stac_api/common/models/__init__.py diff --git a/stac_fastapi/common/models/links.py b/stac_api/common/models/links.py similarity index 100% rename from stac_fastapi/common/models/links.py rename to stac_api/common/models/links.py diff --git a/stac_fastapi/common/models/search.py b/stac_api/common/models/search.py similarity index 100% rename from stac_fastapi/common/models/search.py rename to stac_api/common/models/search.py diff --git a/stac_fastapi/common/types/search.py b/stac_api/common/types/search.py similarity index 97% rename from stac_fastapi/common/types/search.py rename to stac_api/common/types/search.py index 26a2dbb6..b2536021 100644 --- a/stac_fastapi/common/types/search.py +++ b/stac_api/common/types/search.py @@ -8,7 +8,7 @@ from stac_pydantic.api.extensions.fields import FieldsExtension as FieldsBase -from stac_fastapi.types.config import Settings +from stac_api.types.config import Settings logger = logging.getLogger("uvicorn") logger.setLevel(logging.INFO) diff --git a/stac_fastapi/elastic_search/README.md b/stac_api/elastic_search/README.md similarity index 100% rename from stac_fastapi/elastic_search/README.md rename to stac_api/elastic_search/README.md diff --git a/stac_fastapi/elastic_search/__init__.py b/stac_api/elastic_search/__init__.py similarity index 100% rename from stac_fastapi/elastic_search/__init__.py rename to stac_api/elastic_search/__init__.py diff --git a/stac_fastapi/elastic_search/app.py b/stac_api/elastic_search/app.py similarity index 86% rename from stac_fastapi/elastic_search/app.py rename to stac_api/elastic_search/app.py index 7b251025..0f89c92d 100644 --- a/stac_fastapi/elastic_search/app.py +++ b/stac_api/elastic_search/app.py @@ -3,16 +3,16 @@ from stac_fastapi.api.app import StacApi from stac_fastapi.api.models import create_get_request_model, create_post_request_model -from stac_fastapi.common.core import ( +from stac_api.common.core import ( BulkTransactionsClient, CoreClient, EsAsyncBaseFiltersClient, TransactionsClient, ) -from stac_fastapi.common.extensions import QueryExtension -from stac_fastapi.elastic_search.config import ElasticsearchSettings -from stac_fastapi.elastic_search.database_logic import create_collection_index -from stac_fastapi.elastic_search.session import Session +from stac_api.common.extensions import QueryExtension +from stac_api.elastic_search.config import ElasticsearchSettings +from stac_api.elastic_search.database_logic import create_collection_index +from stac_api.elastic_search.session import Session from stac_fastapi.extensions.core import ( ContextExtension, FieldsExtension, @@ -67,7 +67,7 @@ def run() -> None: import uvicorn uvicorn.run( - "stac_fastapi.elastic_search.app:app", + "stac_api.elastic_search.app:app", host=settings.app_host, port=settings.app_port, log_level="info", diff --git a/stac_fastapi/elastic_search/config.py b/stac_api/elastic_search/config.py similarity index 100% rename from stac_fastapi/elastic_search/config.py rename to stac_api/elastic_search/config.py diff --git a/stac_fastapi/elastic_search/database_logic.py b/stac_api/elastic_search/database_logic.py similarity index 98% rename from stac_fastapi/elastic_search/database_logic.py rename to stac_api/elastic_search/database_logic.py index a4f5a3db..b0a4a02d 100644 --- a/stac_fastapi/elastic_search/database_logic.py +++ b/stac_api/elastic_search/database_logic.py @@ -9,13 +9,13 @@ from elasticsearch_dsl import Q, Search from elasticsearch import exceptions, helpers # type: ignore -from common.extensions import filter -from elastic_search import serializers -from elastic_search.config import AsyncElasticsearchSettings -from elastic_search.config import ( +from stac_api.common.extensions import filter +from stac_api.elastic_search import serializers +from stac_api.elastic_search.config import AsyncElasticsearchSettings +from stac_api.elastic_search.config import ( ElasticsearchSettings as SyncElasticsearchSettings, ) -from elastic_search.utilities import bbox2polygon +from stac_api.elastic_search.utilities import bbox2polygon from stac_fastapi.types.errors import ConflictError, NotFoundError from stac_fastapi.types.stac import Collection, Item @@ -283,10 +283,10 @@ class DatabaseLogic: sync_client = SyncElasticsearchSettings().create_client item_serializer: Type[serializers.ItemSerializer] = attr.ib( - default=serializers.ItemSerializer # type: ignore + default=serializers.ItemSerializer # type: ignore ) collection_serializer: Type[serializers.CollectionSerializer] = attr.ib( - default=serializers.CollectionSerializer # type: ignore + default=serializers.CollectionSerializer # type: ignore ) """CORE LOGIC""" diff --git a/stac_fastapi/elastic_search/serializers.py b/stac_api/elastic_search/serializers.py similarity index 98% rename from stac_fastapi/elastic_search/serializers.py rename to stac_api/elastic_search/serializers.py index ce5d1f32..58b9f458 100644 --- a/stac_fastapi/elastic_search/serializers.py +++ b/stac_api/elastic_search/serializers.py @@ -4,7 +4,7 @@ import attr -from stac_fastapi.common.datetime_utils import now_to_rfc3339_str +from stac_api.common.datetime_utils import now_to_rfc3339_str from stac_fastapi.types import stac as stac_types from stac_fastapi.types.links import CollectionLinks, ItemLinks, resolve_links diff --git a/stac_fastapi/elastic_search/session.py b/stac_api/elastic_search/session.py similarity index 100% rename from stac_fastapi/elastic_search/session.py rename to stac_api/elastic_search/session.py diff --git a/stac_fastapi/elastic_search/setup.cfg b/stac_api/elastic_search/setup.cfg similarity index 100% rename from stac_fastapi/elastic_search/setup.cfg rename to stac_api/elastic_search/setup.cfg diff --git a/stac_fastapi/elastic_search/setup.py b/stac_api/elastic_search/setup.py similarity index 95% rename from stac_fastapi/elastic_search/setup.py rename to stac_api/elastic_search/setup.py index b2999b2b..842baddf 100644 --- a/stac_fastapi/elastic_search/setup.py +++ b/stac_api/elastic_search/setup.py @@ -65,6 +65,6 @@ tests_require=extra_reqs["dev"], extras_require=extra_reqs, entry_points={ - "console_scripts": ["stac-fastapi-elasticsearch=elastic_search.app:run"] + "console_scripts": ["stac-fastapi-elasticsearch=stac_api.elastic_search.app:run"] }, ) diff --git a/stac_fastapi/elastic_search/utilities.py b/stac_api/elastic_search/utilities.py similarity index 100% rename from stac_fastapi/elastic_search/utilities.py rename to stac_api/elastic_search/utilities.py diff --git a/stac_fastapi/elastic_search/version.py b/stac_api/elastic_search/version.py similarity index 100% rename from stac_fastapi/elastic_search/version.py rename to stac_api/elastic_search/version.py diff --git a/stac_fastapi/open_search/setup.cfg b/stac_api/open_search/setup.cfg similarity index 100% rename from stac_fastapi/open_search/setup.cfg rename to stac_api/open_search/setup.cfg diff --git a/stac_fastapi/open_search/setup.py b/stac_api/open_search/setup.py similarity index 100% rename from stac_fastapi/open_search/setup.py rename to stac_api/open_search/setup.py diff --git a/stac_fastapi/open_search/version.py b/stac_api/open_search/version.py similarity index 100% rename from stac_fastapi/open_search/version.py rename to stac_api/open_search/version.py diff --git a/stac_fastapi/elastic_search/pytest.ini b/stac_api/pytest.ini similarity index 100% rename from stac_fastapi/elastic_search/pytest.ini rename to stac_api/pytest.ini diff --git a/stac_fastapi/elastic_search/tests/api/__init__.py b/stac_api/tests/__init__.py similarity index 100% rename from stac_fastapi/elastic_search/tests/api/__init__.py rename to stac_api/tests/__init__.py diff --git a/stac_fastapi/elastic_search/tests/clients/__init__.py b/stac_api/tests/api/__init__.py similarity index 100% rename from stac_fastapi/elastic_search/tests/clients/__init__.py rename to stac_api/tests/api/__init__.py diff --git a/stac_fastapi/elastic_search/tests/api/test_api.py b/stac_api/tests/api/test_api.py similarity index 100% rename from stac_fastapi/elastic_search/tests/api/test_api.py rename to stac_api/tests/api/test_api.py diff --git a/stac_fastapi/elastic_search/tests/resources/__init__.py b/stac_api/tests/clients/__init__.py similarity index 100% rename from stac_fastapi/elastic_search/tests/resources/__init__.py rename to stac_api/tests/clients/__init__.py diff --git a/stac_fastapi/elastic_search/tests/clients/test_elasticsearch.py b/stac_api/tests/clients/test_elasticsearch.py similarity index 100% rename from stac_fastapi/elastic_search/tests/clients/test_elasticsearch.py rename to stac_api/tests/clients/test_elasticsearch.py diff --git a/stac_fastapi/elastic_search/tests/conftest.py b/stac_api/tests/conftest.py similarity index 94% rename from stac_fastapi/elastic_search/tests/conftest.py rename to stac_api/tests/conftest.py index 6723c198..99886d8c 100644 --- a/stac_fastapi/elastic_search/tests/conftest.py +++ b/stac_api/tests/conftest.py @@ -1,6 +1,6 @@ -# import sys +import sys -# sys.path.insert(0, "/app") +sys.path.insert(0, "/app") import asyncio import copy @@ -10,18 +10,18 @@ import pytest import pytest_asyncio -from elastic_search.config import AsyncElasticsearchSettings -from elastic_search.database_logic import create_collection_index +from stac_api.elastic_search.config import AsyncElasticsearchSettings +from stac_api.elastic_search.database_logic import create_collection_index from httpx import AsyncClient from stac_fastapi.api.app import StacApi from stac_fastapi.api.models import create_get_request_model, create_post_request_model -from stac_fastapi.common.core import ( +from stac_api.common.core import ( BulkTransactionsClient, CoreClient, TransactionsClient, ) -from stac_fastapi.common.extensions import QueryExtension +from stac_api.common.extensions import QueryExtension from stac_fastapi.extensions.core import ( # FieldsExtension, ContextExtension, FieldsExtension, diff --git a/stac_fastapi/elastic_search/tests/data/test_collection.json b/stac_api/tests/data/test_collection.json similarity index 100% rename from stac_fastapi/elastic_search/tests/data/test_collection.json rename to stac_api/tests/data/test_collection.json diff --git a/stac_fastapi/elastic_search/tests/data/test_item.json b/stac_api/tests/data/test_item.json similarity index 100% rename from stac_fastapi/elastic_search/tests/data/test_item.json rename to stac_api/tests/data/test_item.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example01.json b/stac_api/tests/extensions/cql2/example01.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example01.json rename to stac_api/tests/extensions/cql2/example01.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example04.json b/stac_api/tests/extensions/cql2/example04.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example04.json rename to stac_api/tests/extensions/cql2/example04.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example05a.json b/stac_api/tests/extensions/cql2/example05a.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example05a.json rename to stac_api/tests/extensions/cql2/example05a.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example06b.json b/stac_api/tests/extensions/cql2/example06b.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example06b.json rename to stac_api/tests/extensions/cql2/example06b.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example08.json b/stac_api/tests/extensions/cql2/example08.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example08.json rename to stac_api/tests/extensions/cql2/example08.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example09.json b/stac_api/tests/extensions/cql2/example09.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example09.json rename to stac_api/tests/extensions/cql2/example09.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example1.json b/stac_api/tests/extensions/cql2/example1.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example1.json rename to stac_api/tests/extensions/cql2/example1.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example10.json b/stac_api/tests/extensions/cql2/example10.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example10.json rename to stac_api/tests/extensions/cql2/example10.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example14.json b/stac_api/tests/extensions/cql2/example14.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example14.json rename to stac_api/tests/extensions/cql2/example14.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example15.json b/stac_api/tests/extensions/cql2/example15.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example15.json rename to stac_api/tests/extensions/cql2/example15.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example17.json b/stac_api/tests/extensions/cql2/example17.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example17.json rename to stac_api/tests/extensions/cql2/example17.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example18.json b/stac_api/tests/extensions/cql2/example18.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example18.json rename to stac_api/tests/extensions/cql2/example18.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example19.json b/stac_api/tests/extensions/cql2/example19.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example19.json rename to stac_api/tests/extensions/cql2/example19.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example20.json b/stac_api/tests/extensions/cql2/example20.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example20.json rename to stac_api/tests/extensions/cql2/example20.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example21.json b/stac_api/tests/extensions/cql2/example21.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example21.json rename to stac_api/tests/extensions/cql2/example21.json diff --git a/stac_fastapi/elastic_search/tests/extensions/cql2/example22.json b/stac_api/tests/extensions/cql2/example22.json similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/cql2/example22.json rename to stac_api/tests/extensions/cql2/example22.json diff --git a/stac_fastapi/elastic_search/tests/extensions/test_filter.py b/stac_api/tests/extensions/test_filter.py similarity index 100% rename from stac_fastapi/elastic_search/tests/extensions/test_filter.py rename to stac_api/tests/extensions/test_filter.py diff --git a/stac_api/tests/resources/__init__.py b/stac_api/tests/resources/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/stac_fastapi/elastic_search/tests/resources/test_collection.py b/stac_api/tests/resources/test_collection.py similarity index 100% rename from stac_fastapi/elastic_search/tests/resources/test_collection.py rename to stac_api/tests/resources/test_collection.py diff --git a/stac_fastapi/elastic_search/tests/resources/test_conformance.py b/stac_api/tests/resources/test_conformance.py similarity index 100% rename from stac_fastapi/elastic_search/tests/resources/test_conformance.py rename to stac_api/tests/resources/test_conformance.py diff --git a/stac_fastapi/elastic_search/tests/resources/test_item.py b/stac_api/tests/resources/test_item.py similarity index 100% rename from stac_fastapi/elastic_search/tests/resources/test_item.py rename to stac_api/tests/resources/test_item.py diff --git a/stac_fastapi/elastic_search/tests/resources/test_mgmt.py b/stac_api/tests/resources/test_mgmt.py similarity index 100% rename from stac_fastapi/elastic_search/tests/resources/test_mgmt.py rename to stac_api/tests/resources/test_mgmt.py