enable direct response, 5.2.0, deprecation warnings

Author: jonhealy1

CHANGELOG.md

@@ -7,9 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+- Migrated Elasticsearch index template creation from legacy `put_template` to composable `put_index_template` API in `database_logic.py`. This resolves deprecation warnings and ensures compatibility with Elasticsearch 7.x and 8.x.
+- Updated all Pydantic models to use `ConfigDict` instead of class-based `Config` for Pydantic v2 compatibility. This resolves deprecation warnings and prepares for Pydantic v3.
+- Migrated all Pydantic `@root_validator` validators to `@model_validator` for Pydantic v2 compatibility.
+
 ### Added
+- Added `enable_direct_response` option to API settings for more flexible response handling.
 
 ### Changed
+- Updated test suite to use `httpx.ASGITransport(app=...)` for FastAPI app testing (removes deprecation warning).
+- Updated stac-fastapi parent libraries to 5.2.0.
 
 ### Fixed
 

stac_fastapi/core/setup.py

@@ -10,9 +10,9 @@
     "attrs>=23.2.0",
     "pydantic>=2.4.1,<3.0.0",
     "stac_pydantic~=3.1.0",
-    "stac-fastapi.api==5.1.1",
-    "stac-fastapi.extensions==5.1.1",
-    "stac-fastapi.types==5.1.1",
+    "stac-fastapi.api==5.2.0",
+    "stac-fastapi.extensions==5.2.0",
+    "stac-fastapi.types==5.2.0",
     "orjson~=3.9.0",
     "overrides~=7.4.0",
     "geojson-pydantic~=1.0.0",

stac_fastapi/core/stac_fastapi/core/extensions/query.py

@@ -10,7 +10,7 @@
 from types import DynamicClassAttribute
 from typing import Any, Callable, Dict, Optional
 
-from pydantic import BaseModel, root_validator
+from pydantic import BaseModel, model_validator
 from stac_pydantic.utils import AutoValueEnum
 
 from stac_fastapi.extensions.core.query import QueryExtension as QueryExtensionBase
@@ -63,7 +63,7 @@ class QueryExtensionPostRequest(BaseModel):
 
     query: Optional[Dict[str, Dict[Operator, Any]]] = None
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def validate_query_fields(cls, values: Dict) -> Dict:
         """Validate query fields."""
         ...

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/app.py

