Merge branch 'main' into feature/non-hierarchical-links

Author: gadomski

CHANGELOG.md

@@ -19,6 +19,7 @@
 - `max_items` and `recursive` to `Catalog.validate_all` ([#1141](https://github.com/stac-utils/pystac/pull/1141))
 - `KML` as a built in media type ([#1127](https://github.com/stac-utils/pystac/issues/1127))
 - `move/copy/delete` operations for local Assets ([#1158](https://github.com/stac-utils/pystac/issues/1158))
+- Latest core STAC spec jsonshemas are included in pytstac and used for validation ([#1165](https://github.com/stac-utils/pystac/pull/1165))
 
 ### Changed
 
@@ -39,6 +40,7 @@
 - Improved error message when `.ext` is called on a Collection ([#1157](https://github.com/stac-utils/pystac/pull/1157))
 - `add_child` and `add_item` return a Link object instead of None ([#1160](https://github.com/stac-utils/pystac/pull/1160))
 - `add_children` and `add_items` return a list of Link objects instead of None ([#1160](https://github.com/stac-utils/pystac/pull/1160))
+- Include collection assets in `make_all_asset_hrefs_relative/absolute` ([#1168](https://github.com/stac-utils/pystac/pull/1168))
 
 ### Deprecated
 

docs/concepts.rst

@@ -394,9 +394,13 @@ You can validate any :class:`~pystac.Catalog`, :class:`~pystac.Collection` or
 
    item.validate()
 
-This will validate against the latest set of JSON schemas hosted at
-https://schemas.stacspec.org, including any extensions that the object extends. If there
-are validation errors, a :class:`~pystac.validation.STACValidationError` will be raised.
+This validates against the latest set of JSON schemas (which are included with the
+PySTAC package) or older versions (which are hosted at https://schemas.stacspec.org).
+This validation includes any extensions that the object extends (these are always
+accessed remotely based on their URIs).
+
+If there are validation errors, a :class:`~pystac.validation.STACValidationError`
+is raised.
 
 You can also call :meth:`~pystac.Catalog.validate_all` on a Catalog or Collection to
 recursively walk through a catalog and validate all objects within it.

pyproject.toml

@@ -64,7 +64,7 @@ test = [
     "pytest-mock~=3.10",
     "pytest-vcr~=1.0",
     "pytest~=7.3",
-    "ruff==0.0.272",
+    "ruff==0.0.274",
     "types-html5lib~=1.1",
     "types-orjson~=3.6",
     "types-python-dateutil~=2.8",

pystac/catalog.py

@@ -657,20 +657,18 @@ def clone(self) -> Catalog:
         return clone
 
     def make_all_asset_hrefs_relative(self) -> None:
-        """Makes all the HREFs of assets belonging to items in this catalog
-        and all children to be relative, recursively.
-        """
-        for _, _, items in self.walk():
-            for item in items:
-                item.make_asset_hrefs_relative()
+        """Recursively makes all the HREFs of assets in this catalog relative"""
+        for item in self.get_all_items():
+            item.make_asset_hrefs_relative()
+        for collection in self.get_all_collections():
+            collection.make_asset_hrefs_relative()
 
     def make_all_asset_hrefs_absolute(self) -> None:
-        """Makes all the HREFs of assets belonging to items in this catalog
-        and all children to be absolute, recursively.
-        """
-        for _, _, items in self.walk():
-            for item in items:
-                item.make_asset_hrefs_absolute()
+        """Recursively makes all the HREFs of assets in this catalog absolute"""
+        for item in self.get_all_items():
+            item.make_asset_hrefs_absolute()
+        for collection in self.get_all_collections():
+            collection.make_asset_hrefs_absolute()
 
     def normalize_and_save(
         self,

pystac/collection.py

@@ -20,7 +20,7 @@
 from dateutil import tz
 
 import pystac
-from pystac import CatalogType, STACObjectType
+from pystac import CatalogType, STACError, STACObjectType
 from pystac.asset import Asset
 from pystac.catalog import Catalog
 from pystac.errors import DeprecatedWarning, ExtensionNotImplemented, STACTypeError
@@ -33,7 +33,13 @@
     migrate_to_latest,
 )
 from pystac.summaries import Summaries
-from pystac.utils import datetime_to_str, str_to_datetime
+from pystac.utils import (
+    datetime_to_str,
+    is_absolute_href,
+    make_absolute_href,
+    make_relative_href,
+    str_to_datetime,
+)
 
 if TYPE_CHECKING:
     from pystac.item import Item
@@ -760,6 +766,42 @@ def delete_asset(self, key: str) -> None:
 
         del self.assets[key]
 
+    def make_asset_hrefs_relative(self) -> Collection:
+        """Modify each asset's HREF to be relative to this collection's self HREF.
+
+        Returns:
+            Collection: self
+        """
+        self_href = self.get_self_href()
+        for asset in self.assets.values():
+            if is_absolute_href(asset.href):
+                if self_href is None:
+                    raise STACError(
+                        "Cannot make asset HREFs relative " "if no self_href is set."
+                    )
+                asset.href = make_relative_href(asset.href, self_href)
+        return self
+
+    def make_asset_hrefs_absolute(self) -> Collection:
+        """Modify each asset's HREF to be absolute.
+
+        Any asset HREFs that are relative will be modified to absolute based on this
+        collection's self HREF.
+
+        Returns:
+            Collection: self
+        """
+        self_href = self.get_self_href()
+        for asset in self.assets.values():
+            if not is_absolute_href(asset.href):
+                if self_href is None:
+                    raise STACError(
+                        "Cannot make relative asset HREFs absolute "
+                        "if no self_href is set."
+                    )
+                asset.href = make_absolute_href(asset.href, self_href)
+        return self
+
     def update_extent_from_items(self) -> None:
         """
         Update datetime and bbox based on all items to a single bbox and time window.

pystac/errors.py

@@ -95,6 +95,10 @@ def __init__(
         super().__init__(msg)
 
 
+class STACLocalValidationError(Exception):
+    """Schema not available locally"""
+
+
 class STACValidationError(Exception):
     """Represents a validation error. Thrown by validation calls if the STAC JSON
     is invalid.

pystac/item.py

@@ -287,18 +287,13 @@ def make_asset_hrefs_relative(self) -> Item:
         Returns:
             Item: self
         """
-
-        self_href = None
+        self_href = self.get_self_href()
         for asset in self.assets.values():
-            href = asset.href
-            if is_absolute_href(href):
+            if is_absolute_href(asset.href):
                 if self_href is None:
-                    self_href = self.get_self_href()
-                    if self_href is None:
-                        raise STACError(
-                            "Cannot make asset HREFs relative "
-                            "if no self_href is set."
-                        )
+                    raise STACError(
+                        "Cannot make asset HREFs relative " "if no self_href is set."
+                    )
                 asset.href = make_relative_href(asset.href, self_href)
         return self
 
@@ -311,19 +306,15 @@ def make_asset_hrefs_absolute(self) -> Item:
         Returns:
             Item: self
         """
-        self_href = None
+        self_href = self.get_self_href()
         for asset in self.assets.values():
-            href = asset.href
-            if not is_absolute_href(href):
+            if not is_absolute_href(asset.href):
                 if self_href is None:
-                    self_href = self.get_self_href()
-                    if self_href is None:
-                        raise STACError(
-                            "Cannot make relative asset HREFs absolute "
-                            "if no self_href is set."
-                        )
+                    raise STACError(
+                        "Cannot make relative asset HREFs absolute "
+                        "if no self_href is set."
+                    )
                 asset.href = make_absolute_href(asset.href, self_href)
-
         return self
 
     def set_collection(self, collection: Optional[Collection]) -> Item: