Merge pull request #33 from stac-utils/pv/fix-bulk-ingest

iterate over the Item values rather than the Items string keys

Author: Phil Varner

.github/workflows/cicd.yml

@@ -1,4 +1,4 @@
-name: stac-fastapi-nosql
+name: stac-fastapi-elasticsearch
 on:
   push:
     branches: [ main, dev ]

stac_fastapi/elasticsearch/setup.py

@@ -45,10 +45,7 @@
         "Programming Language :: Python :: 3.8",
         "License :: OSI Approved :: MIT License",
     ],
-    keywords="STAC FastAPI COG",
-    author=u"Arturo Engineering",
-    author_email="engineering@arturo.ai",
-    url="https://github.com/jonhealy1/stac-fastapi-nosql",
+    url="https://github.com/stac-utils/stac-fastapi-elasticsearch",
     license="MIT",
     packages=find_namespace_packages(exclude=["alembic", "tests", "scripts"]),
     zip_safe=False,

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/transactions.py

@@ -215,7 +215,9 @@ def bulk_item_insert(self, items: Items, **kwargs) -> str:
             base_url = str(kwargs["request"].base_url)
         except Exception:
             base_url = ""
-        processed_items = [self._preprocess_item(item, base_url) for item in items]
+        processed_items = [
+            self._preprocess_item(item, base_url) for item in items.items.values()
+        ]
         return_msg = f"Successfully added {len(processed_items)} items."
 
         # helpers.bulk(

stac_fastapi/elasticsearch/tests/clients/test_elasticsearch.py

@@ -13,6 +13,7 @@
     BulkTransactionsClient,
     TransactionsClient,
 )
+from stac_fastapi.extensions.third_party.bulk_transactions import Items
 from stac_fastapi.types.errors import ConflictError, NotFoundError
 
 
@@ -269,16 +270,16 @@ def test_bulk_item_insert(
 
     item = load_test_data("test_item.json")
 
-    items = []
+    items = {}
     for _ in range(10):
         _item = deepcopy(item)
         _item["id"] = str(uuid.uuid4())
-        items.append(_item)
+        items[_item["id"]] = _item
 
     # fc = es_core.item_collection(coll["id"], request=MockStarletteRequest)
     # assert len(fc["features"]) == 0
 
-    es_bulk_transactions.bulk_item_insert(items=items)
+    es_bulk_transactions.bulk_item_insert(Items(items=items))
     time.sleep(3)
     fc = es_core.item_collection(coll["id"], request=MockStarletteRequest)
     assert len(fc["features"]) >= 10