@@ -87,7 +87,7 @@
 api = StacApi(
     title=os.getenv("STAC_FASTAPI_TITLE", "stac-fastapi-elasticsearch"),
     description=os.getenv("STAC_FASTAPI_DESCRIPTION", "stac-fastapi-elasticsearch"),
-    api_version=os.getenv("STAC_FASTAPI_VERSION", "2.1"),
+    api_version=os.getenv("STAC_FASTAPI_VERSION", "5.2.0"),
     settings=settings,
     extensions=extensions,
     client=CoreClient(
@@ -96,6 +96,8 @@
     search_get_request_model=create_get_request_model(search_extensions),
     search_post_request_model=post_request_model,
     route_dependencies=get_route_dependencies(),
+    enable_response_models=False,
+    enable_direct_response=True,
 )
 app = api.app
 app.root_path = os.getenv("STAC_FASTAPI_ROOT_PATH", "")

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -50,19 +50,18 @@ async def create_index_templates() -> None:
 
     """
     client = AsyncElasticsearchSettings().create_client
-    await client.indices.put_template(
+    await client.indices.put_index_template(
         name=f"template_{COLLECTIONS_INDEX}",
         body={
             "index_patterns": [f"{COLLECTIONS_INDEX}*"],
-            "mappings": ES_COLLECTIONS_MAPPINGS,
+            "template": {"mappings": ES_COLLECTIONS_MAPPINGS},
         },
     )
-    await client.indices.put_template(
+    await client.indices.put_index_template(
         name=f"template_{ITEMS_INDEX_PREFIX}",
         body={
             "index_patterns": [f"{ITEMS_INDEX_PREFIX}*"],
-            "settings": ES_ITEMS_SETTINGS,
-            "mappings": ES_ITEMS_MAPPINGS,
+            "template": {"settings": ES_ITEMS_SETTINGS, "mappings": ES_ITEMS_MAPPINGS},
         },
     )
     await client.close()

stac_fastapi/opensearch/stac_fastapi/opensearch/app.py

@@ -87,7 +87,7 @@
 api = StacApi(
     title=os.getenv("STAC_FASTAPI_TITLE", "stac-fastapi-opensearch"),
     description=os.getenv("STAC_FASTAPI_DESCRIPTION", "stac-fastapi-opensearch"),
-    api_version=os.getenv("STAC_FASTAPI_VERSION", "2.1"),
+    api_version=os.getenv("STAC_FASTAPI_VERSION", "5.2.0"),
     settings=settings,
     extensions=extensions,
     client=CoreClient(
@@ -96,10 +96,13 @@
     search_get_request_model=create_get_request_model(search_extensions),
     search_post_request_model=post_request_model,
     route_dependencies=get_route_dependencies(),
+    enable_response_models=False,
+    enable_direct_response=True,
 )
 app = api.app
 app.root_path = os.getenv("STAC_FASTAPI_ROOT_PATH", "")
 
+
 # Add rate limit
 setup_rate_limit(app, rate_limit=os.getenv("STAC_FASTAPI_RATE_LIMIT"))
 

stac_fastapi/tests/api/test_api.py

@@ -7,6 +7,7 @@
 
 ROUTES = {
     "GET /_mgmt/ping",
+    "GET /_mgmt/health",
     "GET /docs/oauth2-redirect",
     "HEAD /docs/oauth2-redirect",
     "GET /",

stac_fastapi/tests/conftest.py

@@ -8,7 +8,8 @@
 import pytest
 import pytest_asyncio
 from fastapi import Depends, HTTPException, security, status
-from httpx import AsyncClient
+from httpx import ASGITransport, AsyncClient
+from pydantic import ConfigDict
 from stac_pydantic import api
 
 from stac_fastapi.api.app import StacApi
@@ -85,8 +86,7 @@ def __init__(
 
 
 class TestSettings(AsyncSettings):
-    class Config:
-        env_file = ".env.test"
+    model_config = ConfigDict(env_file=".env.test")
 
 
 settings = TestSettings()
@@ -243,7 +243,9 @@ async def app_client(app):
     await create_index_templates()
     await create_collection_index()
 
-    async with AsyncClient(app=app, base_url="http://test-server") as c:
+    async with AsyncClient(
+        transport=ASGITransport(app=app), base_url="http://test-server"
+    ) as c:
         yield c
 
 
@@ -302,7 +304,9 @@ async def app_client_rate_limit(app_rate_limit):
     await create_index_templates()
     await create_collection_index()
 
-    async with AsyncClient(app=app_rate_limit, base_url="http://test-server") as c:
+    async with AsyncClient(
+        transport=ASGITransport(app=app_rate_limit), base_url="http://test-server"
+    ) as c:
         yield c
 
 
@@ -392,7 +396,9 @@ async def app_client_basic_auth(app_basic_auth):
     await create_index_templates()
     await create_collection_index()
 
-    async with AsyncClient(app=app_basic_auth, base_url="http://test-server") as c:
+    async with AsyncClient(
+        transport=ASGITransport(app=app_basic_auth), base_url="http://test-server"
+    ) as c:
         yield c
 
 
@@ -469,6 +475,7 @@ async def route_dependencies_client(route_dependencies_app):
     await create_collection_index()
 
     async with AsyncClient(
-        app=route_dependencies_app, base_url="http://test-server"
+        transport=ASGITransport(app=route_dependencies_app),
+        base_url="http://test-server",
     ) as c:
         yield c