run pre-commit

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -7,7 +7,6 @@
 from urllib.parse import urljoin
 
 import attr
-import stac_pydantic.api
 from fastapi import HTTPException
 from overrides import overrides
 from pydantic import ValidationError
@@ -33,8 +32,8 @@
     AsyncBaseTransactionsClient,
 )
 from stac_fastapi.types.links import CollectionLinks
-from stac_fastapi.types.stac import Collection, Collections, Item, ItemCollection
 from stac_fastapi.types.search import BaseSearchPostRequest
+from stac_fastapi.types.stac import Collection, Collections, Item, ItemCollection
 
 logger = logging.getLogger(__name__)
 
@@ -92,13 +91,13 @@ async def get_collection(self, collection_id: str, **kwargs) -> Collection:
 
     @overrides
     async def item_collection(
-        self, 
+        self,
         collection_id: str,
         bbox: Optional[List[NumType]] = None,
         datetime: Union[str, datetime_type, None] = None,
-        limit: int = 10, 
-        token: str = None, 
-        **kwargs
+        limit: int = 10,
+        token: str = None,
+        **kwargs,
     ) -> ItemCollection:
         """Read an item collection from the database."""
         request: Request = kwargs["request"]
@@ -294,7 +293,7 @@ async def post_search(
             if filter_lang in [None, FilterLang.cql2_json]:
                 search = self.database.apply_cql2_filter(search, cql2_filter)
             # else:
-                # raise Exception("CQL2-Text is not supported with POST")
+            # raise Exception("CQL2-Text is not supported with POST")
 
         sort = None
         if search_request.sortby:
@@ -365,7 +364,9 @@ class TransactionsClient(AsyncBaseTransactionsClient):
     database = DatabaseLogic()
 
     @overrides
-    async def create_item(self, collection_id: str, item: stac_types.Item, **kwargs) -> stac_types.Item:
+    async def create_item(
+        self, collection_id: str, item: stac_types.Item, **kwargs
+    ) -> stac_types.Item:
         """Create item."""
         base_url = str(kwargs["request"].base_url)
 
@@ -375,7 +376,7 @@ async def create_item(self, collection_id: str, item: stac_types.Item, **kwargs)
             processed_items = [
                 bulk_client.preprocess_item(item, base_url) for item in item["features"]  # type: ignore
             ]
-          
+
             await self.database.bulk_async(
                 collection_id, processed_items, refresh=kwargs.get("refresh", False)
             )
@@ -387,7 +388,9 @@ async def create_item(self, collection_id: str, item: stac_types.Item, **kwargs)
             return item
 
     @overrides
-    async def update_item(self, collection_id: str, item_id: str, item: stac_types.Item, **kwargs) -> stac_types.Item:
+    async def update_item(
+        self, collection_id: str, item_id: str, item: stac_types.Item, **kwargs
+    ) -> stac_types.Item:
         """Update item."""
         base_url = str(kwargs["request"].base_url)
 

stac_fastapi/elasticsearch/tests/clients/test_elasticsearch.py

@@ -92,7 +92,12 @@ async def test_get_collection_items(app_client, ctx, core_client, txn_client):
     for _ in range(num_of_items_to_create):
         item = deepcopy(ctx.item)
         item["id"] = str(uuid.uuid4())
-        await txn_client.create_item(collection_id=item["collection"],item=item, request=MockRequest, refresh=True)
+        await txn_client.create_item(
+            collection_id=item["collection"],
+            item=item,
+            request=MockRequest,
+            refresh=True,
+        )
 
     fc = await core_client.item_collection(coll["id"], request=MockRequest())
     assert len(fc["features"]) == num_of_items_to_create + 1  # ctx.item
@@ -112,14 +117,21 @@ async def test_create_item(ctx, core_client, txn_client):
 
 async def test_create_item_already_exists(ctx, txn_client):
     with pytest.raises(ConflictError):
-        await txn_client.create_item(collection_id=ctx.item["collection"], item=ctx.item, request=MockRequest, refresh=True)
+        await txn_client.create_item(
+            collection_id=ctx.item["collection"],
+            item=ctx.item,
+            request=MockRequest,
+            refresh=True,
+        )
 
 
 async def test_update_item(ctx, core_client, txn_client):
     ctx.item["properties"]["foo"] = "bar"
     collection_id = ctx.item["collection"]
     item_id = ctx.item["id"]
-    await txn_client.update_item(collection_id=collection_id, item_id=item_id, item=ctx.item, request=MockRequest)
+    await txn_client.update_item(
+        collection_id=collection_id, item_id=item_id, item=ctx.item, request=MockRequest
+    )
 
     updated_item = await core_client.get_item(
         item_id, collection_id, request=MockRequest
@@ -141,7 +153,9 @@ async def test_update_geometry(ctx, core_client, txn_client):
     ctx.item["geometry"]["coordinates"] = new_coordinates
     collection_id = ctx.item["collection"]
     item_id = ctx.item["id"]
-    await txn_client.update_item(collection_id=collection_id, item_id=item_id, item=ctx.item, request=MockRequest)
+    await txn_client.update_item(
+        collection_id=collection_id, item_id=item_id, item=ctx.item, request=MockRequest
+    )
 
     updated_item = await core_client.get_item(
         item_id, collection_id, request=MockRequest

stac_fastapi/elasticsearch/tests/conftest.py

@@ -94,10 +94,21 @@ async def create_collection(txn_client: TransactionsClient, collection: Dict) ->
 
 
 async def create_item(txn_client: TransactionsClient, item: Dict) -> None:
-    if 'collection' in item:
-        await txn_client.create_item(collection_id=item["collection"], item=item, request=MockRequest, refresh=True)
+    if "collection" in item:
+        await txn_client.create_item(
+            collection_id=item["collection"],
+            item=item,
+            request=MockRequest,
+            refresh=True,
+        )
     else:
-        await txn_client.create_item(collection_id=item['features'][0]["collection"], item=item, request=MockRequest, refresh=True)
+        await txn_client.create_item(
+            collection_id=item["features"][0]["collection"],
+            item=item,
+            request=MockRequest,
+            refresh=True,
+        )
+
 
 async def delete_collections_and_items(txn_client: TransactionsClient) -> None:
     await refresh_indices(txn_client)

stac_fastapi/elasticsearch/tests/extensions/test_filter.py

@@ -1,9 +1,10 @@
 import json
 import os
-import pytest
 from os import listdir
 from os.path import isfile, join
 
+import pytest
+
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 
 

stac_fastapi/elasticsearch/tests/resources/test_item.py

@@ -80,7 +80,9 @@ async def test_update_item_already_exists(app_client, ctx):
 
     assert ctx.item["properties"]["gsd"] != 16
     ctx.item["properties"]["gsd"] = 16
-    await app_client.put(f"/collections/{ctx.item['collection']}/items/{ctx.item['id']}", json=ctx.item)
+    await app_client.put(
+        f"/collections/{ctx.item['collection']}/items/{ctx.item['id']}", json=ctx.item
+    )
     resp = await app_client.get(
         f"/collections/{ctx.item['collection']}/items/{ctx.item['id']}"
     )
@@ -99,7 +101,8 @@ async def test_update_new_item(app_client, ctx):
 
     # note: this endpoint is wrong in stac-fastapi -- should be /collections/{c_id}/items/{item_id}
     resp = await app_client.put(
-        f"/collections/{test_item['collection']}/items/{test_item['id']}", json=test_item
+        f"/collections/{test_item['collection']}/items/{test_item['id']}",
+        json=test_item,
     )
     assert resp.status_code == 404
 
@@ -229,7 +232,8 @@ async def test_item_timestamps(app_client, ctx, load_test_data):
     # Confirm `updated` timestamp
     ctx.item["properties"]["proj:epsg"] = 4326
     resp = await app_client.put(
-        f"/collections/{ctx.item['collection']}/items/{ctx.item['id']}", json=dict(ctx.item)
+        f"/collections/{ctx.item['collection']}/items/{ctx.item['id']}",
+        json=dict(ctx.item),
     )
     assert resp.status_code == 200
     updated_item = resp.json()