move serializers, update imports

Author: jonhealy1

stac_fastapi/core/setup.py

@@ -1,4 +1,4 @@
-"""stac_fastapi: elasticsearch module."""
+"""stac_fastapi: core elasticsearch/ opensearch module."""
 
 from setuptools import find_namespace_packages, setup
 
@@ -13,31 +13,13 @@
     "stac-fastapi.types==2.4.9",
     "stac-fastapi.api==2.4.9",
     "stac-fastapi.extensions==2.4.9",
-    # "elasticsearch[async]==8.11.0",
-    # "elasticsearch-dsl==8.11.0",
     "pystac[validation]",
-    # "uvicorn",
     "orjson",
     "overrides",
-    # "starlette",
     "geojson-pydantic",
     "pygeofilter==0.2.1",
 ]
 
-# extra_reqs = {
-#     "dev": [
-#         "pytest",
-#         "pytest-cov",
-#         "pytest-asyncio",
-#         "pre-commit",
-#         "requests",
-#         "ciso8601",
-#         "httpx",
-#     ],
-#     "docs": ["mkdocs", "mkdocs-material", "pdocs"],
-#     "server": ["uvicorn[standard]==0.19.0"],
-# }
-
 setup(
     name="stac-fastapi.core",
     description="Core library for the Elasticsearch and Opensearch stac-fastapi backends.",

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/datetime_utils.py renamed to stac_fastapi/core/stac_fastapi/core/datetime_utils.py

@@ -4,7 +4,7 @@
 
 import attr
 
-from stac_fastapi.elasticsearch.datetime_utils import now_to_rfc3339_str
+from stac_fastapi.core.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
 

stac_fastapi/core/stac_fastapi/core/serializers.py

@@ -7,12 +7,12 @@
     EsAsyncBaseFiltersClient,
     TransactionsClient,
 )
+from stac_fastapi.core.extensions import QueryExtension
 from stac_fastapi.elasticsearch.config import ElasticsearchSettings
 from stac_fastapi.elasticsearch.database_logic import (
     DatabaseLogic,
     create_collection_index,
 )
-from stac_fastapi.elasticsearch.extensions import QueryExtension
 from stac_fastapi.elasticsearch.session import Session
 from stac_fastapi.extensions.core import (
     ContextExtension,

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -10,11 +10,11 @@
 
 from elasticsearch import exceptions, helpers  # type: ignore
 from stac_fastapi.core.extensions import filter
+from stac_fastapi.core.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.elasticsearch.config import AsyncElasticsearchSettings
 from stac_fastapi.elasticsearch.config import (
     ElasticsearchSettings as SyncElasticsearchSettings,
 )
-from stac_fastapi.elasticsearch.serializers import CollectionSerializer, ItemSerializer
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.stac import Collection, Item
 

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -13,8 +13,8 @@
 from pystac.utils import datetime_to_str
 
 from stac_fastapi.core.core import CoreClient
+from stac_fastapi.core.datetime_utils import now_to_rfc3339_str
 from stac_fastapi.elasticsearch.database_logic import DatabaseLogic
-from stac_fastapi.elasticsearch.datetime_utils import now_to_rfc3339_str
 from stac_fastapi.types.core import LandingPageMixin
 
 from ..conftest import create_item, refresh_indices