fix: set item links correctly (#61)

- Closes #58

Author: gadomski

package.json

@@ -10,5 +10,6 @@
     "config": {
       "MD013": false
     }
-  }
-}
+  },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

pyproject.toml

@@ -6,12 +6,12 @@ readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "attr>=0.3.2",
-    "fastapi>=0.115.6",
+    "fastapi>=0.115.8",
     "geojson-pydantic>=1.2.0",
     "pydantic>=2.10.4",
-    "stac-fastapi-api>=3.0.5",
-    "stac-fastapi-extensions>=3.0.5",
-    "stac-fastapi-types>=3.0.5",
+    "stac-fastapi-api>=5.0.2",
+    "stac-fastapi-extensions>=5.0.2",
+    "stac-fastapi-types>=5.0.2",
     "stacrs>=0.4.0",
 ]
 
@@ -22,31 +22,34 @@ lambda = ["mangum==0.19.0"]
 dev = [
     "fastapi[standard]>=0.115.6",
     "httpx>=0.28.1",
-    "mkdocs-material>=9.5.50",
-    "mypy>=1.14.1",
-    "pygithub>=2.5.0",
-    "pystac[validation]>=1.11.0",
+    "mkdocs-material>=9.6.5",
+    "mypy>=1.15.0",
+    "pygithub>=2.6.1",
+    "pystac[validation]>=1.12.2",
     "pytest>=8.3.4",
-    "pytest-asyncio>=0.25.1",
-    "ruff>=0.9.1",
+    "pytest-asyncio>=0.25.3",
+    "ruff>=0.9.7",
     "stac-api-validator>=0.6.3",
 ]
 validate = ["stac-api-validator>=0.6.3"]
 deploy = [
-    "aws-cdk-lib==2.175.1",
+    "aws-cdk-lib==2.181.0",
     "constructs>=10.4.2",
     "pydantic>=2.10.4",
-    "pydantic-settings>=2.7.1",
+    "pydantic-settings>=2.8.0",
 ]
 
+[tool.uv]
+default-groups = ["dev", "validate", "deploy"]
+
 [tool.mypy]
 strict = true
 files = ["src/**/*.py", "infrastructure/**/*.py"]
 exclude = ["infrastructure/aws/cdk.out/.*"]
 plugins = "pydantic.mypy"
 
 [[tool.mypy.overrides]]
-module = ["stac_fastapi.*", "config"]
+module = ["stac_fastapi.*", "config", "magnum"]
 ignore_missing_imports = true
 
 [tool.pytest.ini_options]

scripts/validate

@@ -20,4 +20,4 @@ result=$?
 set -e
 
 kill $(pgrep -P $uvicorn_pid)
-exit $?
+exit $result

src/stac_fastapi/geoparquet/client.py

@@ -50,20 +50,18 @@ async def get_collection(
     async def get_item(
         self, *, request: Request, item_id: str, collection_id: str, **kwargs: Any
     ) -> Item:
-        client = cast(DuckdbClient, request.state.client)
-        hrefs = cast(dict[str, str], request.state.hrefs)
-        if href := hrefs.get(collection_id):
-            item_collection = client.search(
-                href, ids=[item_id], collections=[collection_id], **kwargs
-            )
-            if len(item_collection["features"]) == 1:
-                return Item(**item_collection["features"][0])
-            else:
-                raise NotFoundError(
-                    f"Item does not exist: {item_id} in collection {collection_id}"
-                )
+        item_collection = await self.get_search(
+            request=request,
+            ids=[item_id],
+            collections=[collection_id],
+            **kwargs,
+        )
+        if len(item_collection["features"]) == 1:
+            return Item(**item_collection["features"][0])
         else:
-            raise NotFoundError(f"Collection does not exist: {collection_id}")
+            raise NotFoundError(
+                f"Item does not exist: {item_id} in collection {collection_id}"
+            )
 
     async def get_search(
         self,
@@ -189,6 +187,9 @@ async def search(
             href,
             **search_dict,
         )
+        item_collection["features"] = [
+            self.item_with_links(item, request) for item in item_collection["features"]
+        ]
         num_items = len(item_collection["features"])
         limit = int(search_dict.get("limit", None) or num_items)
         offset = int(search_dict.get("offset", None) or 0)
@@ -249,6 +250,40 @@ async def search(
         item_collection["links"] = links
         return ItemCollection(**item_collection)
 
+    def item_with_links(self, item: dict[str, Any], request: Request) -> dict[str, Any]:
+        links = [
+            {
+                "href": str(request.url_for("Landing Page")),
+                "rel": "root",
+                "type": "application/json",
+            },
+        ]
+        if collection_id := item.get("collection"):
+            href = str(request.url_for("Get Collection", collection_id=collection_id))
+            links.append(
+                {"href": href, "rel": "collection", "type": "application/json"}
+            )
+            links.append({"href": href, "rel": "parent", "type": "application/json"})
+            if item_id := item.get("id"):
+                links.append(
+                    {
+                        "href": str(
+                            request.url_for(
+                                "Get Item",
+                                collection_id=collection_id,
+                                item_id=item_id,
+                            )
+                        ),
+                        "rel": "self",
+                        "type": "application/geo+json",
+                    }
+                )
+        for link in item.get("links", []):
+            if link["rel"] not in ("root", "parent", "collection", "self"):
+                links.append(link)
+        item["links"] = links
+        return item
+
 
 def collection_with_links(
     collection: dict[str, Any], request: Request

tests/test_get_item.py

@@ -0,0 +1,6 @@
+from fastapi.testclient import TestClient
+
+
+async def test_get_search(client: TestClient) -> None:
+    response = client.get("/collections/naip/items/ne_m_4110264_sw_13_060_20220827")
+    assert response.status_code == 200, response.text

tests/test_search.py

@@ -26,3 +26,16 @@ async def test_paging(client: TestClient) -> None:
     response = client.get("/search", params=url.query)
     assert response.status_code == 200
     assert response.json()["features"][0]["id"] == "ne_m_4110263_sw_13_060_20220820"
+
+
+async def test_collection_link(client: TestClient) -> None:
+    # https://github.com/developmentseed/labs-375-stac-geoparquet-backend/issues/58
+    response = client.get("/search", params={"limit": 1})
+    response.raise_for_status()
+    data = response.json()
+    link = next(
+        (link for link in data["features"][0]["links"] if link["rel"] == "collection")
+    )
+    assert link["href"].startswith(str(client.base_url)), (
+        link["href"] + " does not start with the test client base url"
+    )