refactoring

Author: Grzegorz Pustulka

compose.yml

@@ -91,6 +91,7 @@ services:
       - discovery.type=single-node
       - plugins.security.disabled=true
       - OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m
+      - action.destructive_requires_name=false
     volumes:
       - ./opensearch/config/opensearch.yml:/usr/share/opensearch/config/opensearch.yml
       - ./opensearch/snapshots:/usr/share/opensearch/snapshots

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -22,11 +22,6 @@
 )
 from stac_fastapi.sfeos_helpers import filter
 from stac_fastapi.sfeos_helpers.database import (
-    AsyncIndexInserter,
-    IndexInsertionFactory,
-    IndexSelectionStrategy,
-    IndexSelectorFactory,
-    SyncIndexInserter,
     apply_free_text_filter_shared,
     apply_intersects_filter_shared,
     create_index_templates_shared,
@@ -40,6 +35,12 @@
     return_date,
     validate_refresh,
 )
+from stac_fastapi.sfeos_helpers.search_engine import (
+    BaseIndexInserter,
+    IndexInsertionFactory,
+    IndexSelectionStrategy,
+    IndexSelectorFactory,
+)
 from stac_fastapi.sfeos_helpers.mappings import (
     AGGREGATION_MAPPING,
     COLLECTIONS_INDEX,
@@ -128,8 +129,8 @@ class DatabaseLogic(BaseDatabaseLogic):
     )
     async_index_selector: IndexSelectionStrategy = attr.ib(init=False)
     sync_index_selector: IndexSelectionStrategy = attr.ib(init=False)
-    async_index_inserter: AsyncIndexInserter = attr.ib(init=False)
-    sync_index_inserter: SyncIndexInserter = attr.ib(init=False)
+    async_index_inserter: BaseIndexInserter = attr.ib(init=False)
+    sync_index_inserter: BaseIndexInserter = attr.ib(init=False)
 
     client = attr.ib(init=False)
     sync_client = attr.ib(init=False)
@@ -138,7 +139,7 @@ def __attrs_post_init__(self):
         """Initialize clients after the class is instantiated."""
         self.client = self.async_settings.create_client
         self.sync_client = self.sync_settings.create_client
-        self.async_index_inserter = IndexInsertionFactory.create_insertion_strategy(
+        self.async_index_inserter = IndexInsertionFactory.create_async_insertion_strategy(
             self.client
         )
         self.sync_index_inserter = IndexInsertionFactory.create_sync_insertion_strategy(

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -22,11 +22,6 @@
 from stac_fastapi.opensearch.config import OpensearchSettings as SyncSearchSettings
 from stac_fastapi.sfeos_helpers import filter
 from stac_fastapi.sfeos_helpers.database import (
-    AsyncIndexInserter,
-    IndexInsertionFactory,
-    IndexSelectionStrategy,
-    IndexSelectorFactory,
-    SyncIndexInserter,
     apply_free_text_filter_shared,
     apply_intersects_filter_shared,
     create_index_templates_shared,
@@ -40,6 +35,12 @@
     return_date,
     validate_refresh,
 )
+from stac_fastapi.sfeos_helpers.search_engine import (
+    BaseIndexInserter,
+    IndexInsertionFactory,
+    IndexSelectionStrategy,
+    IndexSelectorFactory,
+)
 from stac_fastapi.sfeos_helpers.mappings import (
     AGGREGATION_MAPPING,
     COLLECTIONS_INDEX,
@@ -115,8 +116,8 @@ class DatabaseLogic(BaseDatabaseLogic):
 
     async_index_selector: IndexSelectionStrategy = attr.ib(init=False)
     sync_index_selector: IndexSelectionStrategy = attr.ib(init=False)
-    async_index_inserter: AsyncIndexInserter = attr.ib(init=False)
-    sync_index_inserter: SyncIndexInserter = attr.ib(init=False)
+    async_index_inserter: BaseIndexInserter = attr.ib(init=False)
+    sync_index_inserter: BaseIndexInserter = attr.ib(init=False)
 
     client = attr.ib(init=False)
     sync_client = attr.ib(init=False)
@@ -125,7 +126,7 @@ def __attrs_post_init__(self):
         """Initialize clients after the class is instantiated."""
         self.client = self.async_settings.create_client
         self.sync_client = self.sync_settings.create_client
-        self.async_index_inserter = IndexInsertionFactory.create_insertion_strategy(
+        self.async_index_inserter = IndexInsertionFactory.create_async_insertion_strategy(
             self.client
         )
         self.sync_index_inserter = IndexInsertionFactory.create_sync_insertion_strategy(
@@ -1068,7 +1069,13 @@ async def delete_collection(self, collection_id: str, **kwargs: Any):
         await self.client.delete(
             index=COLLECTIONS_INDEX, id=collection_id, refresh=refresh
         )
-        await delete_item_index(collection_id)
+        # Delete the item index for the collection
+        try:
+            await delete_item_index(collection_id)
+        except Exception as e:
+            logger.error(
+                f"Failed to delete item index for collection {collection_id}: {e}"
+            )
 
     async def bulk_async(
         self,

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/database/__init__.py

@@ -40,26 +40,6 @@
     index_by_collection_id,
     indices,
 )
-from .index_insertion_strategies import (
-    AsyncIndexInserter,
-    AsyncSimpleIndexInsertion,
-    BaseIndexInserter,
-    ElasticsearchAdapter,
-    IndexInsertionFactory,
-    OpenSearchAdapter,
-    SearchEngineAdapter,
-    SearchEngineAdapterFactory,
-    SearchEngineType,
-    SyncIndexInserter,
-    SyncSimpleIndexInsertion,
-)
-from .index_selection_strategies import (
-    AsyncDatetimeBasedIndexSelector,
-    IndexSelectionStrategy,
-    IndexSelectorFactory,
-    SyncDatetimeBasedIndexSelector,
-    UnfilteredIndexSelector,
-)
 from .mapping import get_queryables_mapping_shared
 from .query import (
     apply_free_text_filter_shared,
@@ -76,24 +56,6 @@
     "index_by_collection_id",
     "filter_indexes_by_datetime",
     "indices",
-    # Index selection strategies
-    "IndexSelectionStrategy",
-    "IndexSelectorFactory",
-    "UnfilteredIndexSelector",
-    "SyncDatetimeBasedIndexSelector",
-    "AsyncDatetimeBasedIndexSelector",
-    # Index insertion strategies
-    "AsyncIndexInserter",
-    "AsyncSimpleIndexInsertion",
-    "BaseIndexInserter",
-    "ElasticsearchAdapter",
-    "IndexInsertionFactory",
-    "OpenSearchAdapter",
-    "SearchEngineAdapter",
-    "SearchEngineAdapterFactory",
-    "SearchEngineType",
-    "SyncIndexInserter",
-    "SyncSimpleIndexInsertion",
     # Query operations
     "apply_free_text_filter_shared",
     "apply_intersects_filter_shared",