Skip to content

Commit 9c0f7ef

Browse files
committed
RSPY-602 - Update stac-fastapi / stac-fastapi-pgstac / pgstac to 5.0.x / 4.0.x / 0.9.x
1 parent 937a9b9 commit 9c0f7ef

File tree

12 files changed

+872
-412
lines changed

12 files changed

+872
-412
lines changed

poetry.lock

Lines changed: 153 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/adgs/poetry.lock

Lines changed: 153 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/cadip/poetry.lock

Lines changed: 153 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/catalog/poetry.lock

Lines changed: 153 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/catalog/rs_server_catalog/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ async def dispatch(self, request: Request, call_next: Callable):
301301
return await call_next(request)
302302

303303

304-
client = CoreCrudClient(post_request_model=post_request_model)
304+
client = CoreCrudClient(pgstac_search_model=post_request_model)
305305

306306

307307
class UserCatalogMiddleware(BaseHTTPMiddleware): # pylint: disable=too-few-public-methods
@@ -323,7 +323,7 @@ async def dispatch(self, request, call_next):
323323
settings=settings,
324324
extensions=extensions,
325325
items_get_request_model=items_get_request_model,
326-
client=CoreCrudClient(post_request_model=post_request_model),
326+
client=CoreCrudClient(pgstac_search_model=post_request_model),
327327
response_class=ORJSONResponse,
328328
search_get_request_model=create_get_request_model(extensions),
329329
search_post_request_model=post_request_model,

services/catalog/tests/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
services:
1616

1717
stac-db:
18-
image: ghcr.io/stac-utils/pgstac:v0.8.6
18+
image: ghcr.io/stac-utils/pgstac:v0.9.2
1919
container_name: postgres-${POSTGRES_DB}
2020
environment:
2121
POSTGRES_USER: ${POSTGRES_USER}

services/common/poetry.lock

Lines changed: 152 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

services/common/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ opentelemetry-instrumentation-aws-lambda = "^0.51b0"
6363
opentelemetry-test-utils = "^0.51b0"
6464
opentelemetry-exporter-otlp = "^1.30.0"
6565
python-logging-loki = "^0.3.1"
66-
stac-pydantic = "^3.1.2"
66+
stac-pydantic = "^3.1.4"
6767
authlib = "^1.3.1"
6868
python-keycloak = ">=5.3.1,<6.0"
6969
itsdangerous = "^2.2.0"
7070
pyjwt = {extras = ["crypto"], version = "^2.9.0"}
71-
stac-fastapi-pgstac = "3.0.1"
71+
stac-fastapi-pgstac = "^4.0.1"
7272

7373
[tool.poetry.group.dev]
7474
optional = true

services/common/rs_server_common/fastapi_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ async def lifespan(app: FastAPI):
174174
# BulkTransactionExtension(client=BulkTransactionsClient()),
175175
]
176176
search_post_request_model = create_post_request_model(extensions, base_model=PgstacSearch)
177-
app.state.pgstac_client = CoreCrudClient(post_request_model=search_post_request_model)
177+
app.state.pgstac_client = CoreCrudClient(pgstac_search_model=search_post_request_model)
178178

179179
# TODO: remove this when adgs and cadip switch to a stac_fastapi application.
180180
app.state.pgstac_client.extensions = extensions

services/common/rs_server_common/stac_api_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def log_http_exception(*args, **kwargs) -> HTTPException:
108108
class Queryables(BaseModel):
109109
"""
110110
BaseModel used to describe queryable holder.
111-
See: site-packages/pypgstac/migrations/pgstac.0.8.6.sql
111+
See: site-packages/pypgstac/migrations/pgstac.0.9.2.sql
112112
"""
113113

114114
id: str = Field("", alias="$id")

0 commit comments

Comments
 (0)