Merge pull request #920 from RS-PYTHON/feat/rspy602-stac-fastapi-pgstac-updates

RSPY-602 - Update stac-fastapi / stac-fastapi-pgstac / pgstac to 5.0.x / 4.0.x / 0.9.x

Author: Padeanu

poetry.lock

@@ -301,7 +301,7 @@ async def dispatch(self, request: Request, call_next: Callable):
         return await call_next(request)
 
 
-client = CoreCrudClient(post_request_model=post_request_model)
+client = CoreCrudClient(pgstac_search_model=post_request_model)
 
 
 class UserCatalogMiddleware(BaseHTTPMiddleware):  # pylint: disable=too-few-public-methods
@@ -323,7 +323,7 @@ async def dispatch(self, request, call_next):
     settings=settings,
     extensions=extensions,
     items_get_request_model=items_get_request_model,
-    client=CoreCrudClient(post_request_model=post_request_model),
+    client=CoreCrudClient(pgstac_search_model=post_request_model),
     response_class=ORJSONResponse,
     search_get_request_model=create_get_request_model(extensions),
     search_post_request_model=post_request_model,

services/adgs/poetry.lock

@@ -942,10 +942,9 @@ async def manage_get_response(  # pylint: disable=too-many-locals, too-many-bran
                     user_login,
                 )
                 content["collections"] = self.update_links_for_all_collections(content["collections"])
-                self_parser = urlparse(content["links"][2]["href"])
+                self_parser = urlparse(content["links"][1]["href"])
                 content["links"][0]["href"] += "catalog/"
-                content["links"][1]["href"] += "catalog/"
-                content["links"][2]["href"] = self_parser._replace(path="/catalog/collections").geturl()
+                content["links"][1]["href"] = self_parser._replace(path="/catalog/collections").geturl()
 
         # If we are in cluster mode and the user_login is not authorized
         # to this endpoint returns a HTTP_401_UNAUTHORIZED status.

services/cadip/poetry.lock

@@ -111,7 +111,7 @@ def reroute_url(  # type: ignore # pylint: disable=too-many-branches,too-many-st
         path = "/health"
 
     # The endpoint PUT "/catalog/collections" does not exists.
-    elif path == CATALOG_COLLECTION and method != "PUT":
+    elif path.rstrip("/") == CATALOG_COLLECTION and method != "PUT":
         path = "/collections"
 
     # Catch endpoint /catalog/collections/[{owner_id}:]{collection_id}/bulk_items

services/catalog/poetry.lock

@@ -15,7 +15,7 @@
 services:
 
   stac-db:
-    image: ghcr.io/stac-utils/pgstac:v0.8.6
+    image: ghcr.io/stac-utils/pgstac:v0.9.2
     container_name: postgres-${POSTGRES_DB}
     environment:
       POSTGRES_USER: ${POSTGRES_USER}

services/catalog/rs_server_catalog/main.py

@@ -1304,7 +1304,7 @@ async def test_http200_with_good_authentication(
         )
         assert response.status_code == HTTP_200_OK
         content = json.loads(response.content)
-        assert content["context"] == {"limit": 10, "returned": 1}
+        assert content["numberReturned"] == 1
 
         response = client.request(
             "GET",
@@ -1314,7 +1314,7 @@ async def test_http200_with_good_authentication(
         )
         assert response.status_code == HTTP_200_OK
         content = json.loads(response.content)
-        assert content["context"] == {"limit": 10, "returned": 2}
+        assert content["numberReturned"] == 2
 
         response = client.request(
             "POST",
@@ -1324,7 +1324,7 @@ async def test_http200_with_good_authentication(
         )
         assert response.status_code == HTTP_200_OK
         content = json.loads(response.content)
-        assert content["context"] == {"limit": 10, "returned": 2}
+        assert content["numberReturned"] == 2
 
     @pytest.mark.parametrize("test_apikey, test_oauth2", [[True, False], [False, True]], ids=["apikey", "oauth2"])
     async def test_fails_without_good_perms(self, mocker, httpx_mock: HTTPXMock, client, test_apikey, test_oauth2):

services/catalog/rs_server_catalog/user_catalog.py

@@ -698,7 +698,7 @@ def test_delete_non_empty_collection(self, client, a_minimal_collection, a_corre
         """
         first_get_collection_response = client.get("/catalog/collections/fixture_owner:fixture_collection/items")
         assert first_get_collection_response.status_code == fastapi.status.HTTP_200_OK
-        assert json.loads(first_get_collection_response.content)["context"]["returned"] == 0
+        assert json.loads(first_get_collection_response.content)["numberReturned"] == 0
         # Post the feature to the collection
         updated_feature_sent = copy.deepcopy(a_correct_feature)
         updated_feature_sent["collection"] = "fixture_collection"
@@ -710,7 +710,7 @@ def test_delete_non_empty_collection(self, client, a_minimal_collection, a_corre
         # Test that the collection is not empty
         second_get_collection_response = client.get("/catalog/collections/fixture_owner:fixture_collection/items")
         assert second_get_collection_response.status_code == fastapi.status.HTTP_200_OK
-        assert json.loads(second_get_collection_response.content)["context"]["returned"] > 0
+        assert json.loads(second_get_collection_response.content)["numberReturned"] > 0
         # Delete the collection
         delete_response = client.delete("/catalog/collections/fixture_owner:fixture_collection")
         assert delete_response.status_code == fastapi.status.HTTP_200_OK
@@ -1480,7 +1480,7 @@ def test_create_new_minimal_feature(self, client, a_minimal_collection, a_correc
         assert check_features_response.status_code == fastapi.status.HTTP_200_OK
         # Test if query returns only one feature for this collection
         returned_features = json.loads(check_features_response.content)
-        assert returned_features["context"]["returned"] == 1
+        assert returned_features["numberReturned"] == 1
         # Test feature content
         assert returned_features["features"][0]["id"] == a_correct_feature["id"]
         assert returned_features["features"][0]["geometry"] == a_correct_feature["geometry"]
@@ -1696,7 +1696,7 @@ def test_delete_a_correct_feature(self, client, a_minimal_collection, a_correct_
         collection_content_response = client.get("/catalog/collections/fixture_owner:fixture_collection/items")
         assert collection_content_response.status_code == fastapi.status.HTTP_200_OK
         collection_content_response = json.loads(collection_content_response.content)
-        assert collection_content_response["context"]["returned"] == 0
+        assert collection_content_response["numberReturned"] == 0
         assert (
             client.delete("/catalog/collections/fixture_owner:fixture_collection").status_code
             == fastapi.status.HTTP_200_OK