more type fixes

Author: jonhealy1

stac_fastapi/core/stac_fastapi/core/core.py

@@ -334,7 +334,7 @@ async def item_collection(
             search=search,
             limit=limit,
             sort=None,
-            token=token,  # type: ignore
+            token=token,
             collection_ids=[collection_id],
         )
 
@@ -633,7 +633,7 @@ async def post_search(
         items, maybe_count, next_token = await self.database.execute_search(
             search=search,
             limit=limit,
-            token=search_request.token,  # type: ignore
+            token=search_request.token,
             sort=sort,
             collection_ids=search_request.collections,
         )
@@ -701,7 +701,10 @@ async def create_item(
                 database=self.database, settings=self.settings
             )
             processed_items = [
-                bulk_client.preprocess_item(item, base_url, BulkTransactionMethod.INSERT) for item in item["features"]  # type: ignore
+                bulk_client.preprocess_item(
+                    item, base_url, BulkTransactionMethod.INSERT
+                )
+                for item in item["features"]
             ]
 
             await self.database.bulk_async(

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/config.py

@@ -6,8 +6,9 @@
 from typing import Any, Dict, Set
 
 import certifi
+from elasticsearch._async.client import AsyncElasticsearch
 
-from elasticsearch import AsyncElasticsearch, Elasticsearch  # type: ignore
+from elasticsearch import Elasticsearch  # type: ignore[attr-defined]
 from stac_fastapi.core.base_settings import ApiBaseSettings
 from stac_fastapi.core.utilities import get_bool_env
 from stac_fastapi.types.config import ApiSettings

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -8,10 +8,11 @@
 from typing import Any, Dict, Iterable, List, Optional, Tuple, Type
 
 import attr
+import elasticsearch.helpers as helpers
 from elasticsearch.dsl import Q, Search
+from elasticsearch.exceptions import NotFoundError as ESNotFoundError
 from starlette.requests import Request
 
-from elasticsearch import exceptions, helpers  # type: ignore
 from stac_fastapi.core.base_database_logic import BaseDatabaseLogic
 from stac_fastapi.core.database_logic import (
     COLLECTIONS_INDEX,
@@ -271,7 +272,7 @@ async def get_one_item(self, collection_id: str, item_id: str) -> Dict:
                 index=index_alias_by_collection_id(collection_id),
                 id=mk_item_id(item_id, collection_id),
             )
-        except exceptions.NotFoundError:
+        except ESNotFoundError:
             raise NotFoundError(
                 f"Item {item_id} does not exist inside Collection {collection_id}"
             )
@@ -511,7 +512,7 @@ async def execute_search(
 
         try:
             es_response = await search_task
-        except exceptions.NotFoundError:
+        except ESNotFoundError:
             raise NotFoundError(f"Collections '{collection_ids}' do not exist")
 
         hits = es_response["hits"]["hits"]
@@ -594,7 +595,7 @@ def _fill_aggregation_parameters(name: str, agg: dict) -> dict:
 
         try:
             db_response = await search_task
-        except exceptions.NotFoundError:
+        except ESNotFoundError:
             raise NotFoundError(f"Collections '{collection_ids}' do not exist")
 
         return db_response
@@ -720,7 +721,7 @@ async def delete_item(
                 id=mk_item_id(item_id, collection_id),
                 refresh=refresh,
             )
-        except exceptions.NotFoundError:
+        except ESNotFoundError:
             raise NotFoundError(
                 f"Item {item_id} in collection {collection_id} not found"
             )
@@ -740,7 +741,7 @@ async def get_items_mapping(self, collection_id: str) -> Dict[str, Any]:
                 index=index_name, allow_no_indices=False
             )
             return mapping.body
-        except exceptions.NotFoundError:
+        except ESNotFoundError:
             raise NotFoundError(f"Mapping for index {index_name} not found")
 
     async def create_collection(self, collection: Collection, refresh: bool = False):
@@ -791,7 +792,7 @@ async def find_collection(self, collection_id: str) -> Collection:
             collection = await self.client.get(
                 index=COLLECTIONS_INDEX, id=collection_id
             )
-        except exceptions.NotFoundError:
+        except ESNotFoundError:
             raise NotFoundError(f"Collection {collection_id} not found")
 
         return collection["_source"]