Dry up

Author: jsignell

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Top-level `item_assets` dict on `Collection`s ([#1476](https://github.com/stac-utils/pystac/pull/1476))
 - Render Extension ([#1465](https://github.com/stac-utils/pystac/pull/1465))
+- Filter by links by list of media_types
 
 ### Changed
 
@@ -16,6 +17,7 @@
 - Update Projection Extension to version 2 - proj:epsg -> proj:code ([#1287](https://github.com/stac-utils/pystac/pull/1287))
 - Update migrate code to handle license changes in STAC spec 1.1.0 ([#1491](https://github.com/stac-utils/pystac/pull/1491))
 - Allow links to have `file://` prefix - but don't write them that way by default ([#1489](https://github.com/stac-utils/pystac/pull/1489))
+- For `get_root_link`, `get_child_links`, `get_item_links`: Ensure json media types ([#1497](https://github.com/stac-utils/pystac/pull/1497))
 - Raise `STACError` with message when a link is expected to resolve to a STAC object but doesn't ([#1500](https://github.com/stac-utils/pystac/pull/1500))
 
 ### Fixed

pystac/catalog.py

@@ -13,6 +13,7 @@
 )
 
 import pystac
+import pystac.media_type
 from pystac.cache import ResolvedObjectCache
 from pystac.errors import STACTypeError
 from pystac.layout import (
@@ -466,7 +467,7 @@ def get_child_links(self) -> list[Link]:
         """
         return self.get_links(
             rel=pystac.RelType.CHILD,
-            media_type=[None, pystac.MediaType.GEOJSON, pystac.MediaType.JSON],
+            media_type=pystac.media_type.STAC_JSON,
         )
 
     def clear_children(self) -> None:
@@ -628,8 +629,7 @@ def get_item_links(self) -> list[Link]:
             List[Link]: List of links of this catalog with ``rel == 'item'``
         """
         return self.get_links(
-            rel=pystac.RelType.ITEM,
-            media_type=[None, pystac.MediaType.GEOJSON, pystac.MediaType.JSON],
+            rel=pystac.RelType.ITEM, media_type=pystac.media_type.STAC_JSON
         )
 
     def to_dict(

pystac/media_type.py

@@ -24,3 +24,7 @@ class MediaType(StringEnum):
     PDF = "application/pdf"
     ZARR = "application/vnd+zarr"  # https://github.com/openMetadataInitiative/openMINDS_core/blob/v4/instances/data/contentTypes/zarr.jsonld
     NETCDF = "application/netcdf"  # https://github.com/Unidata/netcdf/issues/42#issuecomment-1007618822
+
+
+#: Media types that can be resolved as STAC Objects
+STAC_JSON = [None, MediaType.GEOJSON, MediaType.JSON]

pystac/stac_object.py

@@ -22,7 +22,7 @@
 
 S = TypeVar("S", bound="STACObject")
 
-STACObject_MediaType: TypeAlias = str | pystac.MediaType | None
+OptionalMediaType: TypeAlias = str | pystac.MediaType | None
 
 
 class STACObjectType(StringEnum):
@@ -174,7 +174,7 @@ def traverse(obj: str | STACObject, visited: set[str | STACObject]) -> bool:
     def get_single_link(
         self,
         rel: str | pystac.RelType | None = None,
-        media_type: STACObject_MediaType | Iterable[STACObject_MediaType] = None,
+        media_type: OptionalMediaType | Iterable[OptionalMediaType] = None,
     ) -> Link | None:
         """Get a single :class:`~pystac.Link` instance associated with this
         object.
@@ -208,7 +208,7 @@ def get_single_link(
     def get_links(
         self,
         rel: str | pystac.RelType | None = None,
-        media_type: STACObject_MediaType | Iterable[STACObject_MediaType] = None,
+        media_type: OptionalMediaType | Iterable[OptionalMediaType] = None,
     ) -> list[Link]:
         """Gets the :class:`~pystac.Link` instances associated with this object.
 
@@ -256,7 +256,7 @@ def get_root_link(self) -> Link | None:
         """
         return self.get_single_link(
             rel=pystac.RelType.ROOT,
-            media_type=[None, pystac.MediaType.GEOJSON, pystac.MediaType.JSON],
+            media_type=pystac.media_type.STAC_JSON,
         )
 
     @property