update requirements

pcstac/pcstac/main.py

@@ -10,7 +10,12 @@
 from fastapi.openapi.utils import get_openapi
 from fastapi.responses import ORJSONResponse
 from stac_fastapi.api.errors import DEFAULT_STATUS_CODES
-from stac_fastapi.api.models import create_get_request_model, create_post_request_model
+from stac_fastapi.api.models import (
+    create_get_request_model,
+    create_post_request_model,
+    create_request_model,
+)
+from stac_fastapi.extensions.core import TokenPaginationExtension
 from stac_fastapi.api.middleware import ProxyHeaderMiddleware
 from stac_fastapi.pgstac.config import Settings
 from stac_fastapi.pgstac.db import close_db_connection, connect_to_db
@@ -33,7 +38,7 @@
     get_settings,
 )
 from pcstac.errors import PC_DEFAULT_STATUS_CODES
-from pcstac.search import PCSearch, PCSearchGetRequest, RedisBaseItemCache
+from pcstac.search import PCSearch, PCSearchGetRequest, RedisBaseItemCache, PCItemCollectionUri
 
 DEBUG: bool = os.getenv("DEBUG") == "TRUE" or False
 
@@ -50,6 +55,15 @@
 
 app_settings = get_settings()
 
+items_get_request_model = PCItemCollectionUri
+if any(isinstance(ext, TokenPaginationExtension) for ext in EXTENSIONS):
+    items_get_request_model = create_request_model(
+        model_name="ItemCollectionUri",
+        base_model=PCItemCollectionUri,
+        mixins=[TokenPaginationExtension().GET],
+        request_type="GET",
+    )
+
 search_get_request_model = create_get_request_model(
     EXTENSIONS, base_model=PCSearchGetRequest
 )
@@ -82,6 +96,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
         default_response_class=ORJSONResponse,
         lifespan=lifespan,
     ),
+    items_get_request_model=items_get_request_model,
     search_get_request_model=search_get_request_model,
     search_post_request_model=search_post_request_model,
     response_class=ORJSONResponse,

pcstac/pcstac/search.py

@@ -3,6 +3,7 @@
 from typing import Any, Callable, Coroutine, Dict, Optional
 
 import attr
+from fastapi import Query
 from pydantic import Field, field_validator
 from stac_fastapi.api.models import BaseSearchGetRequest, ItemCollectionUri
 from stac_fastapi.types.rfc3339 import str_to_interval, DateTimeType
@@ -14,7 +15,7 @@
 from pccommon.redis import cached_result
 from pcstac.contants import CACHE_KEY_BASE_ITEM
 
-DEFAULT_LIMIT = 250
+DEFAULT_LIMIT: int = 250
 
 logger = logging.getLogger(__name__)
 
@@ -69,7 +70,7 @@ async def _fetch() -> Dict[str, Any]:
 
 @attr.s
 class PCItemCollectionUri(ItemCollectionUri):
-    limit: Optional[int] = attr.ib(default=DEFAULT_LIMIT)  # type:ignore
+    limit:  Annotated[Optional[int], Query()] = attr.ib(default=DEFAULT_LIMIT)
 
 
 def patch_and_convert(interval: Optional[str]) -> Optional[DateTimeType]:
@@ -81,7 +82,7 @@ def patch_and_convert(interval: Optional[str]) -> Optional[DateTimeType]:
 
 @attr.s
 class PCSearchGetRequest(BaseSearchGetRequest):
-    datetime: Optional[DateTimeType] = attr.ib(
+    datetime: Annotated[Optional[DateTimeType], Query()] = attr.ib(
         default=None, converter=patch_and_convert
     )
-    limit: Optional[int] = attr.ib(default=DEFAULT_LIMIT)  # type:ignore
+    limit: Annotated[Optional[int], Query()] = attr.ib(default=DEFAULT_LIMIT)

pcstac/setup.py

@@ -5,10 +5,10 @@
 # Runtime requirements.
 inst_reqs = [
     "idna>=3.7.0",
-    "stac-fastapi.api==3.0.0a3",
-    "stac-fastapi.extensions==3.0.0a3",
-    "stac-fastapi.pgstac==3.0.0a2",
-    "stac-fastapi.types==3.0.0a3",
+    "stac-fastapi.api==3.0.0b2",
+    "stac-fastapi.extensions==3.0.0b2",
+    "stac-fastapi.pgstac==3.0.0a4",
+    "stac-fastapi.types==3.0.0b2",
     "orjson==3.10.4",
     # Required due to some imports related to pypgstac CLI usage in startup script
     "pypgstac[psycopg]>=0.8.5,<0.9",