fix dockerfiles, imports

Author: jonhealy1

Dockerfile.dev.os

@@ -16,4 +16,4 @@ WORKDIR /app
 COPY . /app
 
 RUN pip install --no-cache-dir -e ./stac_fastapi/core
-RUN pip install --no-cache-dir -e ./stac_fastapi/elasticsearch[dev,server]
+RUN pip install --no-cache-dir -e ./stac_fastapi/opensearch[dev,server]

docker-compose.yml

@@ -57,7 +57,7 @@ services:
     depends_on:
       - opensearch
     command:
-      bash -c "./scripts/wait-for-it-es.sh os-container:9202 && python -m stac_fastapi.elasticsearch.app"
+      bash -c "./scripts/wait-for-it-es.sh os-container:9202 && python -m stac_fastapi.opensearch.app"
 
   elasticsearch:
     container_name: es-container

stac_fastapi/opensearch/setup.py

@@ -1,4 +1,4 @@
-"""stac_fastapi: opencsearch module."""
+"""stac_fastapi: opensearch module."""
 
 from setuptools import find_namespace_packages, setup
 

stac_fastapi/opensearch/stac_fastapi/opensearch/app.py

@@ -9,12 +9,7 @@
     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.session import Session
+from stac_fastapi.core.session import Session
 from stac_fastapi.extensions.core import (
     ContextExtension,
     FieldsExtension,
@@ -24,8 +19,13 @@
     TransactionExtension,
 )
 from stac_fastapi.extensions.third_party import BulkTransactionExtension
+from stac_fastapi.opensearch.config import OpensearchSettings
+from stac_fastapi.opensearch.database_logic import (
+    DatabaseLogic,
+    create_collection_index,
+)
 
-settings = ElasticsearchSettings()
+settings = OpensearchSettings()
 session = Session.create_from_settings(settings)
 
 filter_extension = FilterExtension(client=EsAsyncBaseFiltersClient())
@@ -82,7 +82,7 @@ def run() -> None:
         import uvicorn
 
         uvicorn.run(
-            "stac_fastapi.elasticsearch.app:app",
+            "stac_fastapi.opensearch.app:app",
             host=settings.app_host,
             port=settings.app_port,
             log_level="info",

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -12,12 +12,12 @@
 from opensearchpy.helpers.search import Search
 
 from stac_fastapi.core import serializers
-from stac_fastapi.elasticsearch.config.config_opensearch import AsyncSearchSettings
-from stac_fastapi.elasticsearch.config.config_opensearch import (
-    SearchSettings as SyncSearchSettings,
+from stac_fastapi.core.extensions import filter
+from stac_fastapi.core.utilities import bbox2polygon
+from stac_fastapi.opensearch.config import (
+    AsyncOpensearchSettings as AsyncSearchSettings,
 )
-from stac_fastapi.elasticsearch.extensions import filter
-from stac_fastapi.elasticsearch.utilities import bbox2polygon
+from stac_fastapi.opensearch.config import OpensearchSettings as SyncSearchSettings
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 from stac_fastapi.types.stac import Collection, Item
 
@@ -772,6 +772,54 @@ async def find_collection(self, collection_id: str) -> Collection:
 
         return collection["_source"]
 
+    # this is copied from stac-fastapi-elasticseach and the logic needs to be updated for opensearch
+    async def update_collection(
+        self, collection_id: str, collection: Collection, refresh: bool = False
+    ):
+        """Update a collection from the database.
+
+        Args:
+            self: The instance of the object calling this function.
+            collection_id (str): The ID of the collection to be updated.
+            collection (Collection): The Collection object to be used for the update.
+
+        Raises:
+            NotFoundError: If the collection with the given `collection_id` is not
+            found in the database.
+
+        Notes:
+            This function updates the collection in the database using the specified
+            `collection_id` and with the collection specified in the `Collection` object.
+            If the collection is not found, a `NotFoundError` is raised.
+        """
+        await self.find_collection(collection_id=collection_id)
+
+        if collection_id != collection["id"]:
+            await self.create_collection(collection, refresh=refresh)
+
+            await self.client.reindex(
+                body={
+                    "dest": {"index": f"{ITEMS_INDEX_PREFIX}{collection['id']}"},
+                    "source": {"index": f"{ITEMS_INDEX_PREFIX}{collection_id}"},
+                    "script": {
+                        "lang": "painless",
+                        "source": f"""ctx._id = ctx._id.replace('{collection_id}', '{collection["id"]}'); ctx._source.collection = '{collection["id"]}' ;""",
+                    },
+                },
+                wait_for_completion=True,
+                refresh=refresh,
+            )
+
+            await self.delete_collection(collection_id)
+
+        else:
+            await self.client.index(
+                index=COLLECTIONS_INDEX,
+                id=collection_id,
+                document=collection,
+                refresh=refresh,
+            )
+
     async def delete_collection(self, collection_id: str, refresh: bool = False):
         """Delete a collection from the database.
 

stac_fastapi/opensearch/tests/resources/test_item.py

@@ -14,7 +14,7 @@
 
 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.opensearch.database_logic import DatabaseLogic
 from stac_fastapi.types.core import LandingPageMixin
 
 from ..conftest import create_item, refresh_indices