update stac-fastapi to next major version

Author: vincentsarago

docker-compose.yml

@@ -45,7 +45,7 @@ services:
 
   database:
     container_name: stac-db
-    image: ghcr.io/stac-utils/pgstac:v0.7.10
+    image: ghcr.io/stac-utils/pgstac:v0.8.5
     environment:
       - POSTGRES_USER=username
       - POSTGRES_PASSWORD=password

setup.py

@@ -8,22 +8,26 @@
 install_requires = [
     "attrs",
     "orjson",
-    "pydantic[dotenv]>=1.10.8",  # https://github.com/pydantic/pydantic/issues/5821
-    "stac_pydantic==2.0.*",
-    "stac-fastapi.types~=2.5.5.post1",
-    "stac-fastapi.api~=2.5.5.post1",
-    "stac-fastapi.extensions~=2.5.5.post1",
+    "pydantic",
+    "stac_pydantic==3.0.*",
+    # "stac-fastapi.api~=3.0",
+    # "stac-fastapi.extensions~=3.0",
+    # "stac-fastapi.types~=3.0",
+    # For now we use latest commit in master
+    "stac-fastapi.api @ git+https://github.com/stac-utils/stac-fastapi/@e7f82d6996af0f28574329d57f5a5e90431d66bb#egg=stac-fastapi.api&subdirectory=stac_fastapi/api",
+    "stac-fastapi.extensions @ git+https://github.com/stac-utils/stac-fastapi/@e7f82d6996af0f28574329d57f5a5e90431d66bb#egg=stac-fastapi.extensions&subdirectory=stac_fastapi/extensions",
+    "stac-fastapi.types @ git+https://github.com/stac-utils/stac-fastapi/@e7f82d6996af0f28574329d57f5a5e90431d66bb#egg=stac-fastapi.types&subdirectory=stac_fastapi/types",
     "asyncpg",
     "buildpg",
     "brotli_asgi",
     "pygeofilter>=0.2",
-    "pypgstac==0.7.*",
+    "pypgstac==0.8.*",
 ]
 
 extra_reqs = {
     "dev": [
         "pystac[validation]",
-        "pypgstac[psycopg]==0.7.*",
+        "pypgstac[psycopg]==0.8.*",
         "pytest-postgresql",
         "pytest",
         "pytest-cov",

stac_fastapi/pgstac/config.py

@@ -4,6 +4,7 @@
 from urllib.parse import quote
 
 from pydantic import BaseModel, Extra
+from pydantic_settings import SettingsConfigDict
 from stac_fastapi.types.config import ApiSettings
 
 from stac_fastapi.pgstac.types.base_item_cache import (
@@ -58,7 +59,7 @@ class Settings(ApiSettings):
     postgres_pass: str
     postgres_host_reader: str
     postgres_host_writer: str
-    postgres_port: str
+    postgres_port: int
     postgres_dbname: str
 
     db_min_conn_size: int = 10
@@ -89,7 +90,6 @@ def testing_connection_string(self):
         """Create testing psql connection string."""
         return f"postgresql://{self.postgres_user}:{quote(self.postgres_pass)}@{self.postgres_host_writer}:{self.postgres_port}/pgstactestdb"
 
-    class Config(ApiSettings.Config):
-        """Model config."""
-
-        env_nested_delimiter = "__"
+    model_config = SettingsConfigDict(
+        **{**ApiSettings.model_config, **{"env_nested_delimiter": "__"}}
+    )